dd: speed measurement. optional.

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

diff --git a/util-linux/losetup.c b/util-linux/losetup.c
index a9ecfd58b95ca556de737904469f284e187b61e0..e224a4d541cf65774b35734b965e5f83e6d14638 100644 (file)
--- a/util-linux/losetup.c
+++ b/util-linux/losetup.c
@@ -7,8 +7,6 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <getopt.h>
-
 #include "libbb.h"
 
 int losetup_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -20,7 +18,7 @@ int losetup_main(int argc, char **argv)
        char *s;
        unsigned long long offset = 0;
 
-       /* max 2 args, all opts are mutially exclusive */
+       /* max 2 args, all opts are mutually exclusive */
        opt_complementary = "?2:d--of:o--df:f-do";
        opt = getopt32(argv, "do:f", &opt_o);
        argc -= optind;
@@ -37,14 +35,14 @@ int losetup_main(int argc, char **argv)
                if (argc != 1)
                        bb_show_usage();
                if (del_loop(argv[0]))
-                       bb_perror_nomsg_and_die();
+                       bb_simple_perror_msg_and_die(argv[0]);
                return EXIT_SUCCESS;
        }
 
        if (argc == 2) {
                /* -o or no option */
                if (set_loop(&argv[0], argv[1], offset) < 0)
-                       bb_perror_nomsg_and_die();
+                       bb_simple_perror_msg_and_die(argv[0]);
                return EXIT_SUCCESS;
        }
 
@@ -52,7 +50,7 @@ int losetup_main(int argc, char **argv)
                /* -o or no option */
                s = query_loop(argv[0]);
                if (!s)
-                       bb_perror_nomsg_and_die();
+                       bb_simple_perror_msg_and_die(argv[0]);
                printf("%s: %s\n", argv[0], s);
                if (ENABLE_FEATURE_CLEAN_UP)
                        free(s);