lineedit: do not hang on error, but return error indicator.

[oweals/busybox.git] / libbb / match_fstype.c

diff --git a/libbb/match_fstype.c b/libbb/match_fstype.c
index bd4dbb0640429419bf7ebf9618e5abe852a5094c..83d6e67700b0417154fdb215b739d64e9dda319f 100644 (file)
--- a/libbb/match_fstype.c
+++ b/libbb/match_fstype.c
@@ -5,40 +5,38 @@
  * This allows us to match fstypes that start with no like so
  *   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;
 }