aboutsummaryrefslogtreecommitdiff
path: root/libbb/concat_path_file.c
diff options
context:
space:
mode:
authorandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2001-05-15 17:42:16 +0000
committerandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2001-05-15 17:42:16 +0000
commit4556650b13ac68ca7a536ac1664cc66cbb3e3b23 (patch)
treea0f435a6239c002578db8f019eb0fb427f1795b3 /libbb/concat_path_file.c
parent6ebe0d2d046886fcfc2a9bdd6294fe9c38932811 (diff)
downloadbusybox-w32-4556650b13ac68ca7a536ac1664cc66cbb3e3b23.tar.gz
busybox-w32-4556650b13ac68ca7a536ac1664cc66cbb3e3b23.tar.bz2
busybox-w32-4556650b13ac68ca7a536ac1664cc66cbb3e3b23.zip
Patch from Vladimir:
1) fixed a bug that could crash df, mount, and umount applets if the root device name was longer then the word "root" (/dev/loop1 vs /dev/root) - 2) severl functions needed static declaration in the umount applet 3) update declaration for function in last_char_is() in libbb git-svn-id: svn://busybox.net/trunk/busybox@2647 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'libbb/concat_path_file.c')
-rw-r--r--libbb/concat_path_file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libbb/concat_path_file.c b/libbb/concat_path_file.c
index 6b7abf24b..12a57c837 100644
--- a/libbb/concat_path_file.c
+++ b/libbb/concat_path_file.c
@@ -11,9 +11,9 @@
11extern char *concat_path_file(const char *path, const char *filename) 11extern char *concat_path_file(const char *path, const char *filename)
12{ 12{
13 char *outbuf; 13 char *outbuf;
14 const char *lc; 14 char *lc;
15 15
16 lc = last_char_is((char*)path, '/'); 16 lc = last_char_is(path, '/');
17 if (filename[0] == '/') 17 if (filename[0] == '/')
18 filename++; 18 filename++;
19 outbuf = xmalloc(strlen(path)+strlen(filename)+1+(lc==NULL)); 19 outbuf = xmalloc(strlen(path)+strlen(filename)+1+(lc==NULL));