 06fa1c46fc
			
		
	
	06fa1c46fc
	
	
	
		
			
			The following patches were removed:
010-networking-fix-uninitialized-memory-when-displaying-.patch
  https://git.busybox.net/busybox/commit/?id=f2c043acfcf9dad9fd3d65821b81f89986bbe54e
030-ip-fix-problem-on-mips64-n64-big-endian-musl-systems.patch
  https://git.busybox.net/busybox/commit/?id=4ab372d49a6e82b0bf097dedb96d26330c5f2d5f
204-udhcpc_src_ip_rebind.patch
  https://git.busybox.net/busybox/commit/?id=abe8f7515aded80889d78c2c1c8947997918cf90
230-ntpd_delayed_resolve.patch
  https://git.busybox.net/busybox/commit/?id=c8641962e4cbde48108ddfc1c105e3320778190d
  https://git.busybox.net/busybox/commit/?id=e4caf1dd9ce8569371a0eeb77ccf02a572dc0f11
260-arping_missing_includes.patch
  Not needed any more, still builds with musl for me.
  Add in 92fd6e6f1a "busybox: fix arping applet building on musl"
The Kconfig files were updated with these commands:
cd config
../convert_menuconfig.pl .../build_dir/target-*/busybox-1.25.0
cd ..
./convert_defaults.pl < .../build_dir/target-*/busybox-1.25.0/.config > Config-defaults.in
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
		
	
		
			
				
	
	
		
			183 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			183 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
| --- a/include/applets.src.h
 | |
| +++ b/include/applets.src.h
 | |
| @@ -196,6 +196,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_LOGNAME(APPLET_NOFORK(logname, logname, BB_DIR_USR_BIN, BB_SUID_DROP, logname))
 | |
|  IF_LOSETUP(APPLET(losetup, BB_DIR_SBIN, BB_SUID_DROP))
 | |
|  IF_LS(APPLET_NOEXEC(ls, ls, BB_DIR_BIN, BB_SUID_DROP, ls))
 | |
| --- a/miscutils/Config.src
 | |
| +++ b/miscutils/Config.src
 | |
| @@ -375,6 +375,12 @@ config FEATURE_HDPARM_HDIO_GETSET_DMA
 | |
|  	help
 | |
|  	  Enables the 'hdparm -d' option to get/set using_dma flag.
 | |
|  
 | |
| +config LOCK
 | |
| +	bool "lock"
 | |
| +	default n
 | |
| +	help
 | |
| +	  Small utility for using locks in scripts
 | |
| +
 | |
|  config MAKEDEVS
 | |
|  	bool "makedevs"
 | |
|  	default y
 | |
| --- a/miscutils/Kbuild.src
 | |
| +++ b/miscutils/Kbuild.src
 | |
| @@ -33,6 +33,7 @@ lib-$(CONFIG_LAST)        += last.o
 | |
|  endif
 | |
|  
 | |
|  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,144 @@
 | |
| +/*
 | |
| + * Copyright (C) 2006 Felix Fietkau <nbd@nbd.name>
 | |
| + *
 | |
| + * 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 <signal.h>
 | |
| +#include <fcntl.h>
 | |
| +#include <unistd.h>
 | |
| +#include <stdio.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 waitonly = 0;
 | |
| +static int try_lock = 0;
 | |
| +static int fd;
 | |
| +static char *file;
 | |
| +
 | |
| +static void usage(char *name)
 | |
| +{
 | |
| +	fprintf(stderr, "Usage: %s [-suw] <filename>\n"
 | |
| +	                "	-s	Use shared locking\n"
 | |
| +	                "	-u	Unlock\n"
 | |
| +	                "	-w	Wait for the lock to become free, don't acquire lock\n"
 | |
| +			"	-n	Don't wait for the lock to become free. Fail with exit code\n"
 | |
| +					"\n", name);
 | |
| +	exit(1);
 | |
| +}
 | |
| +
 | |
| +static void exit_unlock(int sig)
 | |
| +{
 | |
| +	flock(fd, LOCK_UN);
 | |
| +	exit(0);
 | |
| +}
 | |
| +
 | |
| +static int do_unlock(void)
 | |
| +{
 | |
| +	FILE *f;
 | |
| +	int i;
 | |
| +
 | |
| +	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;
 | |
| +	int flags;
 | |
| +	char pidstr[8];
 | |
| +
 | |
| +	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;
 | |
| +		}
 | |
| +	}
 | |
| +
 | |
| +	flags = shared ? LOCK_SH : LOCK_EX;
 | |
| +	flags |= try_lock ? LOCK_NB : 0;
 | |
| +
 | |
| +	if (flock(fd, flags) < 0) {
 | |
| +		fprintf(stderr, "Can't lock %s\n", file);
 | |
| +		return 1;
 | |
| +	}
 | |
| +
 | |
| +	pid = fork();
 | |
| +
 | |
| +	if (pid < 0)
 | |
| +		return -1;
 | |
| +
 | |
| +	if (pid == 0) {
 | |
| +		signal(SIGKILL, exit_unlock);
 | |
| +		signal(SIGTERM, exit_unlock);
 | |
| +		signal(SIGINT, exit_unlock);
 | |
| +		if (waitonly)
 | |
| +			exit_unlock(0);
 | |
| +		else
 | |
| +			while (1)
 | |
| +				sleep(1);
 | |
| +	} else {
 | |
| +		if (!waitonly) {
 | |
| +			lseek(fd, 0, SEEK_SET);
 | |
| +			ftruncate(fd, 0);
 | |
| +			sprintf(pidstr, "%d\n", pid);
 | |
| +			write(fd, pidstr, strlen(pidstr));
 | |
| +			close(fd);
 | |
| +		}
 | |
| +
 | |
| +		return 0;
 | |
| +	}
 | |
| +	return 0;
 | |
| +}
 | |
| +
 | |
| +int lock_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 | |
| +int lock_main(int argc, char **argv)
 | |
| +{
 | |
| +	char **args = &argv[1];
 | |
| +	int c = argc - 1;
 | |
| +
 | |
| +	while ((*args != NULL) && (*args)[0] == '-') {
 | |
| +		char *ch = *args;
 | |
| +		while (*(++ch) > 0) {
 | |
| +			switch(*ch) {
 | |
| +				case 'w':
 | |
| +					waitonly = 1;
 | |
| +					break;
 | |
| +				case 's':
 | |
| +					shared = 1;
 | |
| +					break;
 | |
| +				case 'u':
 | |
| +					unlock = 1;
 | |
| +					break;
 | |
| +				case 'n':
 | |
| +					try_lock = 1;
 | |
| +					break;
 | |
| +			}
 | |
| +		}
 | |
| +		c--;
 | |
| +		args++;
 | |
| +	}
 | |
| +
 | |
| +	if (c != 1)
 | |
| +		usage(argv[0]);
 | |
| +
 | |
| +	file = *args;
 | |
| +	if (unlock)
 | |
| +		return do_unlock();
 | |
| +	else
 | |
| +		return do_lock();
 | |
| +}
 |