treewide: fix replace nbd@openwrt.org with nbd@nbd.name

[openwrt.git] / package / utils / busybox / patches / 220-add_lock_util.patch

diff --git a/package/utils/busybox/patches/220-add_lock_util.patch b/package/utils/busybox/patches/220-add_lock_util.patch
index ce663b6..047d32e 100644 (file)
--- a/package/utils/busybox/patches/220-add_lock_util.patch
+++ b/package/utils/busybox/patches/220-add_lock_util.patch
@@ -1,6 +1,6 @@
 --- a/include/applets.src.h
 +++ b/include/applets.src.h
-@@ -212,6 +212,7 @@ IF_LN(APPLET_NOEXEC(ln, ln, BB_DIR_BIN, 
+@@ -211,6 +211,7 @@ IF_LN(APPLET_NOEXEC(ln, ln, BB_DIR_BIN,
  IF_LOAD_POLICY(APPLET(load_policy, BB_DIR_USR_SBIN, BB_SUID_DROP))
  IF_LOADFONT(APPLET(loadfont, BB_DIR_USR_SBIN, BB_SUID_DROP))
  IF_LOADKMAP(APPLET(loadkmap, BB_DIR_SBIN, BB_SUID_DROP))
@@ -10,7 +10,7 @@
  IF_LOGIN(APPLET(login, BB_DIR_BIN, BB_SUID_REQUIRE))
 --- a/miscutils/Config.src
 +++ b/miscutils/Config.src
-@@ -419,6 +419,12 @@ config FEATURE_HDPARM_HDIO_GETSET_DMA
+@@ -385,6 +385,12 @@ config FEATURE_HDPARM_HDIO_GETSET_DMA
        help
          Enables the 'hdparm -d' option to get/set using_dma flag.
  
@@ -25,7 +25,7 @@
        default y
 --- a/miscutils/Kbuild.src
 +++ b/miscutils/Kbuild.src
-@@ -29,6 +29,7 @@ lib-$(CONFIG_INOTIFYD)    += inotifyd.o
+@@ -28,6 +28,7 @@ lib-$(CONFIG_INOTIFYD)    += inotifyd.o
  lib-$(CONFIG_FEATURE_LAST_SMALL)+= last.o
  lib-$(CONFIG_FEATURE_LAST_FANCY)+= last_fancy.o
  lib-$(CONFIG_LESS)        += less.o
@@ -35,9 +35,9 @@
  lib-$(CONFIG_MICROCOM)    += microcom.o
 --- /dev/null
 +++ b/miscutils/lock.c
-@@ -0,0 +1,135 @@
+@@ -0,0 +1,144 @@
 +/*
-+ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
++ * Copyright (C) 2006 Felix Fietkau <nbd@nbd.name>
 + *
 + * This is free software, licensed under the GNU General Public License v2.
 + */
@@ -56,6 +56,7 @@
 +static int unlock = 0;
 +static int shared = 0;
 +static int waitonly = 0;
++static int try_lock = 0;
 +static int fd;
 +static char *file;
 +
@@ -65,6 +66,7 @@
 +                      "       -s      Use shared locking\n"
 +                      "       -u      Unlock\n"
 +                      "       -w      Wait for the lock to become free, don't acquire lock\n"
++                      "       -n      Don't wait for the lock to become free. Fail with exit code\n"
 +                                      "\n", name);
 +      exit(1);
 +}
@@ -95,6 +97,7 @@
 +static int do_lock(void)
 +{
 +      int pid;
++      int flags;
 +      char pidstr[8];
 +
 +      if ((fd = open(file, O_RDWR | O_CREAT | O_EXCL, 0700)) < 0) {
@@ -104,7 +107,10 @@
 +              }
 +      }
 +
-+      if (flock(fd, (shared ? LOCK_SH : LOCK_EX)) < 0) {
++      flags = shared ? LOCK_SH : LOCK_EX;
++      flags |= try_lock ? LOCK_NB : 0;
++
++      if (flock(fd, flags) < 0) {
 +              fprintf(stderr, "Can't lock %s\n", file);
 +              return 1;
 +      }
@@ -156,6 +162,9 @@
 +                              case 'u':
 +                                      unlock = 1;
 +                                      break;
++                              case 'n':
++                                      try_lock = 1;
++                                      break;
 +                      }
 +              }
 +              c--;