diff options
| author | Eric Andersen | 2001-05-15 17:42:16 +0000 |
|---|---|---|
| committer | Eric Andersen | 2001-05-15 17:42:16 +0000 |
| commit | c911a4389bbaa5ac85d725c8c05e452dfba8583d (patch) | |
| tree | a0f435a6239c002578db8f019eb0fb427f1795b3 /libbb/concat_path_file.c | |
| parent | 15649c11f3568ed6f030953844f201438379e03c (diff) | |
| download | busybox-c911a4389bbaa5ac85d725c8c05e452dfba8583d.zip busybox-c911a4389bbaa5ac85d725c8c05e452dfba8583d.tar.gz | |
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
Diffstat (limited to 'libbb/concat_path_file.c')
| -rw-r--r-- | libbb/concat_path_file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libbb/concat_path_file.c b/libbb/concat_path_file.c index 6b7abf2..12a57c8 100644 --- a/libbb/concat_path_file.c +++ b/libbb/concat_path_file.c @@ -11,9 +11,9 @@ extern char *concat_path_file(const char *path, const char *filename) { char *outbuf; - const char *lc; + char *lc; - lc = last_char_is((char*)path, '/'); + lc = last_char_is(path, '/'); if (filename[0] == '/') filename++; outbuf = xmalloc(strlen(path)+strlen(filename)+1+(lc==NULL)); |