block: add support for partitions numbered greater than 9

fnmatch() not match for partitions with numbers greater than 9
(e.g. /dev/mmcblk1p65) for the "mmcblk[0-9]p[0-9]" pattern.

Change-Id: I21ee910ac8bcb00bdc8067f0ece331f2f913bb5a
(cherry picked from commit 9df472a2f80ac3244dfb99aecf42cfb65c04fb47)

diff --git a/src/block/block.c b/src/block/block.c
index 6c0568d431de6efd40bbc8fca6be35b5cdae0895..94566048029c18ee1cbd5d1c6feb034f72f300df 100644 (file)
--- a/src/block/block.c
+++ b/src/block/block.c
@@ -62,12 +62,12 @@
 #include "storaged_common.h"
 
 #define MMC_PATH                     "*/mmcblk[0-9]*"
-#define MMC_PARTITION_PATH           "mmcblk[0-9]p[0-9]"
+#define MMC_PARTITION_PATH           "mmcblk[0-9]p[0-9]*"
 /* Emulator send devlink for sdcard as \*\/sdcard\/\* */
 #define MMC_LINK_PATH                "*/sdcard/*"
-#define MMC_LINK_PARTITION_PATH      "vd[a-z][0-9]"
+#define MMC_LINK_PARTITION_PATH      "vd[a-z][0-9]*"
 #define SCSI_PATH                    "*/sd[a-z]*"
-#define SCSI_PARTITION_PATH          "sd[a-z][0-9]"
+#define SCSI_PARTITION_PATH          "sd[a-z][0-9]*"
 #define SCSI_PARTITION_LENGTH        9
 #define EXTENDEDSD_NODE_PATH         "/dev/mapper/extendedsd"
 #define DEVICE_MAPPER_ROOT_NODE_PATH "/dev/mapper/rootfs"