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 /include | |
| parent | b153ace939f7ab2857605fe10c6ae3ebd903288a (diff) | |
| download | 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 'include')
| -rw-r--r-- | include/libbb.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/libbb.h b/include/libbb.h index dfcc96d5b..281152f5f 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -938,6 +938,10 @@ int bb_ask_confirmation(void); extern int bb_parse_mode(const char* s, mode_t* theMode); +/* 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. */ char *concat_path_file(const char *path, const char *filename); char *concat_subpath_file(const char *path, const char *filename); const char *bb_basename(const char *name); |