aboutsummaryrefslogtreecommitdiffstats
path: root/package/busybox
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-02-12 16:35:23 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-02-12 16:35:23 +0000
commitfc55109a12fd61aa7bdbd2178a70c0469c49df68 (patch)
tree0493ebe4c740bd6bc60d9c5013631f1fdd250c18 /package/busybox
parent0da2d96c84d951c7ec8ea6285a2b10f6fda9819f (diff)
downloadmaster-187ad058-fc55109a12fd61aa7bdbd2178a70c0469c49df68.tar.gz
master-187ad058-fc55109a12fd61aa7bdbd2178a70c0469c49df68.tar.bz2
master-187ad058-fc55109a12fd61aa7bdbd2178a70c0469c49df68.zip
fix for multiple lock/unlock operations in 'lock' command (found by framer99)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6286 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/busybox')
-rw-r--r--package/busybox/patches/340-lock_util.patch3
1 files changed, 1 insertions, 2 deletions
diff --git a/package/busybox/patches/340-lock_util.patch b/package/busybox/patches/340-lock_util.patch
index a92fa3e047..c1197e24e1 100644
--- a/package/busybox/patches/340-lock_util.patch
+++ b/package/busybox/patches/340-lock_util.patch
@@ -39,7 +39,7 @@ diff -ruN busybox-1.3.1-old/miscutils/Kbuild busybox-1.3.1/miscutils/Kbuild
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,136 @@
+@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
+ *
@@ -73,7 +73,6 @@ diff -ruN busybox-1.3.1-old/miscutils/lock.c busybox-1.3.1/miscutils/lock.c
+static void exit_unlock(int sig)
+{
+ flock(fd, LOCK_UN);
-+ unlink(file);
+ exit(0);
+}
+