68 lines
2.4 KiB
Diff
68 lines
2.4 KiB
Diff
|
From 8b52b950360cd7224f504f294997f3a9d7e18b91 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Peter Hutterer <peter.hutterer@who-t.net>
|
||
|
|
Date: Mon, 16 Jan 2023 19:44:52 +1000
|
||
|
|
Subject: [PATCH libXpm] Use gzip -d instead of gunzip
|
||
|
|
|
||
|
|
GNU gunzip [1] is a shell script that exec's `gzip -d`. Even if we call
|
||
|
|
/usr/bin/gunzip with the correct built-in path, the actual gzip call
|
||
|
|
will use whichever gzip it finds first, making our patch pointless.
|
||
|
|
|
||
|
|
Fix this by explicitly calling gzip -d instead.
|
||
|
|
|
||
|
|
https://git.savannah.gnu.org/cgit/gzip.git/tree/gunzip.in
|
||
|
|
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||
|
|
---
|
||
|
|
README | 2 +-
|
||
|
|
configure.ac | 3 +--
|
||
|
|
src/RdFToI.c | 2 +-
|
||
|
|
3 files changed, 3 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/README b/README
|
||
|
|
index c7d6dbf..d4c7212 100644
|
||
|
|
--- a/README
|
||
|
|
+++ b/README
|
||
|
|
@@ -48,5 +48,5 @@ the first version found in the PATH used to run configure, and do not depend
|
||
|
|
on the PATH environment variable set at runtime.
|
||
|
|
|
||
|
|
To specify paths to be used for these commands instead of searching $PATH, pass
|
||
|
|
-the XPM_PATH_COMPRESS, XPM_PATH_UNCOMPRESS, XPM_PATH_GZIP, and XPM_PATH_GUNZIP
|
||
|
|
+the XPM_PATH_COMPRESS, XPM_PATH_UNCOMPRESS, and XPM_PATH_GZIP
|
||
|
|
variables to the configure command.
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index c1da348..74d9856 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -57,7 +57,7 @@ AC_DEFINE_UNQUOTED([$1], ["$$1"], [Path to $2])
|
||
|
|
]) dnl End of AC_DEFUN([XPM_PATH_PROG]...
|
||
|
|
|
||
|
|
# Optional feature: When a filename ending in .Z or .gz is requested,
|
||
|
|
-# open a pipe to a newly forked compress/uncompress/gzip/gunzip command to
|
||
|
|
+# open a pipe to a newly forked compress/uncompress/gzip command to
|
||
|
|
# handle it.
|
||
|
|
AC_MSG_CHECKING([whether to handle compressed pixmaps])
|
||
|
|
case $host_os in
|
||
|
|
@@ -75,7 +75,6 @@ else
|
||
|
|
XPM_PATH_PROG([XPM_PATH_COMPRESS], [compress])
|
||
|
|
XPM_PATH_PROG([XPM_PATH_UNCOMPRESS], [uncompress])
|
||
|
|
XPM_PATH_PROG([XPM_PATH_GZIP], [gzip])
|
||
|
|
- XPM_PATH_PROG([XPM_PATH_GUNZIP], [gunzip])
|
||
|
|
AC_CHECK_FUNCS([closefrom close_range], [break])
|
||
|
|
fi
|
||
|
|
|
||
|
|
diff --git a/src/RdFToI.c b/src/RdFToI.c
|
||
|
|
index a91d337..141c485 100644
|
||
|
|
--- a/src/RdFToI.c
|
||
|
|
+++ b/src/RdFToI.c
|
||
|
|
@@ -251,7 +251,7 @@ OpenReadFile(
|
||
|
|
else if ( ext && !strcmp(ext, ".gz") )
|
||
|
|
{
|
||
|
|
mdata->type = XPMPIPE;
|
||
|
|
- mdata->stream.file = xpmPipeThrough(fd, XPM_PATH_GUNZIP, "-qc", "r");
|
||
|
|
+ mdata->stream.file = xpmPipeThrough(fd, XPM_PATH_GZIP, "-dqc", "r");
|
||
|
|
}
|
||
|
|
else
|
||
|
|
#endif /* z-files */
|
||
|
|
--
|
||
|
|
2.39.0
|
||
|
|
|