diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-05-07 12:18:48 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-05-07 12:18:48 +0000 |
commit | 6bf05cf1ff3debbab2bcc482dffb821aa458177b (patch) | |
tree | 62e5266ba56c91dc6973f7badfdcfde8e81c2a4a /libbb/concat_path_file.c | |
parent | b153ace939f7ab2857605fe10c6ae3ebd903288a (diff) | |
download | busybox-w32-6bf05cf1ff3debbab2bcc482dffb821aa458177b.tar.gz busybox-w32-6bf05cf1ff3debbab2bcc482dffb821aa458177b.tar.bz2 busybox-w32-6bf05cf1ff3debbab2bcc482dffb821aa458177b.zip |
httpd: fix several bugs triggering by realtive path in -h DIR.
function old new delta
handle_incoming_and_exit 2657 2659 +2
send_cgi_and_exit 869 862 -7
parse_conf 1647 1626 -21
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/2 up/down: 2/-28) Total: -26 bytes
Diffstat (limited to 'libbb/concat_path_file.c')
-rw-r--r-- | libbb/concat_path_file.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libbb/concat_path_file.c b/libbb/concat_path_file.c index 9aae601a4..dd6909fc2 100644 --- a/libbb/concat_path_file.c +++ b/libbb/concat_path_file.c | |||
@@ -8,9 +8,11 @@ | |||
8 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 8 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | /* concatenate path and file name to new allocation buffer, | 11 | /* Concatenate path and filename to new allocated buffer. |
12 | * not adding '/' if path name already has '/' | 12 | * Add '/' only as needed (no duplicate // are produced). |
13 | */ | 13 | * If path is NULL, it is assumed to be "/". |
14 | * filename should not be NULL. | ||
15 | */ | ||
14 | 16 | ||
15 | #include "libbb.h" | 17 | #include "libbb.h" |
16 | 18 | ||