Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/util-linux/losetup.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/util-linux/losetup.c (modified) (4 diffs)

branches/3.2/mindi-busybox/util-linux/losetup.c

@@ -7 +7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+
+//usage:#define losetup_trivial_usage
+//usage:       "[-r] [-o OFS] LOOPDEV FILE - associate loop devices\n"
+//usage:       "    losetup -d LOOPDEV - disassociate\n"
+//usage:       "    losetup [-f] - show"
+//usage:#define losetup_full_usage "\n\n"
+//usage:       "    -o OFS  Start OFS bytes into FILE"
+//usage:     "\n    -r  Read-only"
+//usage:     "\n    -f  Show first free loop device"
+//usage:
+//usage:#define losetup_notes_usage
+//usage:       "No arguments will display all current associations.\n"
+//usage:       "One argument (losetup /dev/loop1) will display the current association\n"
+//usage:       "(if any), or disassociate it (with -d). The display shows the offset\n"
+//usage:       "and filename of the file the loop device is currently bound to.\n\n"
+//usage:       "Two arguments (losetup /dev/loop1 file.img) create a new association,\n"
+//usage:       "with an optional offset (-o 12345). Encryption is not yet supported.\n"
+//usage:       "losetup -f will show the first loop free loop device\n\n"
 
 #include "libbb.h"
@@ -21 +39 @@
         OPT_o = (1 << 1),
         OPT_f = (1 << 2),
+        OPT_r = (1 << 3), /* must be last */
     };
 
-    /* max 2 args, all opts are mutually exclusive */
+    /* max 2 args, -d,-o,-f opts are mutually exclusive */
     opt_complementary = "?2:d--of:o--df:f--do";
-    opt = getopt32(argv, "do:f", &opt_o);
+    opt = getopt32(argv, "do:fr", &opt_o);
     argv += optind;
 
@@ -47 +66 @@
 
         if (argv[1]) {
-            /* [-o OFS] BLOCKDEV FILE */
-            if (set_loop(&argv[0], argv[1], offset) < 0)
+            /* [-r] [-o OFS] BLOCKDEV FILE */
+            if (set_loop(&argv[0], argv[1], offset, (opt / OPT_r)) < 0)
                 bb_simple_perror_msg_and_die(argv[0]);
             return EXIT_SUCCESS;
         }
-        /* [-o OFS] BLOCKDEV */
+        /* [-r] [-o OFS] BLOCKDEV */
         s = query_loop(argv[0]);
         if (!s)
@@ -62 +81 @@
     }
 
-    /* [-o OFS|-f] with no params */
+    /* [-r] [-o OFS|-f] with no params */
     n = 0;
     while (1) {