dd: code shrink

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

diff --git a/util-linux/blkid.c b/util-linux/blkid.c
index 53f13a99c50ba975bdae1bfdf3be5e8a991e98f1..1bbc80311224ccc2706c3f4da200cdc3a171ef22 100644 (file)
--- a/util-linux/blkid.c
+++ b/util-linux/blkid.c
@@ -7,14 +7,25 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
+//usage:#define blkid_trivial_usage
+//usage:       "[BLOCKDEV]..."
+//usage:#define blkid_full_usage "\n\n"
+//usage:       "Print UUIDs of all filesystems"
+
 #include "libbb.h"
 #include "volume_id.h"
 
-//TODO: extend to take BLOCKDEV args, and show TYPE="fstype"
-
 int blkid_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int blkid_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
+int blkid_main(int argc UNUSED_PARAM, char **argv)
 {
-       display_uuid_cache();
+       int scan_devices = 1;
+
+       while (*++argv) {
+               /* Note: bogus device names don't cause any error messages */
+               add_to_uuid_cache(*argv);
+               scan_devices = 0;
+       }
+
+       display_uuid_cache(scan_devices);
        return 0;
 }