Merge branch 'busybox' into merge

1 files changed, 11 insertions, 4 deletions

diff --git a/networking/wget.c b/networking/wget.c
index ab9bc1836..0001ddcba 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -1371,6 +1371,11 @@ IF_DESKTOP(	"no-clobber\0"       No_argument       "\xf0")
 IF_DESKTOP(     "no-host-directories\0" No_argument    "\xf0")
 IF_DESKTOP(     "no-parent\0"        No_argument       "\xf0")
                 ;
+# define GETOPT32 getopt32long
+# define LONGOPTS ,wget_longopts
+#else
+# define GETOPT32 getopt32
+# define LONGOPTS
 #endif
 
 #if ENABLE_FEATURE_WGET_LONG_OPTIONS
@@ -1387,11 +1392,9 @@ IF_DESKTOP(	"no-parent\0"        No_argument       "\xf0")
         G.user_agent = "Wget"; /* "User-Agent" header field */
 
 #if ENABLE_FEATURE_WGET_LONG_OPTIONS
-        applet_long_options = wget_longopts;
 #endif
-        opt_complementary = "-1" /* at least one URL */
-                IF_FEATURE_WGET_LONG_OPTIONS(":\xff::"); /* --header is a list */
-        getopt32(argv, "cqSO:P:Y:U:T:+"
+        GETOPT32(argv, "^"
+                "cqSO:P:Y:U:T:+"
                 /*ignored:*/ "t:"
                 /*ignored:*/ "n::"
                 /* wget has exactly four -n<letter> opts, all of which we can ignore:
@@ -1402,6 +1405,10 @@ IF_DESKTOP(	"no-parent\0"        No_argument       "\xf0")
                  * "n::" above says that we accept -n[ARG].
                  * Specifying "n:" would be a bug: "-n ARG" would eat ARG!
                  */
+                "\0"
+                "-1" /* at least one URL */
+                IF_FEATURE_WGET_LONG_OPTIONS(":\xff::") /* --header is a list */
+                LONGOPTS
                 , &G.fname_out, &G.dir_prefix,
                 &G.proxy_flag, &G.user_agent,
                 IF_FEATURE_WGET_TIMEOUT(&G.timeout_seconds) IF_NOT_FEATURE_WGET_TIMEOUT(NULL),