diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-29 14:57:33 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-29 14:57:33 +0100 |
commit | 205d48e9480e3a60f2bf1094f67d837f1b44aea5 (patch) | |
tree | d395165adcaa9f2cb03372f126a38111c931dcbe | |
parent | b4b12bf2344148976d1cd0f17bca0c0fbf7a364c (diff) | |
download | busybox-w32-205d48e9480e3a60f2bf1094f67d837f1b44aea5.tar.gz busybox-w32-205d48e9480e3a60f2bf1094f67d837f1b44aea5.tar.bz2 busybox-w32-205d48e9480e3a60f2bf1094f67d837f1b44aea5.zip |
*: add comment about APPLET_ODDNAME format
It confused me more than once
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | archival/bbunzip.c | 48 | ||||
-rw-r--r-- | archival/lzop.c | 3 | ||||
-rw-r--r-- | coreutils/expand.c | 1 | ||||
-rw-r--r-- | coreutils/who.c | 1 | ||||
-rw-r--r-- | findutils/grep.c | 1 | ||||
-rw-r--r-- | init/halt.c | 3 | ||||
-rw-r--r-- | loginutils/add-remove-shell.c | 1 | ||||
-rw-r--r-- | miscutils/flash_lock_unlock.c | 3 | ||||
-rw-r--r-- | miscutils/ubi_tools.c | 11 | ||||
-rw-r--r-- | modutils/modprobe-small.c | 5 | ||||
-rw-r--r-- | networking/hostname.c | 1 | ||||
-rw-r--r-- | networking/ifupdown.c | 3 | ||||
-rw-r--r-- | printutils/lpr.c | 1 | ||||
-rw-r--r-- | procps/kill.c | 3 | ||||
-rw-r--r-- | procps/pgrep.c | 1 | ||||
-rw-r--r-- | runit/chpst.c | 3 | ||||
-rw-r--r-- | selinux/setfiles.c | 1 | ||||
-rw-r--r-- | shell/ash.c | 3 | ||||
-rw-r--r-- | shell/hush.c | 5 | ||||
-rw-r--r-- | util-linux/freeramdisk.c | 1 | ||||
-rw-r--r-- | util-linux/mkfs_ext2.c | 3 | ||||
-rw-r--r-- | util-linux/mkfs_minix.c | 1 | ||||
-rw-r--r-- | util-linux/mkfs_vfat.c | 3 | ||||
-rw-r--r-- | util-linux/setarch.c | 1 | ||||
-rw-r--r-- | util-linux/swaponoff.c | 3 |
25 files changed, 69 insertions, 41 deletions
diff --git a/archival/bbunzip.c b/archival/bbunzip.c index fb7a3678d..0e2a261f0 100644 --- a/archival/bbunzip.c +++ b/archival/bbunzip.c | |||
@@ -314,6 +314,7 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv) | |||
314 | //config: depends on (GUNZIP || ZCAT) && LONG_OPTS | 314 | //config: depends on (GUNZIP || ZCAT) && LONG_OPTS |
315 | 315 | ||
316 | //applet:IF_GUNZIP(APPLET(gunzip, BB_DIR_BIN, BB_SUID_DROP)) | 316 | //applet:IF_GUNZIP(APPLET(gunzip, BB_DIR_BIN, BB_SUID_DROP)) |
317 | // APPLET_ODDNAME:name main location suid_type help | ||
317 | //applet:IF_ZCAT(APPLET_ODDNAME(zcat, gunzip, BB_DIR_BIN, BB_SUID_DROP, zcat)) | 318 | //applet:IF_ZCAT(APPLET_ODDNAME(zcat, gunzip, BB_DIR_BIN, BB_SUID_DROP, zcat)) |
318 | #if ENABLE_FEATURE_GZIP_DECOMPRESS | 319 | #if ENABLE_FEATURE_GZIP_DECOMPRESS |
319 | static | 320 | static |
@@ -425,6 +426,7 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv) | |||
425 | //config: Alias to "bunzip2 -c". | 426 | //config: Alias to "bunzip2 -c". |
426 | 427 | ||
427 | //applet:IF_BUNZIP2(APPLET(bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP)) | 428 | //applet:IF_BUNZIP2(APPLET(bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP)) |
429 | // APPLET_ODDNAME:name main location suid_type help | ||
428 | //applet:IF_BZCAT(APPLET_ODDNAME(bzcat, bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP, bzcat)) | 430 | //applet:IF_BZCAT(APPLET_ODDNAME(bzcat, bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP, bzcat)) |
429 | #if ENABLE_FEATURE_BZIP2_DECOMPRESS | 431 | #if ENABLE_FEATURE_BZIP2_DECOMPRESS |
430 | int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 432 | int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
@@ -467,26 +469,6 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv) | |||
467 | //usage: "[FILE]..." | 469 | //usage: "[FILE]..." |
468 | //usage:#define lzcat_full_usage "\n\n" | 470 | //usage:#define lzcat_full_usage "\n\n" |
469 | //usage: "Decompress to stdout" | 471 | //usage: "Decompress to stdout" |
470 | //usage: | ||
471 | //usage:#define unxz_trivial_usage | ||
472 | //usage: "[-cf] [FILE]..." | ||
473 | //usage:#define unxz_full_usage "\n\n" | ||
474 | //usage: "Decompress FILE (or stdin)\n" | ||
475 | //usage: "\n -c Write to stdout" | ||
476 | //usage: "\n -f Force" | ||
477 | //usage: | ||
478 | //usage:#define xz_trivial_usage | ||
479 | //usage: "-d [-cf] [FILE]..." | ||
480 | //usage:#define xz_full_usage "\n\n" | ||
481 | //usage: "Decompress FILE (or stdin)\n" | ||
482 | //usage: "\n -d Decompress" | ||
483 | //usage: "\n -c Write to stdout" | ||
484 | //usage: "\n -f Force" | ||
485 | //usage: | ||
486 | //usage:#define xzcat_trivial_usage | ||
487 | //usage: "[FILE]..." | ||
488 | //usage:#define xzcat_full_usage "\n\n" | ||
489 | //usage: "Decompress to stdout" | ||
490 | 472 | ||
491 | //config:config UNLZMA | 473 | //config:config UNLZMA |
492 | //config: bool "unlzma" | 474 | //config: bool "unlzma" |
@@ -528,8 +510,9 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv) | |||
528 | //config: a 1K bigger binary. | 510 | //config: a 1K bigger binary. |
529 | 511 | ||
530 | //applet:IF_UNLZMA(APPLET(unlzma, BB_DIR_USR_BIN, BB_SUID_DROP)) | 512 | //applet:IF_UNLZMA(APPLET(unlzma, BB_DIR_USR_BIN, BB_SUID_DROP)) |
513 | // APPLET_ODDNAME:name main location suid_type help | ||
531 | //applet:IF_LZCAT(APPLET_ODDNAME(lzcat, unlzma, BB_DIR_USR_BIN, BB_SUID_DROP, lzcat)) | 514 | //applet:IF_LZCAT(APPLET_ODDNAME(lzcat, unlzma, BB_DIR_USR_BIN, BB_SUID_DROP, lzcat)) |
532 | //applet:IF_LZMA(APPLET_ODDNAME(lzma, unlzma, BB_DIR_USR_BIN, BB_SUID_DROP, lzma)) | 515 | //applet:IF_LZMA( APPLET_ODDNAME(lzma, unlzma, BB_DIR_USR_BIN, BB_SUID_DROP, lzma)) |
533 | //kbuild:lib-$(CONFIG_UNLZMA) += bbunzip.o | 516 | //kbuild:lib-$(CONFIG_UNLZMA) += bbunzip.o |
534 | //kbuild:lib-$(CONFIG_LZCAT) += bbunzip.o | 517 | //kbuild:lib-$(CONFIG_LZCAT) += bbunzip.o |
535 | //kbuild:lib-$(CONFIG_LZMA) += bbunzip.o | 518 | //kbuild:lib-$(CONFIG_LZMA) += bbunzip.o |
@@ -553,6 +536,26 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv) | |||
553 | #endif | 536 | #endif |
554 | 537 | ||
555 | 538 | ||
539 | //usage:#define unxz_trivial_usage | ||
540 | //usage: "[-cf] [FILE]..." | ||
541 | //usage:#define unxz_full_usage "\n\n" | ||
542 | //usage: "Decompress FILE (or stdin)\n" | ||
543 | //usage: "\n -c Write to stdout" | ||
544 | //usage: "\n -f Force" | ||
545 | //usage: | ||
546 | //usage:#define xz_trivial_usage | ||
547 | //usage: "-d [-cf] [FILE]..." | ||
548 | //usage:#define xz_full_usage "\n\n" | ||
549 | //usage: "Decompress FILE (or stdin)\n" | ||
550 | //usage: "\n -d Decompress" | ||
551 | //usage: "\n -c Write to stdout" | ||
552 | //usage: "\n -f Force" | ||
553 | //usage: | ||
554 | //usage:#define xzcat_trivial_usage | ||
555 | //usage: "[FILE]..." | ||
556 | //usage:#define xzcat_full_usage "\n\n" | ||
557 | //usage: "Decompress to stdout" | ||
558 | |||
556 | //config:config UNXZ | 559 | //config:config UNXZ |
557 | //config: bool "unxz" | 560 | //config: bool "unxz" |
558 | //config: default y | 561 | //config: default y |
@@ -573,8 +576,9 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv) | |||
573 | //config: IOW: you'll get xz applet, but it will always require -d option. | 576 | //config: IOW: you'll get xz applet, but it will always require -d option. |
574 | 577 | ||
575 | //applet:IF_UNXZ(APPLET(unxz, BB_DIR_USR_BIN, BB_SUID_DROP)) | 578 | //applet:IF_UNXZ(APPLET(unxz, BB_DIR_USR_BIN, BB_SUID_DROP)) |
579 | // APPLET_ODDNAME:name main location suid_type help | ||
576 | //applet:IF_XZCAT(APPLET_ODDNAME(xzcat, unxz, BB_DIR_USR_BIN, BB_SUID_DROP, xzcat)) | 580 | //applet:IF_XZCAT(APPLET_ODDNAME(xzcat, unxz, BB_DIR_USR_BIN, BB_SUID_DROP, xzcat)) |
577 | //applet:IF_XZ(APPLET_ODDNAME(xz, unxz, BB_DIR_USR_BIN, BB_SUID_DROP, xz)) | 581 | //applet:IF_XZ( APPLET_ODDNAME(xz, unxz, BB_DIR_USR_BIN, BB_SUID_DROP, xz)) |
578 | //kbuild:lib-$(CONFIG_UNXZ) += bbunzip.o | 582 | //kbuild:lib-$(CONFIG_UNXZ) += bbunzip.o |
579 | //kbuild:lib-$(CONFIG_XZCAT) += bbunzip.o | 583 | //kbuild:lib-$(CONFIG_XZCAT) += bbunzip.o |
580 | //kbuild:lib-$(CONFIG_XZ) += bbunzip.o | 584 | //kbuild:lib-$(CONFIG_XZ) += bbunzip.o |
diff --git a/archival/lzop.c b/archival/lzop.c index e0e90ac6c..ca61add3c 100644 --- a/archival/lzop.c +++ b/archival/lzop.c | |||
@@ -53,7 +53,8 @@ | |||
53 | //config: and take up 3.2K of code. | 53 | //config: and take up 3.2K of code. |
54 | 54 | ||
55 | //applet:IF_LZOP(APPLET(lzop, BB_DIR_BIN, BB_SUID_DROP)) | 55 | //applet:IF_LZOP(APPLET(lzop, BB_DIR_BIN, BB_SUID_DROP)) |
56 | //applet:IF_UNLZOP(APPLET_ODDNAME(unlzop, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, unlzop)) | 56 | // APPLET_ODDNAME:name main location suid_type help |
57 | //applet:IF_UNLZOP( APPLET_ODDNAME(unlzop, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, unlzop)) | ||
57 | //applet:IF_LZOPCAT(APPLET_ODDNAME(lzopcat, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, lzopcat)) | 58 | //applet:IF_LZOPCAT(APPLET_ODDNAME(lzopcat, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, lzopcat)) |
58 | //kbuild:lib-$(CONFIG_LZOP) += lzop.o | 59 | //kbuild:lib-$(CONFIG_LZOP) += lzop.o |
59 | //kbuild:lib-$(CONFIG_UNLZOP) += lzop.o | 60 | //kbuild:lib-$(CONFIG_UNLZOP) += lzop.o |
diff --git a/coreutils/expand.c b/coreutils/expand.c index 63b682330..9ce86ebff 100644 --- a/coreutils/expand.c +++ b/coreutils/expand.c | |||
@@ -43,6 +43,7 @@ | |||
43 | //config: depends on UNEXPAND && LONG_OPTS | 43 | //config: depends on UNEXPAND && LONG_OPTS |
44 | 44 | ||
45 | //applet:IF_EXPAND(APPLET(expand, BB_DIR_USR_BIN, BB_SUID_DROP)) | 45 | //applet:IF_EXPAND(APPLET(expand, BB_DIR_USR_BIN, BB_SUID_DROP)) |
46 | // APPLET_ODDNAME:name main location suid_type help | ||
46 | //applet:IF_UNEXPAND(APPLET_ODDNAME(unexpand, expand, BB_DIR_USR_BIN, BB_SUID_DROP, unexpand)) | 47 | //applet:IF_UNEXPAND(APPLET_ODDNAME(unexpand, expand, BB_DIR_USR_BIN, BB_SUID_DROP, unexpand)) |
47 | 48 | ||
48 | //kbuild:lib-$(CONFIG_EXPAND) += expand.o | 49 | //kbuild:lib-$(CONFIG_EXPAND) += expand.o |
diff --git a/coreutils/who.c b/coreutils/who.c index ac19dc720..e6179bb00 100644 --- a/coreutils/who.c +++ b/coreutils/who.c | |||
@@ -30,6 +30,7 @@ | |||
30 | //config: help | 30 | //config: help |
31 | //config: Print users currently logged on. | 31 | //config: Print users currently logged on. |
32 | 32 | ||
33 | // APPLET_ODDNAME:name main location suid_type help | ||
33 | //applet:IF_USERS(APPLET_ODDNAME(users, who, BB_DIR_USR_BIN, BB_SUID_DROP, users)) | 34 | //applet:IF_USERS(APPLET_ODDNAME(users, who, BB_DIR_USR_BIN, BB_SUID_DROP, users)) |
34 | //applet:IF_WHO(APPLET(who, BB_DIR_USR_BIN, BB_SUID_DROP)) | 35 | //applet:IF_WHO(APPLET(who, BB_DIR_USR_BIN, BB_SUID_DROP)) |
35 | 36 | ||
diff --git a/findutils/grep.c b/findutils/grep.c index 547e3d576..ec7605d85 100644 --- a/findutils/grep.c +++ b/findutils/grep.c | |||
@@ -46,6 +46,7 @@ | |||
46 | //config: Print the specified number of context lines (-C). | 46 | //config: Print the specified number of context lines (-C). |
47 | 47 | ||
48 | //applet:IF_GREP(APPLET(grep, BB_DIR_BIN, BB_SUID_DROP)) | 48 | //applet:IF_GREP(APPLET(grep, BB_DIR_BIN, BB_SUID_DROP)) |
49 | // APPLET_ODDNAME:name main location suid_type help | ||
49 | //applet:IF_EGREP(APPLET_ODDNAME(egrep, grep, BB_DIR_BIN, BB_SUID_DROP, egrep)) | 50 | //applet:IF_EGREP(APPLET_ODDNAME(egrep, grep, BB_DIR_BIN, BB_SUID_DROP, egrep)) |
50 | //applet:IF_FGREP(APPLET_ODDNAME(fgrep, grep, BB_DIR_BIN, BB_SUID_DROP, fgrep)) | 51 | //applet:IF_FGREP(APPLET_ODDNAME(fgrep, grep, BB_DIR_BIN, BB_SUID_DROP, fgrep)) |
51 | 52 | ||
diff --git a/init/halt.c b/init/halt.c index b7fb10869..f69b89772 100644 --- a/init/halt.c +++ b/init/halt.c | |||
@@ -46,8 +46,9 @@ | |||
46 | //config: locating telinit executable. | 46 | //config: locating telinit executable. |
47 | 47 | ||
48 | //applet:IF_HALT(APPLET(halt, BB_DIR_SBIN, BB_SUID_DROP)) | 48 | //applet:IF_HALT(APPLET(halt, BB_DIR_SBIN, BB_SUID_DROP)) |
49 | // APPLET_ODDNAME:name main location suid_type help | ||
49 | //applet:IF_POWEROFF(APPLET_ODDNAME(poweroff, halt, BB_DIR_SBIN, BB_SUID_DROP, poweroff)) | 50 | //applet:IF_POWEROFF(APPLET_ODDNAME(poweroff, halt, BB_DIR_SBIN, BB_SUID_DROP, poweroff)) |
50 | //applet:IF_REBOOT(APPLET_ODDNAME(reboot, halt, BB_DIR_SBIN, BB_SUID_DROP, reboot)) | 51 | //applet:IF_REBOOT( APPLET_ODDNAME(reboot, halt, BB_DIR_SBIN, BB_SUID_DROP, reboot)) |
51 | 52 | ||
52 | //kbuild:lib-$(CONFIG_HALT) += halt.o | 53 | //kbuild:lib-$(CONFIG_HALT) += halt.o |
53 | //kbuild:lib-$(CONFIG_POWEROFF) += halt.o | 54 | //kbuild:lib-$(CONFIG_POWEROFF) += halt.o |
diff --git a/loginutils/add-remove-shell.c b/loginutils/add-remove-shell.c index ce4a7bbd2..af7c31779 100644 --- a/loginutils/add-remove-shell.c +++ b/loginutils/add-remove-shell.c | |||
@@ -19,6 +19,7 @@ | |||
19 | //config: help | 19 | //config: help |
20 | //config: Remove shells from /etc/shells. | 20 | //config: Remove shells from /etc/shells. |
21 | 21 | ||
22 | // APPLET_ODDNAME:name main location suid_type help | ||
22 | //applet:IF_ADD_SHELL( APPLET_ODDNAME(add-shell , add_remove_shell, BB_DIR_USR_SBIN, BB_SUID_DROP, add_shell )) | 23 | //applet:IF_ADD_SHELL( APPLET_ODDNAME(add-shell , add_remove_shell, BB_DIR_USR_SBIN, BB_SUID_DROP, add_shell )) |
23 | //applet:IF_REMOVE_SHELL(APPLET_ODDNAME(remove-shell, add_remove_shell, BB_DIR_USR_SBIN, BB_SUID_DROP, remove_shell)) | 24 | //applet:IF_REMOVE_SHELL(APPLET_ODDNAME(remove-shell, add_remove_shell, BB_DIR_USR_SBIN, BB_SUID_DROP, remove_shell)) |
24 | 25 | ||
diff --git a/miscutils/flash_lock_unlock.c b/miscutils/flash_lock_unlock.c index 2f698641f..003496d5b 100644 --- a/miscutils/flash_lock_unlock.c +++ b/miscutils/flash_lock_unlock.c | |||
@@ -17,7 +17,8 @@ | |||
17 | //config: The flash_unlock binary from mtd-utils as of git head 5ec0c10d0. This | 17 | //config: The flash_unlock binary from mtd-utils as of git head 5ec0c10d0. This |
18 | //config: utility unlocks part or all of the flash device. | 18 | //config: utility unlocks part or all of the flash device. |
19 | 19 | ||
20 | //applet:IF_FLASH_LOCK(APPLET_ODDNAME(flash_lock, flash_lock_unlock, BB_DIR_USR_SBIN, BB_SUID_DROP, flash_lock)) | 20 | // APPLET_ODDNAME:name main location suid_type help |
21 | //applet:IF_FLASH_LOCK( APPLET_ODDNAME(flash_lock, flash_lock_unlock, BB_DIR_USR_SBIN, BB_SUID_DROP, flash_lock)) | ||
21 | //applet:IF_FLASH_UNLOCK(APPLET_ODDNAME(flash_unlock, flash_lock_unlock, BB_DIR_USR_SBIN, BB_SUID_DROP, flash_unlock)) | 22 | //applet:IF_FLASH_UNLOCK(APPLET_ODDNAME(flash_unlock, flash_lock_unlock, BB_DIR_USR_SBIN, BB_SUID_DROP, flash_unlock)) |
22 | 23 | ||
23 | //kbuild:lib-$(CONFIG_FLASH_LOCK) += flash_lock_unlock.o | 24 | //kbuild:lib-$(CONFIG_FLASH_LOCK) += flash_lock_unlock.o |
diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c index 8e55e9577..982e3e52a 100644 --- a/miscutils/ubi_tools.c +++ b/miscutils/ubi_tools.c | |||
@@ -45,11 +45,12 @@ | |||
45 | //config: help | 45 | //config: help |
46 | //config: Update a UBI volume. | 46 | //config: Update a UBI volume. |
47 | 47 | ||
48 | //applet:IF_UBIATTACH(APPLET_ODDNAME(ubiattach, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubiattach)) | 48 | // APPLET_ODDNAME:name main location suid_type help |
49 | //applet:IF_UBIDETACH(APPLET_ODDNAME(ubidetach, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubidetach)) | 49 | //applet:IF_UBIATTACH( APPLET_ODDNAME(ubiattach, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubiattach)) |
50 | //applet:IF_UBIMKVOL(APPLET_ODDNAME(ubimkvol, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubimkvol)) | 50 | //applet:IF_UBIDETACH( APPLET_ODDNAME(ubidetach, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubidetach)) |
51 | //applet:IF_UBIRMVOL(APPLET_ODDNAME(ubirmvol, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubirmvol)) | 51 | //applet:IF_UBIMKVOL( APPLET_ODDNAME(ubimkvol, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubimkvol)) |
52 | //applet:IF_UBIRSVOL(APPLET_ODDNAME(ubirsvol, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubirsvol)) | 52 | //applet:IF_UBIRMVOL( APPLET_ODDNAME(ubirmvol, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubirmvol)) |
53 | //applet:IF_UBIRSVOL( APPLET_ODDNAME(ubirsvol, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubirsvol)) | ||
53 | //applet:IF_UBIUPDATEVOL(APPLET_ODDNAME(ubiupdatevol, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubiupdatevol)) | 54 | //applet:IF_UBIUPDATEVOL(APPLET_ODDNAME(ubiupdatevol, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubiupdatevol)) |
54 | 55 | ||
55 | //kbuild:lib-$(CONFIG_UBIATTACH) += ubi_tools.o | 56 | //kbuild:lib-$(CONFIG_UBIATTACH) += ubi_tools.o |
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c index 21fa9dbdd..e44feeefa 100644 --- a/modutils/modprobe-small.c +++ b/modutils/modprobe-small.c | |||
@@ -25,10 +25,11 @@ | |||
25 | //config: Check if the module is already loaded. | 25 | //config: Check if the module is already loaded. |
26 | 26 | ||
27 | //applet:IF_MODPROBE(IF_MODPROBE_SMALL(APPLET(modprobe, BB_DIR_SBIN, BB_SUID_DROP))) | 27 | //applet:IF_MODPROBE(IF_MODPROBE_SMALL(APPLET(modprobe, BB_DIR_SBIN, BB_SUID_DROP))) |
28 | // APPLET_ODDNAME:name main location suid_type help | ||
28 | //applet:IF_DEPMOD(IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, depmod))) | 29 | //applet:IF_DEPMOD(IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, depmod))) |
29 | //applet:IF_INSMOD(IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, insmod))) | 30 | //applet:IF_INSMOD(IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, insmod))) |
30 | //applet:IF_LSMOD(IF_MODPROBE_SMALL(APPLET_ODDNAME(lsmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, lsmod))) | 31 | //applet:IF_LSMOD(IF_MODPROBE_SMALL( APPLET_ODDNAME(lsmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, lsmod))) |
31 | //applet:IF_RMMOD(IF_MODPROBE_SMALL(APPLET_ODDNAME(rmmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, rmmod))) | 32 | //applet:IF_RMMOD(IF_MODPROBE_SMALL( APPLET_ODDNAME(rmmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, rmmod))) |
32 | 33 | ||
33 | //kbuild:lib-$(CONFIG_MODPROBE_SMALL) += modprobe-small.o | 34 | //kbuild:lib-$(CONFIG_MODPROBE_SMALL) += modprobe-small.o |
34 | 35 | ||
diff --git a/networking/hostname.c b/networking/hostname.c index 04a051ede..9f2418422 100644 --- a/networking/hostname.c +++ b/networking/hostname.c | |||
@@ -22,6 +22,7 @@ | |||
22 | //config: help | 22 | //config: help |
23 | //config: Alias to "hostname -d". | 23 | //config: Alias to "hostname -d". |
24 | 24 | ||
25 | // APPLET_ODDNAME:name main location suid_type help | ||
25 | //applet:IF_DNSDOMAINNAME(APPLET_ODDNAME(dnsdomainname, hostname, BB_DIR_BIN, BB_SUID_DROP, dnsdomainname)) | 26 | //applet:IF_DNSDOMAINNAME(APPLET_ODDNAME(dnsdomainname, hostname, BB_DIR_BIN, BB_SUID_DROP, dnsdomainname)) |
26 | //applet:IF_HOSTNAME(APPLET(hostname, BB_DIR_BIN, BB_SUID_DROP)) | 27 | //applet:IF_HOSTNAME(APPLET(hostname, BB_DIR_BIN, BB_SUID_DROP)) |
27 | 28 | ||
diff --git a/networking/ifupdown.c b/networking/ifupdown.c index 78baa6690..a76fe1021 100644 --- a/networking/ifupdown.c +++ b/networking/ifupdown.c | |||
@@ -106,7 +106,8 @@ | |||
106 | //config: Otherwise, if udhcpc applet is enabled, it is used. | 106 | //config: Otherwise, if udhcpc applet is enabled, it is used. |
107 | //config: Otherwise, ifup/ifdown will have no support for DHCP. | 107 | //config: Otherwise, ifup/ifdown will have no support for DHCP. |
108 | 108 | ||
109 | //applet:IF_IFUP(APPLET_ODDNAME(ifup, ifupdown, BB_DIR_SBIN, BB_SUID_DROP, ifup)) | 109 | // APPLET_ODDNAME:name main location suid_type help |
110 | //applet:IF_IFUP( APPLET_ODDNAME(ifup, ifupdown, BB_DIR_SBIN, BB_SUID_DROP, ifup)) | ||
110 | //applet:IF_IFDOWN(APPLET_ODDNAME(ifdown, ifupdown, BB_DIR_SBIN, BB_SUID_DROP, ifdown)) | 111 | //applet:IF_IFDOWN(APPLET_ODDNAME(ifdown, ifupdown, BB_DIR_SBIN, BB_SUID_DROP, ifdown)) |
111 | 112 | ||
112 | //kbuild:lib-$(CONFIG_IFUP) += ifupdown.o | 113 | //kbuild:lib-$(CONFIG_IFUP) += ifupdown.o |
diff --git a/printutils/lpr.c b/printutils/lpr.c index ed6a84a93..8cc87d167 100644 --- a/printutils/lpr.c +++ b/printutils/lpr.c | |||
@@ -23,6 +23,7 @@ | |||
23 | //config: help | 23 | //config: help |
24 | //config: lpq is a print spool queue examination and manipulation program. | 24 | //config: lpq is a print spool queue examination and manipulation program. |
25 | 25 | ||
26 | // APPLET_ODDNAME:name main location suid_type help | ||
26 | //applet:IF_LPQ(APPLET_ODDNAME(lpq, lpqr, BB_DIR_USR_BIN, BB_SUID_DROP, lpq)) | 27 | //applet:IF_LPQ(APPLET_ODDNAME(lpq, lpqr, BB_DIR_USR_BIN, BB_SUID_DROP, lpq)) |
27 | //applet:IF_LPR(APPLET_ODDNAME(lpr, lpqr, BB_DIR_USR_BIN, BB_SUID_DROP, lpr)) | 28 | //applet:IF_LPR(APPLET_ODDNAME(lpr, lpqr, BB_DIR_USR_BIN, BB_SUID_DROP, lpr)) |
28 | 29 | ||
diff --git a/procps/kill.c b/procps/kill.c index 0ef1716a4..7ae5beead 100644 --- a/procps/kill.c +++ b/procps/kill.c | |||
@@ -33,7 +33,8 @@ | |||
33 | //config: the script it was called from. | 33 | //config: the script it was called from. |
34 | 34 | ||
35 | //applet:IF_KILL(APPLET(kill, BB_DIR_BIN, BB_SUID_DROP)) | 35 | //applet:IF_KILL(APPLET(kill, BB_DIR_BIN, BB_SUID_DROP)) |
36 | //applet:IF_KILLALL(APPLET_ODDNAME(killall, kill, BB_DIR_USR_BIN, BB_SUID_DROP, killall)) | 36 | // APPLET_ODDNAME:name main location suid_type help |
37 | //applet:IF_KILLALL( APPLET_ODDNAME(killall, kill, BB_DIR_USR_BIN, BB_SUID_DROP, killall)) | ||
37 | //applet:IF_KILLALL5(APPLET_ODDNAME(killall5, kill, BB_DIR_USR_SBIN, BB_SUID_DROP, killall5)) | 38 | //applet:IF_KILLALL5(APPLET_ODDNAME(killall5, kill, BB_DIR_USR_SBIN, BB_SUID_DROP, killall5)) |
38 | 39 | ||
39 | //kbuild:lib-$(CONFIG_KILL) += kill.o | 40 | //kbuild:lib-$(CONFIG_KILL) += kill.o |
diff --git a/procps/pgrep.c b/procps/pgrep.c index ac82b5156..e932a32bc 100644 --- a/procps/pgrep.c +++ b/procps/pgrep.c | |||
@@ -19,6 +19,7 @@ | |||
19 | //config: Send signals to processes by name. | 19 | //config: Send signals to processes by name. |
20 | 20 | ||
21 | //applet:IF_PGREP(APPLET(pgrep, BB_DIR_USR_BIN, BB_SUID_DROP)) | 21 | //applet:IF_PGREP(APPLET(pgrep, BB_DIR_USR_BIN, BB_SUID_DROP)) |
22 | // APPLET_ODDNAME:name main location suid_type help | ||
22 | //applet:IF_PKILL(APPLET_ODDNAME(pkill, pgrep, BB_DIR_USR_BIN, BB_SUID_DROP, pkill)) | 23 | //applet:IF_PKILL(APPLET_ODDNAME(pkill, pgrep, BB_DIR_USR_BIN, BB_SUID_DROP, pkill)) |
23 | 24 | ||
24 | //kbuild:lib-$(CONFIG_PGREP) += pgrep.o | 25 | //kbuild:lib-$(CONFIG_PGREP) += pgrep.o |
diff --git a/runit/chpst.c b/runit/chpst.c index 3769af25e..846c846d3 100644 --- a/runit/chpst.c +++ b/runit/chpst.c | |||
@@ -60,7 +60,8 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||
60 | //config: Sets soft resource limits as specified by options | 60 | //config: Sets soft resource limits as specified by options |
61 | 61 | ||
62 | //applet:IF_CHPST(APPLET(chpst, BB_DIR_USR_BIN, BB_SUID_DROP)) | 62 | //applet:IF_CHPST(APPLET(chpst, BB_DIR_USR_BIN, BB_SUID_DROP)) |
63 | //applet:IF_ENVDIR(APPLET_ODDNAME(envdir, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, envdir)) | 63 | // APPLET_ODDNAME:name main location suid_type help |
64 | //applet:IF_ENVDIR( APPLET_ODDNAME(envdir, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, envdir)) | ||
64 | //applet:IF_ENVUIDGID(APPLET_ODDNAME(envuidgid, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, envuidgid)) | 65 | //applet:IF_ENVUIDGID(APPLET_ODDNAME(envuidgid, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, envuidgid)) |
65 | //applet:IF_SETUIDGID(APPLET_ODDNAME(setuidgid, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, setuidgid)) | 66 | //applet:IF_SETUIDGID(APPLET_ODDNAME(setuidgid, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, setuidgid)) |
66 | //applet:IF_SOFTLIMIT(APPLET_ODDNAME(softlimit, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, softlimit)) | 67 | //applet:IF_SOFTLIMIT(APPLET_ODDNAME(softlimit, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, softlimit)) |
diff --git a/selinux/setfiles.c b/selinux/setfiles.c index 9fa5d3f30..c14a67be5 100644 --- a/selinux/setfiles.c +++ b/selinux/setfiles.c | |||
@@ -30,6 +30,7 @@ | |||
30 | //config: the same as setfiles, but usage is a little different. | 30 | //config: the same as setfiles, but usage is a little different. |
31 | 31 | ||
32 | //applet:IF_SETFILES(APPLET(setfiles, BB_DIR_SBIN, BB_SUID_DROP)) | 32 | //applet:IF_SETFILES(APPLET(setfiles, BB_DIR_SBIN, BB_SUID_DROP)) |
33 | // APPLET_ODDNAME:name main location suid_type help | ||
33 | //applet:IF_RESTORECON(APPLET_ODDNAME(restorecon, setfiles, BB_DIR_SBIN, BB_SUID_DROP, restorecon)) | 34 | //applet:IF_RESTORECON(APPLET_ODDNAME(restorecon, setfiles, BB_DIR_SBIN, BB_SUID_DROP, restorecon)) |
34 | 35 | ||
35 | //kbuild:lib-$(CONFIG_SETFILES) += setfiles.o | 36 | //kbuild:lib-$(CONFIG_SETFILES) += setfiles.o |
diff --git a/shell/ash.c b/shell/ash.c index d8f41327b..e07b81c05 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -136,7 +136,8 @@ | |||
136 | //config:endif # ash options | 136 | //config:endif # ash options |
137 | 137 | ||
138 | //applet:IF_ASH(APPLET(ash, BB_DIR_BIN, BB_SUID_DROP)) | 138 | //applet:IF_ASH(APPLET(ash, BB_DIR_BIN, BB_SUID_DROP)) |
139 | //applet:IF_SH_IS_ASH(APPLET_ODDNAME(sh, ash, BB_DIR_BIN, BB_SUID_DROP, ash)) | 139 | // APPLET_ODDNAME:name main location suid_type help |
140 | //applet:IF_SH_IS_ASH( APPLET_ODDNAME(sh, ash, BB_DIR_BIN, BB_SUID_DROP, ash)) | ||
140 | //applet:IF_BASH_IS_ASH(APPLET_ODDNAME(bash, ash, BB_DIR_BIN, BB_SUID_DROP, ash)) | 141 | //applet:IF_BASH_IS_ASH(APPLET_ODDNAME(bash, ash, BB_DIR_BIN, BB_SUID_DROP, ash)) |
141 | 142 | ||
142 | //kbuild:lib-$(CONFIG_ASH) += ash.o ash_ptr_hack.o shell_common.o | 143 | //kbuild:lib-$(CONFIG_ASH) += ash.o ash_ptr_hack.o shell_common.o |
diff --git a/shell/hush.c b/shell/hush.c index d90c1485a..4123cc19e 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
@@ -277,8 +277,9 @@ | |||
277 | //config: msh is deprecated and will be removed, please migrate to hush. | 277 | //config: msh is deprecated and will be removed, please migrate to hush. |
278 | 278 | ||
279 | //applet:IF_HUSH(APPLET(hush, BB_DIR_BIN, BB_SUID_DROP)) | 279 | //applet:IF_HUSH(APPLET(hush, BB_DIR_BIN, BB_SUID_DROP)) |
280 | //applet:IF_MSH(APPLET_ODDNAME(msh, hush, BB_DIR_BIN, BB_SUID_DROP, hush)) | 280 | // APPLET_ODDNAME:name main location suid_type help |
281 | //applet:IF_SH_IS_HUSH(APPLET_ODDNAME(sh, hush, BB_DIR_BIN, BB_SUID_DROP, hush)) | 281 | //applet:IF_MSH( APPLET_ODDNAME(msh, hush, BB_DIR_BIN, BB_SUID_DROP, hush)) |
282 | //applet:IF_SH_IS_HUSH( APPLET_ODDNAME(sh, hush, BB_DIR_BIN, BB_SUID_DROP, hush)) | ||
282 | //applet:IF_BASH_IS_HUSH(APPLET_ODDNAME(bash, hush, BB_DIR_BIN, BB_SUID_DROP, hush)) | 283 | //applet:IF_BASH_IS_HUSH(APPLET_ODDNAME(bash, hush, BB_DIR_BIN, BB_SUID_DROP, hush)) |
283 | 284 | ||
284 | //kbuild:lib-$(CONFIG_HUSH) += hush.o match.o shell_common.o | 285 | //kbuild:lib-$(CONFIG_HUSH) += hush.o match.o shell_common.o |
diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c index 8bc2c443b..28148fcbe 100644 --- a/util-linux/freeramdisk.c +++ b/util-linux/freeramdisk.c | |||
@@ -33,6 +33,7 @@ | |||
33 | //config: ramdisk. If you have no use for freeing memory from a ramdisk, leave | 33 | //config: ramdisk. If you have no use for freeing memory from a ramdisk, leave |
34 | //config: this disabled. | 34 | //config: this disabled. |
35 | 35 | ||
36 | // APPLET_ODDNAME:name main location suid_type help | ||
36 | //applet:IF_FDFLUSH(APPLET_ODDNAME(fdflush, freeramdisk, BB_DIR_BIN, BB_SUID_DROP, fdflush)) | 37 | //applet:IF_FDFLUSH(APPLET_ODDNAME(fdflush, freeramdisk, BB_DIR_BIN, BB_SUID_DROP, fdflush)) |
37 | //applet:IF_FREERAMDISK(APPLET(freeramdisk, BB_DIR_SBIN, BB_SUID_DROP)) | 38 | //applet:IF_FREERAMDISK(APPLET(freeramdisk, BB_DIR_SBIN, BB_SUID_DROP)) |
38 | 39 | ||
diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c index 5816a208e..4a7a878ac 100644 --- a/util-linux/mkfs_ext2.c +++ b/util-linux/mkfs_ext2.c | |||
@@ -21,7 +21,8 @@ | |||
21 | //config: help | 21 | //config: help |
22 | //config: Alias to "mke2fs". | 22 | //config: Alias to "mke2fs". |
23 | 23 | ||
24 | //applet:IF_MKE2FS(APPLET_ODDNAME(mke2fs, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2)) | 24 | // APPLET_ODDNAME:name main location suid_type help |
25 | //applet:IF_MKE2FS( APPLET_ODDNAME(mke2fs, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2)) | ||
25 | //applet:IF_MKFS_EXT2(APPLET_ODDNAME(mkfs.ext2, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2)) | 26 | //applet:IF_MKFS_EXT2(APPLET_ODDNAME(mkfs.ext2, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2)) |
26 | ////////:IF_MKFS_EXT3(APPLET_ODDNAME(mkfs.ext3, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2)) | 27 | ////////:IF_MKFS_EXT3(APPLET_ODDNAME(mkfs.ext3, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2)) |
27 | 28 | ||
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c index 912246b93..0dfe34705 100644 --- a/util-linux/mkfs_minix.c +++ b/util-linux/mkfs_minix.c | |||
@@ -80,6 +80,7 @@ | |||
80 | //config: this. If you enabled 'mkfs_minix' then you almost certainly want to | 80 | //config: this. If you enabled 'mkfs_minix' then you almost certainly want to |
81 | //config: be using the version 2 filesystem support. | 81 | //config: be using the version 2 filesystem support. |
82 | 82 | ||
83 | // APPLET_ODDNAME:name main location suid_type help | ||
83 | //applet:IF_MKFS_MINIX(APPLET_ODDNAME(mkfs.minix, mkfs_minix, BB_DIR_SBIN, BB_SUID_DROP, mkfs_minix)) | 84 | //applet:IF_MKFS_MINIX(APPLET_ODDNAME(mkfs.minix, mkfs_minix, BB_DIR_SBIN, BB_SUID_DROP, mkfs_minix)) |
84 | 85 | ||
85 | //kbuild:lib-$(CONFIG_MKFS_MINIX) += mkfs_minix.o | 86 | //kbuild:lib-$(CONFIG_MKFS_MINIX) += mkfs_minix.o |
diff --git a/util-linux/mkfs_vfat.c b/util-linux/mkfs_vfat.c index ab70853a1..1fc943430 100644 --- a/util-linux/mkfs_vfat.c +++ b/util-linux/mkfs_vfat.c | |||
@@ -21,7 +21,8 @@ | |||
21 | //config: help | 21 | //config: help |
22 | //config: Alias to "mkdosfs". | 22 | //config: Alias to "mkdosfs". |
23 | 23 | ||
24 | //applet:IF_MKDOSFS(APPLET_ODDNAME(mkdosfs, mkfs_vfat, BB_DIR_SBIN, BB_SUID_DROP, mkfs_vfat)) | 24 | // APPLET_ODDNAME:name main location suid_type help |
25 | //applet:IF_MKDOSFS( APPLET_ODDNAME(mkdosfs, mkfs_vfat, BB_DIR_SBIN, BB_SUID_DROP, mkfs_vfat)) | ||
25 | //applet:IF_MKFS_VFAT(APPLET_ODDNAME(mkfs.vfat, mkfs_vfat, BB_DIR_SBIN, BB_SUID_DROP, mkfs_vfat)) | 26 | //applet:IF_MKFS_VFAT(APPLET_ODDNAME(mkfs.vfat, mkfs_vfat, BB_DIR_SBIN, BB_SUID_DROP, mkfs_vfat)) |
26 | 27 | ||
27 | //kbuild:lib-$(CONFIG_MKDOSFS) += mkfs_vfat.o | 28 | //kbuild:lib-$(CONFIG_MKDOSFS) += mkfs_vfat.o |
diff --git a/util-linux/setarch.c b/util-linux/setarch.c index ec473e9cb..e4124b044 100644 --- a/util-linux/setarch.c +++ b/util-linux/setarch.c | |||
@@ -31,6 +31,7 @@ | |||
31 | //config: Alias to "setarch linux64". | 31 | //config: Alias to "setarch linux64". |
32 | 32 | ||
33 | //applet:IF_SETARCH(APPLET(setarch, BB_DIR_BIN, BB_SUID_DROP)) | 33 | //applet:IF_SETARCH(APPLET(setarch, BB_DIR_BIN, BB_SUID_DROP)) |
34 | // APPLET_ODDNAME:name main location suid_type help | ||
34 | //applet:IF_LINUX32(APPLET_ODDNAME(linux32, setarch, BB_DIR_BIN, BB_SUID_DROP, linux32)) | 35 | //applet:IF_LINUX32(APPLET_ODDNAME(linux32, setarch, BB_DIR_BIN, BB_SUID_DROP, linux32)) |
35 | //applet:IF_LINUX64(APPLET_ODDNAME(linux64, setarch, BB_DIR_BIN, BB_SUID_DROP, linux64)) | 36 | //applet:IF_LINUX64(APPLET_ODDNAME(linux64, setarch, BB_DIR_BIN, BB_SUID_DROP, linux64)) |
36 | 37 | ||
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c index b8f4e9447..313ea0ef9 100644 --- a/util-linux/swaponoff.c +++ b/util-linux/swaponoff.c | |||
@@ -41,7 +41,8 @@ | |||
41 | //config: help | 41 | //config: help |
42 | //config: This option enables the 'swapoff' utility. | 42 | //config: This option enables the 'swapoff' utility. |
43 | 43 | ||
44 | //applet:IF_SWAPON(APPLET_ODDNAME(swapon, swap_on_off, BB_DIR_SBIN, BB_SUID_DROP, swapon)) | 44 | // APPLET_ODDNAME:name main location suid_type help |
45 | //applet:IF_SWAPON( APPLET_ODDNAME(swapon, swap_on_off, BB_DIR_SBIN, BB_SUID_DROP, swapon)) | ||
45 | //applet:IF_SWAPOFF(APPLET_ODDNAME(swapoff, swap_on_off, BB_DIR_SBIN, BB_SUID_DROP, swapoff)) | 46 | //applet:IF_SWAPOFF(APPLET_ODDNAME(swapoff, swap_on_off, BB_DIR_SBIN, BB_SUID_DROP, swapoff)) |
46 | 47 | ||
47 | //kbuild:lib-$(CONFIG_SWAPON) += swaponoff.o | 48 | //kbuild:lib-$(CONFIG_SWAPON) += swaponoff.o |