just include fcntl.h not sys/fcntl.h

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

diff --git a/util-linux/losetup.c b/util-linux/losetup.c
index 11bd66ebf31ac8dc34f5817dd24164376e3dd47d..c2d3339e0ab3c4fbe48e35eea04e346f01cf0016 100644 (file)
--- a/util-linux/losetup.c
+++ b/util-linux/losetup.c
@@ -3,20 +3,7 @@
  *
  * Copyright (C) 2002  Matt Kraai.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <getopt.h>
@@ -24,8 +11,7 @@
 
 #include "busybox.h"
 
-int
-losetup_main (int argc, char **argv)
+int losetup_main (int argc, char **argv)
 {
   int offset = 0;
 
@@ -34,18 +20,28 @@ losetup_main (int argc, char **argv)
   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;
+      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]);
 
     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;
+      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);
+       return EXIT_SUCCESS;
+      }
       break;
   }
   bb_show_usage();