Apply post-1.10.2 fixes, bump version to 1.10.31_10_3

1 files changed, 11 insertions, 4 deletions

diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index f0a885482..2341a5a67 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -72,8 +72,14 @@ 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! */
-        type = (strncmp(&path[5], "block/", 6) == 0 ? S_IFBLK : S_IFCHR);
+         * "/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
+                type = S_IFBLK;
 
         if (ENABLE_FEATURE_MDEV_CONF) {
                 FILE *fp;
@@ -172,8 +178,9 @@ static void make_device(char *path, int delete)
                                         /* substitute %1..9 with off[1..9], if any */
                                         n = 0;
                                         s = val;
-                                        while (*s && *s++ == '%')
-                                                n++;
+                                        while (*s)
+                                                if (*s++ == '%')
+                                                        n++;
 
                                         p = alias = xzalloc(strlen(val) + n * strlen(device_name));
                                         s = val + 1;