diff options
author | Eric Andersen <andersen@codepoet.org> | 2004-08-03 00:14:02 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2004-08-03 00:14:02 +0000 |
commit | 93d7fba89288db6f9263c0ce8026f277bc4649e0 (patch) | |
tree | b8a572b7a2ccc68c5edad3a9691fbb017d7a39ae /libbb/find_root_device.c | |
parent | ec91de762a7d14cbed5e5972279d2378ae2e5a27 (diff) | |
download | busybox-w32-93d7fba89288db6f9263c0ce8026f277bc4649e0.tar.gz busybox-w32-93d7fba89288db6f9263c0ce8026f277bc4649e0.tar.bz2 busybox-w32-93d7fba89288db6f9263c0ce8026f277bc4649e0.zip |
Tito, farmatito at tiscali dot it writes:
Hi to all,
This patch is useful for:
1) remove an unused var from extern char *find_real_root_device_name(const char* name)
changing it to extern char *find_real_root_device_name(void).
2) fixes include/libbb.h, coreutils/df.c, util-linux/mount.c and util-linux/umount.c accordingly.
3) fixes a bug, really a false positive, in find_real_root_device_name() that happens if
in the /dev directory exists a link named root (/dev/root) that should be skipped but
is not. This affects applets like df that display wrong results
Diffstat (limited to 'libbb/find_root_device.c')
-rw-r--r-- | libbb/find_root_device.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libbb/find_root_device.c b/libbb/find_root_device.c index 81824a216..2600ce5e0 100644 --- a/libbb/find_root_device.c +++ b/libbb/find_root_device.c | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | 28 | ||
29 | 29 | ||
30 | extern char *find_real_root_device_name(const char* name) | 30 | extern char *find_real_root_device_name(void) |
31 | { | 31 | { |
32 | DIR *dir; | 32 | DIR *dir; |
33 | struct dirent *entry; | 33 | struct dirent *entry; |
@@ -54,7 +54,11 @@ extern char *find_real_root_device_name(const char* name) | |||
54 | * would get a false positive on ".." */ | 54 | * would get a false positive on ".." */ |
55 | if (myname[0] == '.' && myname[1] == '.' && !myname[2]) | 55 | if (myname[0] == '.' && myname[1] == '.' && !myname[2]) |
56 | continue; | 56 | continue; |
57 | 57 | #ifdef CONFIG_FEATURE_DEVFS | |
58 | /* if there is a link named /dev/root skip that too */ | ||
59 | if (strcmp(myname, "root")==0) | ||
60 | continue; | ||
61 | #endif | ||
58 | fileName = concat_path_file("/dev", myname); | 62 | fileName = concat_path_file("/dev", myname); |
59 | 63 | ||
60 | /* Some char devices have the same dev_t as block | 64 | /* Some char devices have the same dev_t as block |