summaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorEric Andersen2001-05-15 17:42:16 +0000
committerEric Andersen2001-05-15 17:42:16 +0000
commitc911a4389bbaa5ac85d725c8c05e452dfba8583d (patch)
treea0f435a6239c002578db8f019eb0fb427f1795b3 /coreutils
parent15649c11f3568ed6f030953844f201438379e03c (diff)
downloadbusybox-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 'coreutils')
-rw-r--r--coreutils/df.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/coreutils/df.c b/coreutils/df.c
index 21a1dbb..df68744 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -60,7 +60,9 @@ static int do_df(char *device, const char *mount_point)
if (strcmp(device, "/dev/root") == 0) {
/* Adjusts device to be the real root device,
* or leaves device alone if it can't find it */
- find_real_root_device_name( device);
+ device = find_real_root_device_name(device);
+ if(device==NULL)
+ return FALSE;
}
#ifdef BB_FEATURE_HUMAN_READABLE
switch (df_disp_hr) {