g[un]zip: accept and ignore -n (needed for kernel compile)

diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 327b3cf2cf1999c59a9a55e95b8f18f37daf3e5c..90d39f6828efb7996ba73ccc0e442eb8a0f4544e 100644 (file)
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -256,10 +256,24 @@ USE_DESKTOP(long long) int unpack_gunzip(void)
        return status;
 }
 
+/*
+ * Linux kernel build uses gzip -d -n. We accept and ignore it.
+ * Man page says:
+ * -n --no-name
+ * gzip: do not save the original file name and time stamp.
+ * (The original name is always saved if the name had to be truncated.)
+ * gunzip: do not restore the original file name/time even if present
+ * (remove only the gzip suffix from the compressed file name).
+ * This option is the default when decompressing.
+ * -N --name
+ * gzip: always save the original file name and time stamp (this is the default)
+ * gunzip: restore the original file name and time stamp if present.
+ */
+
 int gunzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int gunzip_main(int argc ATTRIBUTE_UNUSED, char **argv)
 {
-       getopt32(argv, "cfvdt");
+       getopt32(argv, "cfvdtn");
        argv += optind;
        /* if called as zcat */
        if (applet_name[1] == 'c')

diff --git a/archival/gzip.c b/archival/gzip.c
index a96d02911d498f0f25ec166cd0331e36ffc3615e..dce40ec922a1842f91d25c6a254fc69ab30eb7a7 100644 (file)
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -2025,6 +2025,20 @@ USE_DESKTOP(long long) int pack_gzip(void)
        return 0;
 }
 
+/*
+ * Linux kernel build uses gzip -d -n. We accept and ignore it.
+ * Man page says:
+ * -n --no-name
+ * gzip: do not save the original file name and time stamp.
+ * (The original name is always saved if the name had to be truncated.)
+ * gunzip: do not restore the original file name/time even if present
+ * (remove only the gzip suffix from the compressed file name).
+ * This option is the default when decompressing.
+ * -N --name
+ * gzip: always save the original file name and time stamp (this is the default)
+ * gunzip: restore the original file name and time stamp if present.
+ */
+
 int gzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 #if ENABLE_GUNZIP
 int gzip_main(int argc, char **argv)
@@ -2035,7 +2049,7 @@ int gzip_main(int argc ATTRIBUTE_UNUSED, char **argv)
        unsigned opt;
 
        /* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */
-       opt = getopt32(argv, "cfv" USE_GUNZIP("d") "q123456789" );
+       opt = getopt32(argv, "cfv" USE_GUNZIP("d") "q123456789n" );
 #if ENABLE_GUNZIP /* gunzip_main may not be visible... */
        if (opt & 0x8) // -d
                return gunzip_main(argc, argv);