package/ppp: fix typo in r28868 (closes: #10429)

[openwrt.git] / package / busybox / patches / 340-lock_util.patch

diff --git a/package/busybox/patches/340-lock_util.patch b/package/busybox/patches/340-lock_util.patch
index f5c0c2e..fd657b6 100644 (file)
--- a/package/busybox/patches/340-lock_util.patch
+++ b/package/busybox/patches/340-lock_util.patch
@@ -1,45 +1,45 @@
-diff -urN busybox.old/include/applets.h busybox.dev/include/applets.h
---- busybox.old/include/applets.h      2006-04-05 01:06:29.000000000 +0200
-+++ busybox.dev/include/applets.h      2006-04-05 01:19:09.000000000 +0200
-@@ -167,6 +167,7 @@
- USE_LN(APPLET(ln, ln_main, _BB_DIR_BIN, _BB_SUID_NEVER))
- USE_LOADFONT(APPLET(loadfont, loadfont_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
- USE_LOADKMAP(APPLET(loadkmap, loadkmap_main, _BB_DIR_SBIN, _BB_SUID_NEVER))
-+USE_LOCK(APPLET_NOUSAGE(lock, lock_main, _BB_DIR_BIN, _BB_SUID_NEVER))
- USE_LOGGER(APPLET(logger, logger_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
- USE_LOGIN(APPLET(login, login_main, _BB_DIR_BIN, _BB_SUID_ALWAYS))
- USE_LOGNAME(APPLET(logname, logname_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
-diff -urN busybox.old/miscutils/Config.in busybox.dev/miscutils/Config.in
---- busybox.old/miscutils/Config.in    2006-03-22 22:16:24.000000000 +0100
-+++ busybox.dev/miscutils/Config.in    2006-04-05 01:07:12.000000000 +0200
-@@ -209,6 +209,12 @@
+--- a/include/applets.src.h
++++ b/include/applets.src.h
+@@ -218,6 +218,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))
++IF_LOCK(APPLET(lock, BB_DIR_BIN, BB_SUID_DROP))
+ IF_LOGGER(APPLET(logger, BB_DIR_USR_BIN, BB_SUID_DROP))
+ /* Needs to be run by root or be suid root - needs to change uid and gid: */
+ IF_LOGIN(APPLET(login, BB_DIR_BIN, BB_SUID_REQUIRE))
+--- a/miscutils/Config.src
++++ b/miscutils/Config.src
+@@ -419,6 +419,11 @@ config FEATURE_HDPARM_HDIO_GETSET_DMA
+       help

          Enables the 'hdparm -d' option to get/set using_dma flag.
          Enables the 'hdparm -d' option to get/set using_dma flag.

-         This is dangerous stuff, so you should probably say N.

  
  

-+config CONFIG_LOCK
++config LOCK

 +      bool "lock"
 +      bool "lock"

-+      default y

 +      help
 +        Small utility for using locks in scripts
 +
 +      help
 +        Small utility for using locks in scripts
 +

- config CONFIG_MAKEDEVS
+ config MAKEDEVS

        bool "makedevs"
        bool "makedevs"

-       default n
-diff -urN busybox.old/miscutils/Makefile.in busybox.dev/miscutils/Makefile.in
---- busybox.old/miscutils/Makefile.in  2006-03-22 22:16:24.000000000 +0100
-+++ busybox.dev/miscutils/Makefile.in  2006-04-05 01:10:50.000000000 +0200
-@@ -20,6 +20,7 @@
- MISCUTILS-$(CONFIG_EJECT)       += eject.o
- MISCUTILS-$(CONFIG_HDPARM)      += hdparm.o
- MISCUTILS-$(CONFIG_LAST)        += last.o
-+MISCUTILS-$(CONFIG_LOCK)        += lock.o
- MISCUTILS-${CONFIG_LESS}        += less.o
- MISCUTILS-$(CONFIG_MAKEDEVS)    += makedevs.o
- MISCUTILS-$(CONFIG_MOUNTPOINT)  += mountpoint.o
-diff -urN busybox.old/miscutils/lock.c busybox.dev/miscutils/lock.c
---- busybox.old/miscutils/lock.c       1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/miscutils/lock.c       2006-04-05 01:07:12.000000000 +0200
-@@ -0,0 +1,125 @@
+       default y
+--- a/miscutils/Kbuild.src
++++ b/miscutils/Kbuild.src
+@@ -29,6 +29,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
++lib-$(CONFIG_LOCK)        += lock.o
+ lib-$(CONFIG_MAKEDEVS)    += makedevs.o
+ lib-$(CONFIG_MAN)         += man.o
+ lib-$(CONFIG_MICROCOM)    += microcom.o
+--- /dev/null
++++ b/miscutils/lock.c
+@@ -0,0 +1,135 @@
++/*
++ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
++ *
++ * This is free software, licensed under the GNU General Public License v2.
++ */

 +#include <sys/types.h>
 +#include <sys/file.h>
 +#include <sys/stat.h>
 +#include <sys/types.h>
 +#include <sys/file.h>
 +#include <sys/stat.h>


@@ -47,7 +47,10 @@ diff -urN busybox.old/miscutils/lock.c busybox.dev/miscutils/lock.c
 +#include <fcntl.h>
 +#include <unistd.h>
 +#include <stdio.h>
 +#include <fcntl.h>
 +#include <unistd.h>
 +#include <stdio.h>

-+#include "busybox.h" 
++#include "busybox.h"
++
++//usage:#define lock_trivial_usage NOUSAGE_STR
++//usage:#define lock_full_usage ""

 +
 +static int unlock = 0;
 +static int shared = 0;
 +
 +static int unlock = 0;
 +static int shared = 0;


@@ -68,7 +71,6 @@ diff -urN busybox.old/miscutils/lock.c busybox.dev/miscutils/lock.c
 +static void exit_unlock(int sig)
 +{
 +      flock(fd, LOCK_UN);
 +static void exit_unlock(int sig)
 +{
 +      flock(fd, LOCK_UN);

-+      unlink(file);

 +      exit(0);
 +}
 +
 +      exit(0);
 +}
 +


@@ -76,24 +78,29 @@ diff -urN busybox.old/miscutils/lock.c busybox.dev/miscutils/lock.c
 +{
 +      FILE *f;
 +      int i;
 +{
 +      FILE *f;
 +      int i;

-+      
-+      f = fopen(file, "r");
++
++      if ((f = fopen(file, "r")) == NULL)
++              return 0;
++

 +      fscanf(f, "%d", &i);
 +      if (i > 0)
 +              kill(i, SIGTERM);
 +      fscanf(f, "%d", &i);
 +      if (i > 0)
 +              kill(i, SIGTERM);

++

 +      fclose(f);
 +
 +      return 0;
 +}
 +      fclose(f);
 +
 +      return 0;
 +}

-+              
++

 +static int do_lock(void)
 +{
 +      int pid;
 +      char pidstr[8];
 +
 +static int do_lock(void)
 +{
 +      int pid;
 +      char pidstr[8];
 +

-+      if ((fd = open(file, O_RDWR | O_CREAT, 0700)) < 0) {
-+              fprintf(stderr, "Can't open %s\n", file);
-+              return 1;
++      if ((fd = open(file, O_RDWR | O_CREAT | O_EXCL, 0700)) < 0) {
++              if ((fd = open(file, O_RDWR)) < 0) {
++                      fprintf(stderr, "Can't open %s\n", file);
++                      return 1;
++              }

 +      }
 +
 +      if (flock(fd, (shared ? LOCK_SH : LOCK_EX)) < 0) {
 +      }
 +
 +      if (flock(fd, (shared ? LOCK_SH : LOCK_EX)) < 0) {


@@ -105,7 +112,7 @@ diff -urN busybox.old/miscutils/lock.c busybox.dev/miscutils/lock.c
 +
 +      if (pid < 0)
 +              return -1;
 +
 +      if (pid < 0)
 +              return -1;

-+      
++

 +      if (pid == 0) {
 +              signal(SIGKILL, exit_unlock);
 +              signal(SIGTERM, exit_unlock);
 +      if (pid == 0) {
 +              signal(SIGKILL, exit_unlock);
 +              signal(SIGTERM, exit_unlock);


@@ -126,13 +133,11 @@ diff -urN busybox.old/miscutils/lock.c busybox.dev/miscutils/lock.c
 +
 +              return 0;
 +      }
 +
 +              return 0;
 +      }

++      return 0;

 +}
 +
 +}
 +

-+#ifndef CONFIG_LOCK
-+int main(int argc, char **argv)
-+#else
++int lock_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;

 +int lock_main(int argc, char **argv)
 +int lock_main(int argc, char **argv)

-+#endif

 +{
 +      char **args = &argv[1];
 +      int c = argc - 1;
 +{
 +      char **args = &argv[1];
 +      int c = argc - 1;