Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/util-linux/flock.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/flock.c (modified) (3 diffs)

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

@@ -4 +4 @@
  * This is free software, licensed under the GNU General Public License v2.
  */
+
+//usage:#define flock_trivial_usage
+//usage:       "[-sxun] FD|{FILE [-c] PROG ARGS}"
+//usage:#define flock_full_usage "\n\n"
+//usage:       "[Un]lock file descriptor, or lock FILE, run PROG\n"
+//usage:     "\n    -s  Shared lock"
+//usage:     "\n    -x  Exclusive lock (default)"
+//usage:     "\n    -u  Unlock FD"
+//usage:     "\n    -n  Fail rather than wait"
+
 #include <sys/file.h>
 #include "libbb.h"
@@ -20 +30 @@
 
 #if ENABLE_LONG_OPTS
-        static const char getopt_longopts[] ALIGN1 =
+    static const char getopt_longopts[] ALIGN1 =
         "shared\0"      No_argument       "s"
         "exclusive\0"   No_argument       "x"
@@ -36 +46 @@
         fd = open(argv[0], O_RDONLY|O_NOCTTY|O_CREAT, 0666);
         if (fd < 0 && errno == EISDIR)
-                fd = open(argv[0], O_RDONLY|O_NOCTTY);
+            fd = open(argv[0], O_RDONLY|O_NOCTTY);
         if (fd < 0)
             bb_perror_msg_and_die("can't open '%s'", argv[0]);