hush: HUSH_READONLY depends on HUSH

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

diff --git a/libbb/match_fstype.c b/libbb/match_fstype.c
index 32c3d7f188a1c941ef56fdf76becb761c9026f59..6046bc6db882a822bcf986243d6077b5302c3d44 100644 (file)
--- a/libbb/match_fstype.c
+++ b/libbb/match_fstype.c
@@ -12,35 +12,30 @@
 
 #include "libbb.h"
 
-#ifdef HAVE_MNTENT_H
-
-int FAST_FUNC match_fstype(const struct mntent *mt, const char *t_fstype)
+int FAST_FUNC fstype_matches(const char *fstype, const char *comma_list)
 {
        int match = 1;
-       int len;
 
-       if (!t_fstype)
+       if (!comma_list)
                return match;
 
-       if (t_fstype[0] == 'n' && t_fstype[1] == 'o') {
+       if (comma_list[0] == 'n' && comma_list[1] == 'o') {
                match--;
-               t_fstype += 2;
+               comma_list += 2;
        }
 
-       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(comma_list, fstype);
+               if (after_mnt_type
+                && (*after_mnt_type == '\0' || *after_mnt_type == ',')
                ) {
                        return match;
                }
-               t_fstype = strchr(t_fstype, ',');
-               if (!t_fstype)
+               comma_list = strchr(comma_list, ',');
+               if (!comma_list)
                        break;
-               t_fstype++;
+               comma_list++;
        }
 
        return !match;
 }
-
-#endif /* HAVE_MNTENT_H */