Major rewrite of mount, umount, losetup. Untangled lots of code, shrunk

things down a bit, fixed a number of funky corner cases, added support for
several new features (things like mount --move, mount --bind, lazy unounts,
automatic detection of loop mounts, and so on).  Probably broke several
other things, but it's fixable.  (Bang on it, tell me what doesn't work for
you...)

Note: you no longer need to say "-o loop".  It does that for you when
necessary.

Still need to add "user mount" support, which involves making mount suid.  Not
too hard to do under the new infrastructure, just haven't done it yet...

The previous code had the following notes, that belong in the version
control comments:

- * 3/21/1999   Charles P. Wright <cpwright@cpwright.com>
- *             searches through fstab when -a is passed
- *             will try mounting stuff with all fses when passed -t auto
- *
- * 1999-04-17  Dave Cinege...Rewrote -t auto. Fixed ro mtab.
- *
- * 1999-10-07  Erik Andersen <andersen@codepoet.org>.
- *              Rewrite of a lot of code. Removed mtab usage (I plan on
- *              putting it back as a compile-time option some time),
- *              major adjustments to option parsing, and some serious
- *              dieting all around.
- *
- * 1999-11-06  mtab support is back - andersee
- *
- * 2000-01-12   Ben Collins <bcollins@debian.org>, Borrowed utils-linux's
- *              mount to add loop support.
- *
- * 2000-04-30  Dave Cinege <dcinege@psychosis.com>
- *             Rewrote fstab while loop and lower mount section. Can now do
- *             single mounts from fstab. Can override fstab options for single
- *             mount. Common mount_one call for single mounts and 'all'. Fixed
- *             mtab updating and stale entries. Removed 'remount' default.
- *

1 files changed, 21 insertions, 27 deletions

diff --git a/util-linux/losetup.c b/util-linux/losetup.c
index c944565..11bd66e 100644
--- a/util-linux/losetup.c
+++ b/util-linux/losetup.c
@@ -27,33 +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 = bb_xparse_number (optarg, NULL);
-	break;
-
-      default:
-	bb_show_usage();
-      }
-
-  if ((delete && (offset || optind + 1 != argc))
-      || (!delete && optind + 2 != argc))
-    bb_show_usage();
-
-  opt = 0;
-  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;
 }