Fixes so "make allnoconfig" works again.

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

diff --git a/util-linux/losetup.c b/util-linux/losetup.c
index bfeb6b27461ea225594a19fe614b5d38c87aa87e..11bd66ebf31ac8dc34f5817dd24164376e3dd47d 100644 (file)
--- a/util-linux/losetup.c
+++ b/util-linux/losetup.c
@@ -27,32 +27,27 @@
 int
 losetup_main (int argc, char **argv)
 {
-  int delete = 0;
   int offset = 0;
-  int opt;
 
-  while ((opt = getopt (argc, argv, "do:")) != -1)
-    switch (opt)
-      {
-      case 'd':
-       delete = 1;
-       break;
-
-      case 'o':
-       offset = parse_number (optarg, NULL);
-       break;
-
-      default:
-       show_usage ();
-      }
-
-  if ((delete && (offset || optind + 1 != argc))
-      || (!delete && optind + 2 != argc))
-    show_usage ();
-
-  if (delete)
-    return del_loop (argv[optind]) ? EXIT_SUCCESS : EXIT_FAILURE;
-  else
-    return set_loop (argv[optind], argv[optind + 1], offset, &opt)
-      ? EXIT_FAILURE : EXIT_SUCCESS;
+  /* 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)
+        return del_loop(argv[optind]) ? EXIT_SUCCESS : EXIT_FAILURE;
+      break;
+
+    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)
+        return set_loop(&argv[optind], argv[optind + 1], offset)<0
+           ? EXIT_FAILURE : EXIT_SUCCESS;
+      break;
+  }
+  bb_show_usage();
+  return EXIT_FAILURE;
 }