svn commit: trunk/busybox/archival

[vda at busybox.net]

Author: vda
Date: 2007-03-22 11:56:23 -0700 (Thu, 22 Mar 2007)
New Revision: 18207

Log:
gzip: fix -d option handling


Modified:
   trunk/busybox/archival/gzip.c


Changeset:
Modified: trunk/busybox/archival/gzip.c
===================================================================
--- trunk/busybox/archival/gzip.c	2007-03-22 18:56:00 UTC (rev 18206)
+++ trunk/busybox/archival/gzip.c	2007-03-22 18:56:23 UTC (rev 18207)
@@ -2034,7 +2034,6 @@
 
 	/* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */
 	opt = getopt32(argc, argv, "cfv" USE_GUNZIP("d") "q123456789" );
-	argv += optind;
 	option_mask32 &= 0x7; /* Clear -d, ignore -q, -0..9 */
 	//if (opt & 0x1) // -c
 	//if (opt & 0x2) // -f
@@ -2044,6 +2043,7 @@
 		return gunzip_main(argc, argv);
 	}
 #endif
+	argv += optind;
 
 	PTR_TO_GLOBALS = xzalloc(sizeof(struct globals) + sizeof(struct globals2))
 			+ sizeof(struct globals);