Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/libbb/match_fstype.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/libbb/match_fstype.c (modified) (2 diffs)

branches/3.3/mindi-busybox/libbb/match_fstype.c

@@ -18 +18 @@
 {
     int match = 1;
-    int len;
 
     if (!t_fstype)
@@ -28 +27 @@
     }
 
-    len = strlen(mt->mnt_type);
     while (1) {
-        if (strncmp(mt->mnt_type, t_fstype, len) == 0
-         && (t_fstype[len] == '\0' || t_fstype[len] == ',')
+        char *after_mnt_type = is_prefixed_with(t_fstype, mt->mnt_type);
+        if (after_mnt_type
+         && (*after_mnt_type == '\0' || *after_mnt_type == ',')
         ) {
             return match;