Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/util-linux/losetup.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/util-linux/losetup.c (modified) (2 diffs)

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

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini losetup implementation for busybox
@@ -8 +9 @@
 
 #include <getopt.h>
-#include <stdlib.h>
 
-#include "busybox.h"
+#include "libbb.h"
 
-int losetup_main (int argc, char **argv)
+int losetup_main(int argc, char **argv);
+int losetup_main(int argc, char **argv)
 {
-  int offset = 0;
+    unsigned opt;
+    char *opt_o;
+    unsigned long long offset = 0;
 
-  /* This will need a "while(getopt()!=-1)" loop when we can have more than
-     one option, but for now we can't. */
-  switch(getopt(argc,argv, "do:")) {
-    case 'd':
-      /* detach takes exactly one argument */
-      if(optind+1!=argc) bb_show_usage();
-      if(!del_loop(argv[optind])) return EXIT_SUCCESS;
-die_failed:
-      bb_perror_msg_and_die("%s",argv[optind]);
+    opt = getopt32(argv, "do:", &opt_o);
+    argc -= optind;
+    argv += optind;
 
-    case 'o':
-      offset = bb_xparse_number (optarg, NULL);
-      /* Fall through to do the losetup */
-    case -1:
-      /* losetup takes two argument:, loop_device and file */
-      if(optind+2==argc) {
-    if(set_loop(&argv[optind], argv[optind + 1], offset)>=0)
-      return EXIT_SUCCESS;
-    else goto die_failed;
-      }
-      if(optind+1==argc) {
-    char *s=query_loop(argv[optind]);
-    if (!s) goto die_failed;
-    printf("%s: %s\n",argv[optind],s);
-    if(ENABLE_FEATURE_CLEAN_UP) free(s);
+    if (opt == 0x3) // -d + -o (illegal)
+        bb_show_usage();
+
+    if (opt == 0x1) { // -d
+        /* detach takes exactly one argument */
+        if (argc != 1)
+            bb_show_usage();
+        if (!del_loop(argv[0]))
+            return EXIT_SUCCESS;
+        bb_perror_nomsg_and_die();
+    }
+
+    if (opt == 0x2) // -o
+        offset = xatoull(opt_o);
+
+    /* -o or no option */
+
+    if (argc == 2) {
+        if (set_loop(&argv[0], argv[1], offset) < 0)
+            bb_perror_nomsg_and_die();
+    } else if (argc == 1) {
+        char *s = query_loop(argv[0]);
+        if (!s)
+            bb_perror_nomsg_and_die();
+        printf("%s: %s\n", argv[0], s);
+        if (ENABLE_FEATURE_CLEAN_UP)
+            free(s);
+    } else {
+        char dev[sizeof(LOOP_NAME"0")] = LOOP_NAME"0";
+        char c;
+        for (c = '0'; c <= '9'; ++c) {
+            char *s;
+            dev[sizeof(LOOP_NAME"0")-2] = c;
+            s = query_loop(dev);
+            if (s) {
+                printf("%s: %s\n", dev, s);
+                if (ENABLE_FEATURE_CLEAN_UP)
+                    free(s);
+            }
+        }
+    }
     return EXIT_SUCCESS;
-      }
-      break;
-  }
-  bb_show_usage();
-  return EXIT_FAILURE;
 }