diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2011-12-18 03:27:46 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2011-12-18 03:27:46 +0100 |
commit | f282c6b65775d3dff03de6fd3585722a1638f734 (patch) | |
tree | cecec1cf12d3c7c26a23ac5f3e073284e7465af2 /networking | |
parent | f85bd1a7a7e712c4dd2dfd86daa9ab01a708b7b4 (diff) | |
download | busybox-w32-f282c6b65775d3dff03de6fd3585722a1638f734.tar.gz busybox-w32-f282c6b65775d3dff03de6fd3585722a1638f734.tar.bz2 busybox-w32-f282c6b65775d3dff03de6fd3585722a1638f734.zip |
libbb: remove is_directory's argument which is always NULL
function old new delta
send_cgi_and_exit 892 890 -2
ln_main 447 445 -2
handle_incoming_and_exit 2784 2780 -4
is_directory 66 59 -7
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/6 up/down: 2/-19) Total: -15 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking')
-rw-r--r-- | networking/httpd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/networking/httpd.c b/networking/httpd.c index cda7cc7af..e9cd213f1 100644 --- a/networking/httpd.c +++ b/networking/httpd.c | |||
@@ -1302,7 +1302,7 @@ static void send_cgi_and_exit( | |||
1302 | while ((script = strchr(script + 1, '/')) != NULL) { | 1302 | while ((script = strchr(script + 1, '/')) != NULL) { |
1303 | int dir; | 1303 | int dir; |
1304 | *script = '\0'; | 1304 | *script = '\0'; |
1305 | dir = is_directory(url + 1, /*followlinks:*/ 1, NULL); | 1305 | dir = is_directory(url + 1, /*followlinks:*/ 1); |
1306 | *script = '/'; | 1306 | *script = '/'; |
1307 | if (!dir) { | 1307 | if (!dir) { |
1308 | /* not directory, found script.cgi/PATH_INFO */ | 1308 | /* not directory, found script.cgi/PATH_INFO */ |
@@ -2048,7 +2048,7 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr) | |||
2048 | 2048 | ||
2049 | /* If URL is a directory, add '/' */ | 2049 | /* If URL is a directory, add '/' */ |
2050 | if (urlp[-1] != '/') { | 2050 | if (urlp[-1] != '/') { |
2051 | if (is_directory(urlcopy + 1, 1, NULL)) { | 2051 | if (is_directory(urlcopy + 1, /*followlinks:*/ 1)) { |
2052 | found_moved_temporarily = urlcopy; | 2052 | found_moved_temporarily = urlcopy; |
2053 | } | 2053 | } |
2054 | } | 2054 | } |
@@ -2062,7 +2062,7 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr) | |||
2062 | while (ip_allowed && (tptr = strchr(tptr + 1, '/')) != NULL) { | 2062 | while (ip_allowed && (tptr = strchr(tptr + 1, '/')) != NULL) { |
2063 | /* have path1/path2 */ | 2063 | /* have path1/path2 */ |
2064 | *tptr = '\0'; | 2064 | *tptr = '\0'; |
2065 | if (is_directory(urlcopy + 1, 1, NULL)) { | 2065 | if (is_directory(urlcopy + 1, /*followlinks:*/ 1)) { |
2066 | /* may have subdir config */ | 2066 | /* may have subdir config */ |
2067 | parse_conf(urlcopy + 1, SUBDIR_PARSE); | 2067 | parse_conf(urlcopy + 1, SUBDIR_PARSE); |
2068 | ip_allowed = checkPermIP(); | 2068 | ip_allowed = checkPermIP(); |