[u]mount: extend -t option (Roy Marples <uberlord@gentoo.org>)

diff --git a/include/libbb.h b/include/libbb.h
index b56352626a953cf394381cd66207d0be966d7cc7..dca611b68954ff5290f7e8878ed4aa00c5c10c81 100644 (file)
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -17,6 +17,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
+#include <mntent.h>
 #include <netdb.h>
 #include <setjmp.h>
 #include <signal.h>
@@ -657,6 +658,7 @@ extern struct BB_applet *find_applet_by_name(const char *name);
 extern void run_applet_by_name(const char *name, int argc, char **argv);
 #endif
 
+extern int match_fstype(const struct mntent *mt, const char *fstypes);
 extern struct mntent *find_mount_point(const char *name, const char *table);
 extern void erase_mtab(const char * name);
 extern unsigned int tty_baud_to_value(speed_t speed);

diff --git a/libbb/Kbuild b/libbb/Kbuild
index bdf25da097229547b91104eadae23e1f98937823..4865c9c7c14f80a1fc743ca6f444472f912be245 100644 (file)
--- a/libbb/Kbuild
+++ b/libbb/Kbuild
@@ -51,6 +51,7 @@ lib-y += llist.o
 lib-y += login.o
 lib-y += make_directory.o
 lib-y += makedev.o
+lib-y += match_fstype.o
 lib-y += md5.o
 lib-y += messages.o
 lib-y += mode_string.o

diff --git a/util-linux/mount.c b/util-linux/mount.c
index 567514ccbbdc33232e012767f6dd007fbf39642c..4a0237196287ec711f383169626c1f0ea5c8e538 100644 (file)
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -77,6 +77,7 @@ struct {
                {"defaults", 0},
                /* {"quiet", 0}, - do not filter out, vfat wants to see it */
                {"noauto", MOUNT_NOAUTO},
+               {"sw", MOUNT_SWAP},
                {"swap", MOUNT_SWAP},
                USE_DESKTOP({"user",  MOUNT_USERS},)
                USE_DESKTOP({"users", MOUNT_USERS},)
@@ -1703,9 +1704,7 @@ int mount_main(int argc, char **argv)
 
                } else {
                        // Do we need to match a filesystem type?
-                       // TODO: support "-t type1,type2"; "-t notype1,type2"
-
-                       if (fstype && strcmp(mtcur->mnt_type, fstype)) continue;
+                       if (fstype && match_fstype(mtcur, fstype)) continue;
 
                        // Skip noauto and swap anyway.
 

diff --git a/util-linux/umount.c b/util-linux/umount.c
index 4ea15d91b94cc9dde9c04f6a0e5a8ab0faa549bd..19f13454bc60cfb8afd35636ce99f664b8698bef 100644 (file)
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -12,7 +12,7 @@
 #include <mntent.h>
 #include <getopt.h>
 
-#define OPTION_STRING          "flDnravd"
+#define OPTION_STRING          "flDnravdt:"
 #define OPT_FORCE                      1
 #define OPT_LAZY                       2
 #define OPT_DONTFREELOOP       4
@@ -27,6 +27,7 @@ int umount_main(int argc, char **argv)
        char path[2*PATH_MAX];
        struct mntent me;
        FILE *fp;
+       char *fstype = 0;
        int status = EXIT_SUCCESS;
        unsigned opt;
        struct mtab_list {
@@ -37,7 +38,7 @@ int umount_main(int argc, char **argv)
 
        /* Parse any options */
 
-       opt = getopt32(argc, argv, OPTION_STRING);
+       opt = getopt32(argc, argv, OPTION_STRING, &fstype);
 
        argc -= optind;
        argv += optind;
@@ -61,6 +62,9 @@ int umount_main(int argc, char **argv)
                        bb_error_msg_and_die("cannot open %s", bb_path_mtab_file);
        } else {
                while (getmntent_r(fp, &me, path, sizeof(path))) {
+                       /* Match fstype if passed */
+                       if (fstype && match_fstype(&me, fstype))
+                               continue;
                        m = xmalloc(sizeof(struct mtab_list));
                        m->next = mtl;
                        m->device = xstrdup(me.mnt_fsname);
@@ -71,7 +75,7 @@ int umount_main(int argc, char **argv)
        }
 
        /* If we're not umounting all, we need at least one argument. */
-       if (!(opt & OPT_ALL)) {
+       if (!(opt & OPT_ALL) && !fstype) {
                m = 0;
                if (!argc) bb_show_usage();
        }