Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/match_fstype.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/match_fstype.c (modified) (1 diff)

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

@@ -6 +6 @@
  *   mount -at ,noddy
  *
- * Returns 0 for a match, otherwise -1
+ * Returns 1 for a match, otherwise 0
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
 
-int match_fstype(const struct mntent *mt, const char *fstype)
+int FAST_FUNC match_fstype(const struct mntent *mt, const char *t_fstype)
 {
-    int no = 0;
+    int match = 1;
     int len;
 
-    if (!mt)
-        return -1;
+    if (!t_fstype)
+        return match;
 
-    if (!fstype)
-        return 0;
-
-    if (fstype[0] == 'n' && fstype[1] == 'o') {
-        no = -1;
-        fstype += 2;
+    if (t_fstype[0] == 'n' && t_fstype[1] == 'o') {
+        match--;
+        t_fstype += 2;
     }
 
     len = strlen(mt->mnt_type);
-    while (fstype) {
-        if (!strncmp(mt->mnt_type, fstype, len)
-         && (!fstype[len] || fstype[len] == ',')
+    while (1) {
+        if (strncmp(mt->mnt_type, t_fstype, len) == 0
+         && (t_fstype[len] == '\0' || t_fstype[len] == ',')
         ) {
-            return no;
+            return match;
         }
-        fstype = strchr(fstype, ',');
-        if (fstype)
-            fstype++;
+        t_fstype = strchr(t_fstype, ',');
+        if (!t_fstype)
+            break;
+        t_fstype++;
     }
 
-    return -(no + 1);
+    return !match;
 }