emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Denis Vlasenko 2008-03-30 13:11:47 +00:00
parent 1b2058fe98
commit 5297809c03
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
archival/bbunzip.c
View File

@ -256,10 +256,24 @@ USE_DESKTOP(long long) int unpack_gunzip(void)
return status; 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, char **argv) MAIN_EXTERNALLY_VISIBLE;
int gunzip_main(int argc ATTRIBUTE_UNUSED, char **argv) int gunzip_main(int argc ATTRIBUTE_UNUSED, char **argv)
{ {
getopt32(argv, "cfvdt"); getopt32(argv, "cfvdtn");
argv += optind; argv += optind;
/* if called as zcat */ /* if called as zcat */
if (applet_name[1] == 'c') if (applet_name[1] == 'c')

16
archival/gzip.c
View File

@ -2025,6 +2025,20 @@ USE_DESKTOP(long long) int pack_gzip(void)
return 0; 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; int gzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
#if ENABLE_GUNZIP #if ENABLE_GUNZIP
int gzip_main(int argc, char **argv) int gzip_main(int argc, char **argv)
@ -2035,7 +2049,7 @@ int gzip_main(int argc ATTRIBUTE_UNUSED, char **argv)
unsigned opt; unsigned opt;
/* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */ /* 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 ENABLE_GUNZIP /* gunzip_main may not be visible... */
if (opt & 0x8) // -d if (opt & 0x8) // -d
return gunzip_main(argc, argv); return gunzip_main(argc, argv);