diff options
| author | Denis Vlasenko | 2008-07-12 10:28:41 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2008-07-12 10:28:41 +0000 |
| commit | a87045ce37e01971bd40219293afdacd4c2317e2 (patch) | |
| tree | e879605365aec335ad2572e25e5439aa1b4846f0 | |
| parent | d9860487e0d88962c1f1ae25ee43bfd0c0b11ad5 (diff) | |
| download | busybox-a87045ce37e01971bd40219293afdacd4c2317e2.zip busybox-a87045ce37e01971bd40219293afdacd4c2317e2.tar.gz | |
mdev: check for "/block/" substring for block dev detection
function old new delta
make_device 1294 1269 -25
| -rw-r--r-- | util-linux/mdev.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/util-linux/mdev.c b/util-linux/mdev.c index 4ac5c43..dd95229 100644 --- a/util-linux/mdev.c +++ b/util-linux/mdev.c @@ -96,13 +96,11 @@ static void make_device(char *path, int delete) /* Determine device name, type, major and minor */ device_name = bb_basename(path); /* http://kernel.org/doc/pending/hotplug.txt says that only - * "/sys/block/..." is for block devices. "/sys/bus" etc is not! - * Since kernel 2.6.25 block devices are also in /sys/class/block. */ - /* TODO: would it be acceptable to just use strstr(path, "/block/")? */ - if (strncmp(&path[5], "class/block/"+6, 6) != 0 - && strncmp(&path[5], "class/block/", 12) != 0) - type = S_IFCHR; - else + * "/sys/block/..." is for block devices. "/sys/bus" etc is not. + * But since 2.6.25 block devices are also in /sys/class/block. + * We use strstr("/block/") to forestall future surprises. */ + type = S_IFCHR; + if (strstr(path, "/block/")) type = S_IFBLK; if (ENABLE_FEATURE_MDEV_CONF) { |