Make only on ar7 platforms.

[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..c1197e2 100644 (file)
--- a/package/busybox/patches/340-lock_util.patch
+++ b/package/busybox/patches/340-lock_util.patch
@@ -1,45 +1,50 @@
-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 @@
+diff -ruN busybox-1.3.1-old/include/applets.h busybox-1.3.1/include/applets.h
+--- busybox-1.3.1-old/include/applets.h        2006-12-28 07:43:24.000000000 +0100
++++ busybox-1.3.1/include/applets.h    2006-12-28 03:11:36.000000000 +0100
+@@ -180,6 +180,7 @@
+ USE_LN(APPLET(ln, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_LOADFONT(APPLET(loadfont, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+ USE_LOADKMAP(APPLET(loadkmap, _BB_DIR_SBIN, _BB_SUID_NEVER))
++USE_LOCK(APPLET_NOUSAGE(lock, lock, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_LOGGER(APPLET(logger, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+ USE_LOGIN(APPLET(login, _BB_DIR_BIN, _BB_SUID_ALWAYS))
+ USE_LOGNAME(APPLET(logname, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+diff -ruN busybox-1.3.1-old/miscutils/Config.in busybox-1.3.1/miscutils/Config.in
+--- busybox-1.3.1-old/miscutils/Config.in      2006-12-27 05:56:09.000000000 +0100
++++ busybox-1.3.1/miscutils/Config.in  2006-12-28 03:14:16.000000000 +0100
+@@ -232,6 +232,12 @@
          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"
 +      default y
 +      help
 +        Small utility for using locks in scripts
 +
- config CONFIG_MAKEDEVS
+ config 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 @@
+diff -ruN busybox-1.3.1-old/miscutils/Kbuild busybox-1.3.1/miscutils/Kbuild
+--- busybox-1.3.1-old/miscutils/Kbuild 2006-12-27 05:56:09.000000000 +0100
++++ busybox-1.3.1/miscutils/Kbuild     2006-12-28 03:15:47.000000000 +0100
+@@ -15,6 +15,7 @@
+ lib-$(CONFIG_HDPARM)      += hdparm.o
+ lib-$(CONFIG_LAST)        += last.o
+ lib-$(CONFIG_LESS)        += less.o
++lib-$(CONFIG_LOCK)        += lock.o
+ lib-$(CONFIG_MAKEDEVS)    += makedevs.o
+ lib-$(CONFIG_MOUNTPOINT)  += mountpoint.o
+ lib-$(CONFIG_MT)          += mt.o
+diff -ruN busybox-1.3.1-old/miscutils/lock.c busybox-1.3.1/miscutils/lock.c
+--- busybox-1.3.1-old/miscutils/lock.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.3.1/miscutils/lock.c     2006-12-28 03:11:36.000000000 +0100
+@@ -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>
@@ -68,7 +73,6 @@ diff -urN busybox.old/miscutils/lock.c busybox.dev/miscutils/lock.c
 +static void exit_unlock(int sig)
 +{
 +      flock(fd, LOCK_UN);
-+      unlink(file);
 +      exit(0);
 +}
 +
@@ -77,10 +81,13 @@ diff -urN busybox.old/miscutils/lock.c busybox.dev/miscutils/lock.c
 +      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);
++      
 +      fclose(f);
 +
 +      return 0;
@@ -91,9 +98,11 @@ diff -urN busybox.old/miscutils/lock.c busybox.dev/miscutils/lock.c
 +      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) {
@@ -126,6 +135,7 @@ diff -urN busybox.old/miscutils/lock.c busybox.dev/miscutils/lock.c
 +
 +              return 0;
 +      }
++      return 0;
 +}
 +
 +#ifndef CONFIG_LOCK