fix compile error with 2.4

[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 a86948d..5bce455 100644 (file)
--- a/package/busybox/patches/340-lock_util.patch
+++ b/package/busybox/patches/340-lock_util.patch
@@ -1,12 +1,8 @@
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-diff -ruN busybox-1.2.0-old/include/applets.h busybox-1.2.0-new/include/applets.h
---- busybox-1.2.0-old/include/applets.h        2006-07-31 11:21:00.000000000 +0200
-+++ busybox-1.2.0-new/include/applets.h        2006-08-01 10:21:15.000000000 +0200
-@@ -169,6 +169,7 @@
+Index: busybox-1.4.2/include/applets.h
+===================================================================
+--- busybox-1.4.2.orig/include/applets.h       2007-06-04 13:21:34.188779184 +0200
++++ busybox-1.4.2/include/applets.h    2007-06-04 13:21:34.786688288 +0200
+@@ -178,6 +178,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))
@@ -14,26 +10,40 @@ diff -ruN busybox-1.2.0-old/include/applets.h busybox-1.2.0-new/include/applets.
  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.2.0-old/miscutils/Config.in busybox-1.2.0-new/miscutils/Config.in
---- busybox-1.2.0-old/miscutils/Config.in      2006-07-01 00:42:09.000000000 +0200
-+++ busybox-1.2.0-new/miscutils/Config.in      2006-08-01 10:21:15.000000000 +0200
-@@ -231,6 +231,12 @@
+Index: busybox-1.4.2/miscutils/Config.in
+===================================================================
+--- busybox-1.4.2.orig/miscutils/Config.in     2007-06-04 13:21:32.136091240 +0200
++++ busybox-1.4.2/miscutils/Config.in  2007-06-04 13:21:34.786688288 +0200
+@@ -237,6 +237,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 -ruN busybox-1.2.0-old/miscutils/lock.c busybox-1.2.0-new/miscutils/lock.c
---- busybox-1.2.0-old/miscutils/lock.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.2.0-new/miscutils/lock.c 2006-08-01 10:21:15.000000000 +0200
-@@ -0,0 +1,133 @@
+Index: busybox-1.4.2/miscutils/Kbuild
+===================================================================
+--- busybox-1.4.2.orig/miscutils/Kbuild        2007-06-04 13:21:32.142090328 +0200
++++ busybox-1.4.2/miscutils/Kbuild     2007-06-04 13:21:34.786688288 +0200
+@@ -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
+Index: busybox-1.4.2/miscutils/lock.c
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/miscutils/lock.c     2007-06-04 13:21:34.787688136 +0200
+@@ -0,0 +1,135 @@
 +/*
 + * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
 + *
@@ -67,7 +77,6 @@ diff -ruN busybox-1.2.0-old/miscutils/lock.c busybox-1.2.0-new/miscutils/lock.c
 +static void exit_unlock(int sig)
 +{
 +      flock(fd, LOCK_UN);
-+      unlink(file);
 +      exit(0);
 +}
 +
@@ -93,9 +102,11 @@ diff -ruN busybox-1.2.0-old/miscutils/lock.c busybox-1.2.0-new/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) {
@@ -128,6 +139,7 @@ diff -ruN busybox-1.2.0-old/miscutils/lock.c busybox-1.2.0-new/miscutils/lock.c
 +
 +              return 0;
 +      }
++      return 0;
 +}
 +
 +#ifndef CONFIG_LOCK
@@ -167,14 +179,3 @@ diff -ruN busybox-1.2.0-old/miscutils/lock.c busybox-1.2.0-new/miscutils/lock.c
 +      else
 +              return do_lock();
 +}
-diff -ruN busybox-1.2.0-old/miscutils/Makefile.in busybox-1.2.0-new/miscutils/Makefile.in
---- busybox-1.2.0-old/miscutils/Makefile.in    2006-07-01 00:42:09.000000000 +0200
-+++ busybox-1.2.0-new/miscutils/Makefile.in    2006-08-01 10:21:15.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