summaryrefslogtreecommitdiff
path: root/libbb/concat_path_file.c
diff options
context:
space:
mode:
authorDenis Vlasenko2008-05-07 12:18:48 +0000
committerDenis Vlasenko2008-05-07 12:18:48 +0000
commit6bf05cf1ff3debbab2bcc482dffb821aa458177b (patch)
tree62e5266ba56c91dc6973f7badfdcfde8e81c2a4a /libbb/concat_path_file.c
parentb153ace939f7ab2857605fe10c6ae3ebd903288a (diff)
downloadbusybox-6bf05cf1ff3debbab2bcc482dffb821aa458177b.zip
busybox-6bf05cf1ff3debbab2bcc482dffb821aa458177b.tar.gz
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.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/libbb/concat_path_file.c b/libbb/concat_path_file.c
index 9aae601..dd6909f 100644
--- a/libbb/concat_path_file.c
+++ b/libbb/concat_path_file.c
@@ -8,9 +8,11 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
-/* concatenate path and file name to new allocation buffer,
- * not adding '/' if path name already has '/'
-*/
+/* Concatenate path and filename to new allocated buffer.
+ * Add '/' only as needed (no duplicate // are produced).
+ * If path is NULL, it is assumed to be "/".
+ * filename should not be NULL.
+ */
#include "libbb.h"