diff options
| author | Eric Andersen | 2004-08-03 00:14:02 +0000 |
|---|---|---|
| committer | Eric Andersen | 2004-08-03 00:14:02 +0000 |
| commit | 93d7fba89288db6f9263c0ce8026f277bc4649e0 (patch) | |
| tree | b8a572b7a2ccc68c5edad3a9691fbb017d7a39ae /util-linux | |
| parent | ec91de762a7d14cbed5e5972279d2378ae2e5a27 (diff) | |
| download | busybox-93d7fba89288db6f9263c0ce8026f277bc4649e0.zip busybox-93d7fba89288db6f9263c0ce8026f277bc4649e0.tar.gz | |
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 'util-linux')
| -rw-r--r-- | util-linux/mount.c | 2 | ||||
| -rw-r--r-- | util-linux/umount.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c index 0bc46ec..b059d70 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c @@ -345,7 +345,7 @@ static void show_mounts(char *onlytype) if (strcmp(blockDevice, "rootfs") == 0) { continue; } else if (strcmp(blockDevice, "/dev/root") == 0) { - blockDevice = find_real_root_device_name(blockDevice); + blockDevice = find_real_root_device_name(); } if (!onlytype || (strcmp(m->mnt_type, onlytype) == 0)) { printf("%s on %s type %s (%s)\n", blockDevice, m->mnt_dir, diff --git a/util-linux/umount.c b/util-linux/umount.c index 37a8f06..21c2e6e 100644 --- a/util-linux/umount.c +++ b/util-linux/umount.c @@ -115,7 +115,7 @@ static char *mtab_getinfo(const char *match, const char which) } else if (strcmp(cur->device, "/dev/root") == 0) { /* Adjusts device to be the real root device, * or leaves device alone if it can't find it */ - cur->device = find_real_root_device_name(cur->device); + cur->device = find_real_root_device_name(); } #endif return cur->device; |