diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-06-30 08:04:05 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-06-30 08:04:05 +0000 |
commit | dc757aa16ce53d9784fa3953b0c3762dfa8ccda9 (patch) | |
tree | 2eee7a83dcbd38fcfbcdbec8b5d52f4baff3326f /networking | |
parent | f7d07b1723c15ee818f0c1f5cce96c55274024a6 (diff) | |
download | busybox-w32-dc757aa16ce53d9784fa3953b0c3762dfa8ccda9.tar.gz busybox-w32-dc757aa16ce53d9784fa3953b0c3762dfa8ccda9.tar.bz2 busybox-w32-dc757aa16ce53d9784fa3953b0c3762dfa8ccda9.zip |
introduce and use bb_basename()
function old new delta
bb_basename - 26 +26
sv_main 1226 1225 -1
passwd_main 1985 1983 -2
showdirs 482 478 -4
sendCgi 1811 1807 -4
make_device 1354 1350 -4
handleIncoming 2443 2439 -4
func_name 82 78 -4
service_name 2292 2285 -7
main 909 901 -8
cmp_main 555 547 -8
test_main 434 422 -12
act 228 216 -12
find_pair 180 164 -16
rmmod_main 298 280 -18
find_pid_by_name 156 134 -22
modprobe_main 1606 1576 -30
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/16 up/down: 26/-156) Total: -130 bytes
text data bss dec hex filename
734933 3028 14400 752361 b7ae9 busybox_old
734801 3028 14400 752229 b7a65 busybox_unstripped
Diffstat (limited to 'networking')
-rw-r--r-- | networking/httpd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/networking/httpd.c b/networking/httpd.c index 383a00635..8c5e29fa8 100644 --- a/networking/httpd.c +++ b/networking/httpd.c | |||
@@ -1125,7 +1125,7 @@ static int sendCgi(const char *url, | |||
1125 | setenv1("HTTP_REFERER", referer); | 1125 | setenv1("HTTP_REFERER", referer); |
1126 | 1126 | ||
1127 | /* set execve argp[0] without path */ | 1127 | /* set execve argp[0] without path */ |
1128 | argp[0] = strrchr(purl, '/') + 1; | 1128 | argp[0] = (char*)bb_basename(purl); |
1129 | /* but script argp[0] must have absolute path and chdiring to this */ | 1129 | /* but script argp[0] must have absolute path and chdiring to this */ |
1130 | script = strrchr(fullpath, '/'); | 1130 | script = strrchr(fullpath, '/'); |
1131 | if (!script) | 1131 | if (!script) |
@@ -1713,7 +1713,7 @@ static void handleIncoming(void) | |||
1713 | if (alarm_signaled) | 1713 | if (alarm_signaled) |
1714 | break; | 1714 | break; |
1715 | 1715 | ||
1716 | if (strcmp(strrchr(url, '/') + 1, httpd_conf) == 0 || ip_allowed == 0) { | 1716 | if (strcmp(bb_basename(url), httpd_conf) == 0 || ip_allowed == 0) { |
1717 | /* protect listing [/path]/httpd_conf or IP deny */ | 1717 | /* protect listing [/path]/httpd_conf or IP deny */ |
1718 | #if ENABLE_FEATURE_HTTPD_CGI | 1718 | #if ENABLE_FEATURE_HTTPD_CGI |
1719 | FORBIDDEN: /* protect listing /cgi-bin */ | 1719 | FORBIDDEN: /* protect listing /cgi-bin */ |