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

[oweals/busybox.git] / util-linux / findfs.c

diff --git a/util-linux/findfs.c b/util-linux/findfs.c
index 4f036425cf1ad6f0e718ed6963d82e94bdbc8ea1..e1ec41f1b8117383aa6ec30a9788095f19fb36ad 100644 (file)
--- a/util-linux/findfs.c
+++ b/util-linux/findfs.c
@@ -5,34 +5,35 @@
  * Copyright (C) 2006 by Jason Schoon <floydpink@gmail.com>
  * Some portions cribbed from e2fsprogs, util-linux, dosfstools
  *
- * 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"
 #include "volume_id.h"
 
 int findfs_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int findfs_main(int argc, char **argv)
+int findfs_main(int argc UNUSED_PARAM, char **argv)
 {
-       char *tmp = NULL;
+       char *dev = *++argv;
 
-       if (argc != 2)
-               bb_show_usage();                                                                                                             
-
-       if (!strncmp(argv[1], "LABEL=", 6))
-               tmp = get_devname_from_label(argv[1] + 6);
-       else if (!strncmp(argv[1], "UUID=", 5))
-               tmp = get_devname_from_uuid(argv[1] + 5);
-       else if (!strncmp(argv[1], "/dev/", 5)) {
-               /* Just pass a device name right through.  This might aid in some scripts
-               being able to call this unconditionally */
-               tmp = argv[1];
-       } else
+       if (!dev)
                bb_show_usage();
-               
-       if (tmp) { 
-               puts(tmp);                                                                                                                   
+
+       if (strncmp(dev, "/dev/", 5) == 0) {
+               /* Just pass any /dev/xxx name right through.
+                * This might aid in some scripts being able
+                * to call this unconditionally */
+               dev = NULL;
+       } else {
+               /* Otherwise, handle LABEL=xxx and UUID=xxx,
+                * fail on anything else */
+               if (!resolve_mount_spec(argv))
+                       bb_show_usage();
+       }
+
+       if (*argv != dev) {
+               puts(*argv);
                return 0;
        }
        return 1;
-}    
+}