X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/676c017ecfced2e37aeec176f8aa6b9df90024f3..ba43ecdcd5b3c047e9722b5b29c8aa1357e3f218:/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 f5c0c2e89..1d781f281 100644 --- a/package/busybox/patches/340-lock_util.patch +++ b/package/busybox/patches/340-lock_util.patch @@ -1,45 +1,54 @@ -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 @@ +Index: busybox-1.8.1/include/applets.h +=================================================================== +--- busybox-1.8.1.orig/include/applets.h 2007-11-10 16:54:28.318054115 +0100 ++++ busybox-1.8.1/include/applets.h 2007-11-10 17:39:21.487529096 +0100 +@@ -218,6 +218,7 @@ + USE_LOAD_POLICY(APPLET(load_policy, _BB_DIR_USR_SBIN, _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_NOFORK(logname, logname, _BB_DIR_USR_BIN, _BB_SUID_NEVER, logname)) +Index: busybox-1.8.1/miscutils/Config.in +=================================================================== +--- busybox-1.8.1.orig/miscutils/Config.in 2007-11-10 16:54:16.477379354 +0100 ++++ busybox-1.8.1/miscutils/Config.in 2007-11-10 16:54:28.366056851 +0100 +@@ -244,6 +244,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 @@ +Index: busybox-1.8.1/miscutils/Kbuild +=================================================================== +--- busybox-1.8.1.orig/miscutils/Kbuild 2007-11-10 16:54:16.481379580 +0100 ++++ busybox-1.8.1/miscutils/Kbuild 2007-11-10 16:54:28.370057076 +0100 +@@ -16,6 +16,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_MICROCOM) += microcom.o + lib-$(CONFIG_MOUNTPOINT) += mountpoint.o +Index: busybox-1.8.1/miscutils/lock.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.8.1/miscutils/lock.c 2007-11-10 17:40:37.203843924 +0100 +@@ -0,0 +1,132 @@ ++/* ++ * Copyright (C) 2006 Felix Fietkau ++ * ++ * This is free software, licensed under the GNU General Public License v2. ++ */ +#include +#include +#include @@ -47,7 +56,7 @@ diff -urN busybox.old/miscutils/lock.c busybox.dev/miscutils/lock.c +#include +#include +#include -+#include "busybox.h" ++#include "busybox.h" + +static int unlock = 0; +static int shared = 0; @@ -68,7 +77,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); +} + @@ -76,24 +84,29 @@ 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; +} -+ ++ +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) { @@ -105,7 +118,7 @@ diff -urN busybox.old/miscutils/lock.c busybox.dev/miscutils/lock.c + + if (pid < 0) + return -1; -+ ++ + if (pid == 0) { + signal(SIGKILL, exit_unlock); + signal(SIGTERM, exit_unlock); @@ -126,13 +139,11 @@ diff -urN busybox.old/miscutils/lock.c busybox.dev/miscutils/lock.c + + 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) -+#endif +{ + char **args = &argv[1]; + int c = argc - 1;