diff options
| author | Timo Teras <timo.teras@iki.fi> | 2010-03-18 22:45:35 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-03-18 22:45:35 +0100 |
| commit | 892d4b6b3d7e9950ff3708ca957e1e0590dd5a2d (patch) | |
| tree | 7b3064dca217fdec81a15e150e7beb0cdc84b9dd /include | |
| parent | 8531d76a15890c2c535908ce888b2e2aed35b172 (diff) | |
| download | busybox-892d4b6b3d7e9950ff3708ca957e1e0590dd5a2d.tar.gz | |
flock: new applet
function old new delta
flock_main - 253 +253
packed_usage 26466 26498 +32
applet_names 2170 2176 +6
applet_main 1280 1284 +4
applet_nameofs 640 642 +2
applet_install_loc 160 161 +1
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 5/0 up/down: 298/0) Total: 298 bytes
Signed-off-by: Timo Teras <timo.teras@iki.fi>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/applets.h | 1 | ||||
| -rw-r--r-- | include/usage.h | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/applets.h b/include/applets.h index 2d784bd84..83c1792ac 100644 --- a/include/applets.h +++ b/include/applets.h @@ -161,6 +161,7 @@ IF_FLASH_ERASEALL(APPLET(flash_eraseall, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) IF_FLASH_LOCK(APPLET_ODDNAME(flash_lock, flash_lock_unlock, _BB_DIR_USR_SBIN, _BB_SUID_DROP, flash_lock)) IF_FLASH_UNLOCK(APPLET_ODDNAME(flash_unlock, flash_lock_unlock, _BB_DIR_USR_SBIN, _BB_SUID_DROP, flash_unlock)) IF_FLASHCP(APPLET(flashcp, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) +IF_FLOCK(APPLET(flock, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_FOLD(APPLET(fold, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_FREE(APPLET(free, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_FREERAMDISK(APPLET(freeramdisk, _BB_DIR_SBIN, _BB_SUID_DROP)) diff --git a/include/usage.h b/include/usage.h index f4259a11d..0aea010c7 100644 --- a/include/usage.h +++ b/include/usage.h @@ -1312,6 +1312,16 @@ "\nOptions:" \ "\n -v Verbose" \ +#define flock_trivial_usage \ + "[-sxun] FD|FILE [[-c] PROG ARGS]" +#define flock_full_usage "\n\n" \ + "[Un]lock file descriptor or file, then run PROG\n" \ + "\nOptions:" \ + "\n -s Shared lock" \ + "\n -x Exclusive lock (default)" \ + "\n -u Remove a lock from FD" \ + "\n -n Fail rather than wait" \ + #define fold_trivial_usage \ "[-bs] [-w WIDTH] [FILE]..." #define fold_full_usage "\n\n" \ |