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

Vodz last_patch_105 without his xargs patch which doenst apply cleanly

Browse Source
This commit is contained in:
Glenn L McGrath 2003-10-06 13:23:06 +00:00
parent add3eadc46
commit 9d1a33c690
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libbb/getopt_ulflags.c
View File

@ -90,7 +90,12 @@ bb_getopt_ulflags (int argc, char **argv, const char *applet_opts, ...)
va_start (p, 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++; c++;
while (s[1] == ':') { while (s[1] == ':') {
/* check GNU extension "o::" - optional arg */ /* 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)); complementaly = xcalloc (c + 1, sizeof (t_complementaly));
c = 0; 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->opt = *s;
complementaly->switch_on |= (1 << c); complementaly->switch_on |= (1 << c);
c++; c++;

2
networking/httpd.c
View File

@ -1452,7 +1452,9 @@ static int checkPerm(const char *path, const char *request)
} }
#endif #endif
if (strcmp(p, request) == 0) { if (strcmp(p, request) == 0) {
#ifdef CONFIG_FEATURE_HTTPD_AUTH_MD5
set_remoteuser_var: set_remoteuser_var:
#endif
config->remoteuser = strdup(request); config->remoteuser = strdup(request);
if(config->remoteuser) if(config->remoteuser)
config->remoteuser[(u - request)] = 0; config->remoteuser[(u - request)] = 0;