Vodz last_patch_105 without his xargs patch which doenst apply cleanly

diff --git a/libbb/getopt_ulflags.c b/libbb/getopt_ulflags.c
index 9bf8c05..04d1e66 100644 (file)
--- a/libbb/getopt_ulflags.c
+++ b/libbb/getopt_ulflags.c
@@ -90,7 +90,12 @@ bb_getopt_ulflags (int argc, char **argv, const char *applet_opts, ...)
 
   va_start (p, applet_opts);
 
-  for (s = applet_opts; *s; s++) {
+  /* skip GNU extension */
+  s = applet_opts;
+  if(*s == '+' || *s == '-')
+       s++;
+
+  for (; *s; s++) {
        c++;
        while (s[1] == ':') {
            /* check GNU extension "o::" - optional arg */
@@ -99,7 +104,12 @@ bb_getopt_ulflags (int argc, char **argv, const char *applet_opts, ...)
   }
   complementaly = xcalloc (c + 1, sizeof (t_complementaly));
   c = 0;
-  for (s = applet_opts; *s; s++) {
+  /* skip GNU extension */
+  s = applet_opts;
+  if(*s == '+' || *s == '-')
+       s++;
+
+  for (; *s; s++) {
        complementaly->opt = *s;
        complementaly->switch_on |= (1 << c);
        c++;

diff --git a/networking/httpd.c b/networking/httpd.c
index e5ad7f6..ba65e13 100644 (file)
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1452,7 +1452,9 @@ static int checkPerm(const char *path, const char *request)
                }
 #endif
                if (strcmp(p, request) == 0) {
+#ifdef CONFIG_FEATURE_HTTPD_AUTH_MD5
 set_remoteuser_var:
+#endif
                    config->remoteuser = strdup(request);
                    if(config->remoteuser)
                        config->remoteuser[(u - request)] = 0;