9d1a33c69
Glenn L McGrath
2003-10-06
Subject
Vodz last_patch_105 without his xargs patch which doenst apply cleanly
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
libbb/getopt_ulflags.c+12 -2
| @@ -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++; | |
networking/httpd.c+2 -0
| @@ -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; | |