aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Config.in32
-rw-r--r--archival/Config.src10
-rw-r--r--archival/ar.c2
-rw-r--r--archival/bbunzip.c4
-rw-r--r--archival/cpio.c4
-rw-r--r--archival/gzip.c4
-rw-r--r--archival/tar.c35
-rw-r--r--console-tools/loadfont.c8
-rw-r--r--console-tools/setconsole.c2
-rw-r--r--coreutils/Config.src16
-rw-r--r--coreutils/chown.c2
-rw-r--r--coreutils/cp.c4
-rw-r--r--coreutils/dd.c4
-rw-r--r--coreutils/df.c8
-rw-r--r--coreutils/echo.c6
-rw-r--r--coreutils/env.c2
-rw-r--r--coreutils/expand.c4
-rw-r--r--coreutils/head.c4
-rw-r--r--coreutils/install.c2
-rw-r--r--coreutils/ls.c6
-rw-r--r--coreutils/md5_sha1_sum.c1
-rw-r--r--coreutils/mkdir.c2
-rw-r--r--coreutils/mv.c2
-rw-r--r--coreutils/split.c2
-rw-r--r--coreutils/tail.c7
-rw-r--r--coreutils/wc.c4
-rw-r--r--debianutils/run_parts.c2
-rw-r--r--debianutils/start_stop_daemon.c13
-rw-r--r--editors/Config.src2
-rw-r--r--editors/diff.c2
-rw-r--r--editors/vi.c33
-rw-r--r--findutils/find.c14
-rw-r--r--init/init.c4
-rw-r--r--libbb/Config.src17
-rw-r--r--loginutils/Config.src2
-rw-r--r--loginutils/addgroup.c6
-rw-r--r--loginutils/adduser.c2
-rw-r--r--loginutils/deluser.c2
-rw-r--r--loginutils/login.c6
-rw-r--r--loginutils/su.c9
-rw-r--r--miscutils/devfsd.c2
-rw-r--r--miscutils/hdparm.c12
-rw-r--r--miscutils/last.c2
-rw-r--r--miscutils/less.c5
-rw-r--r--modutils/Config.src4
-rw-r--r--networking/ftpd.c2
-rw-r--r--networking/ftpgetput.c2
-rw-r--r--networking/httpd.c10
-rw-r--r--networking/ifupdown.c8
-rw-r--r--networking/ipcalc.c12
-rw-r--r--networking/netstat.c2
-rw-r--r--networking/tftp.c4
-rw-r--r--networking/traceroute.c2
-rw-r--r--networking/udhcp/Config.src4
-rw-r--r--networking/wget.c16
-rw-r--r--procps/Config.src2
-rw-r--r--procps/pidof.c8
-rw-r--r--procps/ps.c16
-rw-r--r--procps/uptime.c4
-rw-r--r--selinux/chcon.c2
-rw-r--r--selinux/runcon.c2
-rw-r--r--shell/ash.c85
-rw-r--r--shell/hush.c68
-rw-r--r--util-linux/Config.src2
-rw-r--r--util-linux/dmesg.c2
-rw-r--r--util-linux/fbset.c4
-rw-r--r--util-linux/fdisk.c2
-rw-r--r--util-linux/hwclock.c4
-rw-r--r--util-linux/mount.c2
-rw-r--r--util-linux/volume_id/bcache.c4
-rw-r--r--util-linux/volume_id/btrfs.c4
-rw-r--r--util-linux/volume_id/cramfs.c4
-rw-r--r--util-linux/volume_id/exfat.c2
-rw-r--r--util-linux/volume_id/ext.c4
-rw-r--r--util-linux/volume_id/f2fs.c2
-rw-r--r--util-linux/volume_id/fat.c4
-rw-r--r--util-linux/volume_id/hfs.c4
-rw-r--r--util-linux/volume_id/iso9660.c4
-rw-r--r--util-linux/volume_id/jfs.c4
-rw-r--r--util-linux/volume_id/linux_raid.c4
-rw-r--r--util-linux/volume_id/linux_swap.c4
-rw-r--r--util-linux/volume_id/luks.c4
-rw-r--r--util-linux/volume_id/nilfs.c2
-rw-r--r--util-linux/volume_id/ntfs.c4
-rw-r--r--util-linux/volume_id/ocfs2.c4
-rw-r--r--util-linux/volume_id/reiserfs.c4
-rw-r--r--util-linux/volume_id/romfs.c4
-rw-r--r--util-linux/volume_id/squashfs.c2
-rw-r--r--util-linux/volume_id/sysv.c4
-rw-r--r--util-linux/volume_id/ubifs.c2
-rw-r--r--util-linux/volume_id/udf.c4
-rw-r--r--util-linux/volume_id/unused_highpoint.c4
-rw-r--r--util-linux/volume_id/unused_hpfs.c4
-rw-r--r--util-linux/volume_id/unused_isw_raid.c4
-rw-r--r--util-linux/volume_id/unused_lsi_raid.c4
-rw-r--r--util-linux/volume_id/unused_lvm.c4
-rw-r--r--util-linux/volume_id/unused_mac.c4
-rw-r--r--util-linux/volume_id/unused_minix.c4
-rw-r--r--util-linux/volume_id/unused_msdos.c4
-rw-r--r--util-linux/volume_id/unused_nvidia_raid.c4
-rw-r--r--util-linux/volume_id/unused_promise_raid.c4
-rw-r--r--util-linux/volume_id/unused_silicon_raid.c4
-rw-r--r--util-linux/volume_id/unused_ufs.c4
-rw-r--r--util-linux/volume_id/unused_via_raid.c4
-rw-r--r--util-linux/volume_id/xfs.c4
105 files changed, 203 insertions, 512 deletions
diff --git a/Config.in b/Config.in
index 66f7787d2..db1587169 100644
--- a/Config.in
+++ b/Config.in
@@ -22,7 +22,7 @@ config DESKTOP
22 22
23 If you are preparing your build to be used on an embedded box 23 If you are preparing your build to be used on an embedded box
24 where you have tighter control over the entire set of userspace 24 where you have tighter control over the entire set of userspace
25 tools, you can unselect this option for smaller code size. 25 tools, you can unselect this option for smaller code size.
26 26
27config EXTRA_COMPAT 27config EXTRA_COMPAT
28 bool "Provide compatible behavior for rare corner cases (bigger code)" 28 bool "Provide compatible behavior for rare corner cases (bigger code)"
@@ -50,6 +50,26 @@ config USE_PORTABLE_CODE
50 compiler other than gcc. 50 compiler other than gcc.
51 If you do use gcc, this option may needlessly increase code size. 51 If you do use gcc, this option may needlessly increase code size.
52 52
53#fixme: delete, create suboptions for applets which use this
54config FEATURE_AUTOWIDTH
55 bool "Calculate terminal & column widths"
56 default y
57 help
58 This option allows utilities such as 'ls', 'telnet' etc
59 to determine the width of the screen, which can allow them to
60 display additional text or avoid wrapping text onto the next line.
61 If you leave this disabled, your utilities will be especially
62 primitive and will be unable to determine the current screen width.
63
64#fixme: delete, create suboptions for applets which use this
65config FEATURE_USE_TERMIOS
66 bool "Use termios for one-stroke input"
67 default y
68 help
69 This option allows utilities such as 'top' to accept keyboard
70 commands. Without this option, they simply refresh display
71 after a fixed period.
72
53config SHOW_USAGE 73config SHOW_USAGE
54 bool "Show applet usage messages" 74 bool "Show applet usage messages"
55 default y 75 default y
@@ -113,14 +133,14 @@ config INSTALL_NO_USR
113 never to /usr/bin or /usr/sbin. 133 never to /usr/bin or /usr/sbin.
114 134
115config PAM 135config PAM
116 bool "Support for PAM (Pluggable Authentication Modules)" 136 bool "Support PAM (Pluggable Authentication Modules)"
117 default n 137 default n
118 help 138 help
119 Use PAM in some busybox applets (currently login and httpd) instead 139 Use PAM in some busybox applets (currently login and httpd) instead
120 of direct access to password database. 140 of direct access to password database.
121 141
122config LONG_OPTS 142config LONG_OPTS
123 bool "Support for --long-options" 143 bool "Support --long-options"
124 default y 144 default y
125 help 145 help
126 Enable this if you want busybox applets to use the gnu --long-option 146 Enable this if you want busybox applets to use the gnu --long-option
@@ -187,7 +207,7 @@ config PID_FILE_PATH
187 specify a pidfile path. 207 specify a pidfile path.
188 208
189config FEATURE_SUID 209config FEATURE_SUID
190 bool "Support for SUID/SGID handling" 210 bool "Support SUID/SGID handling"
191 default y 211 default y
192 help 212 help
193 With this option you can install the busybox binary belonging 213 With this option you can install the busybox binary belonging
@@ -611,6 +631,8 @@ config DEBUG_SANITIZE
611 catch bad memory accesses (e.g. buffer overflows), but will make 631 catch bad memory accesses (e.g. buffer overflows), but will make
612 the executable larger and slow down runtime a bit. 632 the executable larger and slow down runtime a bit.
613 633
634 This adds -fsanitize=foo options to gcc command line.
635
614 If you aren't developing/testing busybox, say N here. 636 If you aren't developing/testing busybox, say N here.
615 637
616config UNIT_TEST 638config UNIT_TEST
@@ -625,7 +647,7 @@ config WERROR
625 bool "Abort compilation on any warning" 647 bool "Abort compilation on any warning"
626 default n 648 default n
627 help 649 help
628 Selecting this will add -Werror to gcc command line. 650 This adds -Werror to gcc command line.
629 651
630 Most people should answer N. 652 Most people should answer N.
631 653
diff --git a/archival/Config.src b/archival/Config.src
index 5e7cfc0a4..0c97f3d7c 100644
--- a/archival/Config.src
+++ b/archival/Config.src
@@ -8,32 +8,22 @@ menu "Archival Utilities"
8config FEATURE_SEAMLESS_XZ 8config FEATURE_SEAMLESS_XZ
9 bool "Make tar, rpm, modprobe etc understand .xz data" 9 bool "Make tar, rpm, modprobe etc understand .xz data"
10 default y 10 default y
11 help
12 Make tar, rpm, modprobe etc understand .xz data.
13 11
14config FEATURE_SEAMLESS_LZMA 12config FEATURE_SEAMLESS_LZMA
15 bool "Make tar, rpm, modprobe etc understand .lzma data" 13 bool "Make tar, rpm, modprobe etc understand .lzma data"
16 default y 14 default y
17 help
18 Make tar, rpm, modprobe etc understand .lzma data.
19 15
20config FEATURE_SEAMLESS_BZ2 16config FEATURE_SEAMLESS_BZ2
21 bool "Make tar, rpm, modprobe etc understand .bz2 data" 17 bool "Make tar, rpm, modprobe etc understand .bz2 data"
22 default y 18 default y
23 help
24 Make tar, rpm, modprobe etc understand .bz2 data.
25 19
26config FEATURE_SEAMLESS_GZ 20config FEATURE_SEAMLESS_GZ
27 bool "Make tar, rpm, modprobe etc understand .gz data" 21 bool "Make tar, rpm, modprobe etc understand .gz data"
28 default y 22 default y
29 help
30 Make tar, rpm, modprobe etc understand .gz data.
31 23
32config FEATURE_SEAMLESS_Z 24config FEATURE_SEAMLESS_Z
33 bool "Make tar, rpm, modprobe etc understand .Z data" 25 bool "Make tar, rpm, modprobe etc understand .Z data"
34 default n # it is ancient 26 default n # it is ancient
35 help
36 Make tar, rpm, modprobe etc understand .Z data.
37 27
38INSERT 28INSERT
39 29
diff --git a/archival/ar.c b/archival/ar.c
index e49d5cb2b..d119c75ad 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -31,7 +31,7 @@
31//config: probably say N here: most compilers come with their own ar utility. 31//config: probably say N here: most compilers come with their own ar utility.
32//config: 32//config:
33//config:config FEATURE_AR_LONG_FILENAMES 33//config:config FEATURE_AR_LONG_FILENAMES
34//config: bool "Support for long filenames (not needed for debs)" 34//config: bool "Support long filenames (not needed for debs)"
35//config: default y 35//config: default y
36//config: depends on AR 36//config: depends on AR
37//config: help 37//config: help
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index aa8453440..fb7a3678d 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -312,8 +312,6 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv)
312//config: bool "Enable long options" 312//config: bool "Enable long options"
313//config: default y 313//config: default y
314//config: depends on (GUNZIP || ZCAT) && LONG_OPTS 314//config: depends on (GUNZIP || ZCAT) && LONG_OPTS
315//config: help
316//config: Enable use of long options.
317 315
318//applet:IF_GUNZIP(APPLET(gunzip, BB_DIR_BIN, BB_SUID_DROP)) 316//applet:IF_GUNZIP(APPLET(gunzip, BB_DIR_BIN, BB_SUID_DROP))
319//applet:IF_ZCAT(APPLET_ODDNAME(zcat, gunzip, BB_DIR_BIN, BB_SUID_DROP, zcat)) 317//applet:IF_ZCAT(APPLET_ODDNAME(zcat, gunzip, BB_DIR_BIN, BB_SUID_DROP, zcat))
@@ -522,7 +520,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
522//config: IOW: you'll get lzma applet, but it will always require -d option. 520//config: IOW: you'll get lzma applet, but it will always require -d option.
523//config: 521//config:
524//config:config FEATURE_LZMA_FAST 522//config:config FEATURE_LZMA_FAST
525//config: bool "Optimize unlzma for speed" 523//config: bool "Optimize for speed"
526//config: default n 524//config: default n
527//config: depends on UNLZMA || LZCAT || LZMA 525//config: depends on UNLZMA || LZCAT || LZMA
528//config: help 526//config: help
diff --git a/archival/cpio.c b/archival/cpio.c
index 540218cb2..683f0bb1f 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -29,7 +29,7 @@
29//config: should probably say N here. 29//config: should probably say N here.
30//config: 30//config:
31//config:config FEATURE_CPIO_O 31//config:config FEATURE_CPIO_O
32//config: bool "Support for archive creation" 32//config: bool "Support archive creation"
33//config: default y 33//config: default y
34//config: depends on CPIO 34//config: depends on CPIO
35//config: help 35//config: help
@@ -37,7 +37,7 @@
37//config: format only. 37//config: format only.
38//config: 38//config:
39//config:config FEATURE_CPIO_P 39//config:config FEATURE_CPIO_P
40//config: bool "Support for passthrough mode" 40//config: bool "Support passthrough mode"
41//config: default y 41//config: default y
42//config: depends on FEATURE_CPIO_O 42//config: depends on FEATURE_CPIO_O
43//config: help 43//config: help
diff --git a/archival/gzip.c b/archival/gzip.c
index 63bf76053..e698c26cd 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -48,11 +48,9 @@ aa: 85.1% -- replaced with aa.gz
48//config: bool "Enable long options" 48//config: bool "Enable long options"
49//config: default y 49//config: default y
50//config: depends on GZIP && LONG_OPTS 50//config: depends on GZIP && LONG_OPTS
51//config: help
52//config: Enable use of long options, increases size by about 106 Bytes
53//config: 51//config:
54//config:config GZIP_FAST 52//config:config GZIP_FAST
55//config: int "Trade memory for gzip speed (0:small,slow - 2:fast,big)" 53//config: int "Trade memory for speed (0:small,slow - 2:fast,big)"
56//config: default 0 54//config: default 0
57//config: range 0 2 55//config: range 0 2
58//config: depends on GZIP 56//config: depends on GZIP
diff --git a/archival/tar.c b/archival/tar.c
index 8e315c610..b1d58a2df 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -49,13 +49,15 @@
49//config: create compressed archives. It's probably the most widely used 49//config: create compressed archives. It's probably the most widely used
50//config: UNIX archive program. 50//config: UNIX archive program.
51//config: 51//config:
52//config:config FEATURE_TAR_LONG_OPTIONS
53//config: bool "Enable long options"
54//config: default y
55//config: depends on TAR && LONG_OPTS
56//config:
52//config:config FEATURE_TAR_CREATE 57//config:config FEATURE_TAR_CREATE
53//config: bool "Enable archive creation" 58//config: bool "Enable -c (archive creation)"
54//config: default y 59//config: default y
55//config: depends on TAR 60//config: depends on TAR
56//config: help
57//config: If you enable this option you'll be able to create
58//config: tar archives using the `-c' option.
59//config: 61//config:
60//config:config FEATURE_TAR_AUTODETECT 62//config:config FEATURE_TAR_AUTODETECT
61//config: bool "Autodetect compressed tarballs" 63//config: bool "Autodetect compressed tarballs"
@@ -74,7 +76,7 @@
74//config: a list of files to include or exclude from an archive. 76//config: a list of files to include or exclude from an archive.
75//config: 77//config:
76//config:config FEATURE_TAR_OLDGNU_COMPATIBILITY 78//config:config FEATURE_TAR_OLDGNU_COMPATIBILITY
77//config: bool "Support for old tar header format" 79//config: bool "Support old tar header format"
78//config: default y 80//config: default y
79//config: depends on TAR || DPKG 81//config: depends on TAR || DPKG
80//config: help 82//config: help
@@ -93,22 +95,12 @@
93//config: tarballs still exist. 95//config: tarballs still exist.
94//config: 96//config:
95//config:config FEATURE_TAR_GNU_EXTENSIONS 97//config:config FEATURE_TAR_GNU_EXTENSIONS
96//config: bool "Support for GNU tar extensions (long filenames)" 98//config: bool "Support GNU tar extensions (long filenames)"
97//config: default y 99//config: default y
98//config: depends on TAR || DPKG 100//config: depends on TAR || DPKG
99//config: help
100//config: With this option busybox supports GNU long filenames and
101//config: linknames.
102//config:
103//config:config FEATURE_TAR_LONG_OPTIONS
104//config: bool "Enable long options"
105//config: default y
106//config: depends on TAR && LONG_OPTS
107//config: help
108//config: Enable use of long options, increases size by about 400 Bytes
109//config: 101//config:
110//config:config FEATURE_TAR_TO_COMMAND 102//config:config FEATURE_TAR_TO_COMMAND
111//config: bool "Support for writing to an external program" 103//config: bool "Support writing to an external program (--to-command)"
112//config: default y 104//config: default y
113//config: depends on TAR && FEATURE_TAR_LONG_OPTIONS 105//config: depends on TAR && FEATURE_TAR_LONG_OPTIONS
114//config: help 106//config: help
@@ -121,20 +113,17 @@
121//config: default y 113//config: default y
122//config: depends on TAR 114//config: depends on TAR
123//config: help 115//config: help
124//config: Enables use of user and group names in tar. This affects contents 116//config: Enable use of user and group names in tar. This affects contents
125//config: listings (-t) and preserving permissions when unpacking (-p). 117//config: listings (-t) and preserving permissions when unpacking (-p).
126//config: +200 bytes. 118//config: +200 bytes.
127//config: 119//config:
128//config:config FEATURE_TAR_NOPRESERVE_TIME 120//config:config FEATURE_TAR_NOPRESERVE_TIME
129//config: bool "Enable -m (do not preserve time) option" 121//config: bool "Enable -m (do not preserve time) GNU option"
130//config: default y 122//config: default y
131//config: depends on TAR 123//config: depends on TAR
132//config: help
133//config: With this option busybox supports GNU tar -m
134//config: (do not preserve time) option.
135//config: 124//config:
136//config:config FEATURE_TAR_SELINUX 125//config:config FEATURE_TAR_SELINUX
137//config: bool "Support for extracting SELinux labels" 126//config: bool "Support extracting SELinux labels"
138//config: default n 127//config: default n
139//config: depends on TAR && SELINUX 128//config: depends on TAR && SELINUX
140//config: help 129//config: help
diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index 52605baa1..29f723ec0 100644
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -42,18 +42,14 @@
42//config: depends on LOADFONT || SETFONT 42//config: depends on LOADFONT || SETFONT
43//config: 43//config:
44//config:config FEATURE_LOADFONT_PSF2 44//config:config FEATURE_LOADFONT_PSF2
45//config: bool "Support for PSF2 console fonts" 45//config: bool "Support PSF2 console fonts"
46//config: default y 46//config: default y
47//config: depends on LOADFONT || SETFONT 47//config: depends on LOADFONT || SETFONT
48//config: help
49//config: Support PSF2 console fonts.
50//config: 48//config:
51//config:config FEATURE_LOADFONT_RAW 49//config:config FEATURE_LOADFONT_RAW
52//config: bool "Support for old (raw) console fonts" 50//config: bool "Support old (raw) console fonts"
53//config: default y 51//config: default y
54//config: depends on LOADFONT || SETFONT 52//config: depends on LOADFONT || SETFONT
55//config: help
56//config: Support old (raw) console fonts.
57 53
58//applet:IF_LOADFONT(APPLET(loadfont, BB_DIR_USR_SBIN, BB_SUID_DROP)) 54//applet:IF_LOADFONT(APPLET(loadfont, BB_DIR_USR_SBIN, BB_SUID_DROP))
59//applet:IF_SETFONT(APPLET(setfont, BB_DIR_USR_SBIN, BB_SUID_DROP)) 55//applet:IF_SETFONT(APPLET(setfont, BB_DIR_USR_SBIN, BB_SUID_DROP))
diff --git a/console-tools/setconsole.c b/console-tools/setconsole.c
index 58057268d..d47a33d59 100644
--- a/console-tools/setconsole.c
+++ b/console-tools/setconsole.c
@@ -19,8 +19,6 @@
19//config: bool "Enable long options" 19//config: bool "Enable long options"
20//config: default y 20//config: default y
21//config: depends on SETCONSOLE && LONG_OPTS 21//config: depends on SETCONSOLE && LONG_OPTS
22//config: help
23//config: Support long options for the setconsole applet.
24 22
25//applet:IF_SETCONSOLE(APPLET(setconsole, BB_DIR_SBIN, BB_SUID_DROP)) 23//applet:IF_SETCONSOLE(APPLET(setconsole, BB_DIR_SBIN, BB_SUID_DROP))
26 24
diff --git a/coreutils/Config.src b/coreutils/Config.src
index c056320f8..1d2fea1fb 100644
--- a/coreutils/Config.src
+++ b/coreutils/Config.src
@@ -27,25 +27,11 @@ config FEATURE_PRESERVE_HARDLINKS
27 help 27 help
28 Allow cp and mv to preserve hard links. 28 Allow cp and mv to preserve hard links.
29 29
30comment "Common options for ls, more and telnet"
31 depends on LS || MORE || TELNET
32
33config FEATURE_AUTOWIDTH
34 bool "Calculate terminal & column widths"
35 default y
36 depends on LS || MORE || TELNET
37 help
38 This option allows utilities such as 'ls', 'more' and 'telnet'
39 to determine the width of the screen, which can allow them to
40 display additional text or avoid wrapping text onto the next line.
41 If you leave this disabled, your utilities will be especially
42 primitive and will be unable to determine the current screen width.
43
44comment "Common options for df, du, ls" 30comment "Common options for df, du, ls"
45 depends on DF || DU || LS 31 depends on DF || DU || LS
46 32
47config FEATURE_HUMAN_READABLE 33config FEATURE_HUMAN_READABLE
48 bool "Support for human readable output (example 13k, 23M, 235G)" 34 bool "Support human readable output (example 13k, 23M, 235G)"
49 default y 35 default y
50 depends on DF || DU || LS 36 depends on DF || DU || LS
51 help 37 help
diff --git a/coreutils/chown.c b/coreutils/chown.c
index 50b06d73a..12cd0eacc 100644
--- a/coreutils/chown.c
+++ b/coreutils/chown.c
@@ -17,8 +17,6 @@
17//config: bool "Enable long options" 17//config: bool "Enable long options"
18//config: default y 18//config: default y
19//config: depends on CHOWN && LONG_OPTS 19//config: depends on CHOWN && LONG_OPTS
20//config: help
21//config: Enable use of long options
22 20
23//applet:IF_CHOWN(APPLET_NOEXEC(chown, chown, BB_DIR_BIN, BB_SUID_DROP, chown)) 21//applet:IF_CHOWN(APPLET_NOEXEC(chown, chown, BB_DIR_BIN, BB_SUID_DROP, chown))
24 22
diff --git a/coreutils/cp.c b/coreutils/cp.c
index 4ecdaafda..1e5f36d10 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -18,11 +18,11 @@
18//config: cp is used to copy files and directories. 18//config: cp is used to copy files and directories.
19//config: 19//config:
20//config:config FEATURE_CP_LONG_OPTIONS 20//config:config FEATURE_CP_LONG_OPTIONS
21//config: bool "Enable long options for cp" 21//config: bool "Enable long options"
22//config: default y 22//config: default y
23//config: depends on CP && LONG_OPTS 23//config: depends on CP && LONG_OPTS
24//config: help 24//config: help
25//config: Enable long options for cp. 25//config: Enable long options.
26//config: Also add support for --parents option. 26//config: Also add support for --parents option.
27 27
28//applet:IF_CP(APPLET_NOEXEC(cp, cp, BB_DIR_BIN, BB_SUID_DROP, cp)) 28//applet:IF_CP(APPLET_NOEXEC(cp, cp, BB_DIR_BIN, BB_SUID_DROP, cp))
diff --git a/coreutils/dd.c b/coreutils/dd.c
index 3d1ba2ee6..5e68087fc 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -41,7 +41,7 @@
41//config: default y 41//config: default y
42//config: depends on DD 42//config: depends on DD
43//config: help 43//config: help
44//config: Enables support for writing a certain number of bytes in and out, 44//config: Enable support for writing a certain number of bytes in and out,
45//config: at a time, and performing conversions on the data stream. 45//config: at a time, and performing conversions on the data stream.
46//config: 46//config:
47//config:config FEATURE_DD_STATUS 47//config:config FEATURE_DD_STATUS
@@ -49,7 +49,7 @@
49//config: default y 49//config: default y
50//config: depends on DD 50//config: depends on DD
51//config: help 51//config: help
52//config: Enables support for status=noxfer/none option. 52//config: Enable support for status=noxfer/none option.
53 53
54//applet:IF_DD(APPLET_NOEXEC(dd, dd, BB_DIR_BIN, BB_SUID_DROP, dd)) 54//applet:IF_DD(APPLET_NOEXEC(dd, dd, BB_DIR_BIN, BB_SUID_DROP, dd))
55 55
diff --git a/coreutils/df.c b/coreutils/df.c
index 79e4c4670..cf367161a 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -29,11 +29,9 @@
29//config: default y 29//config: default y
30//config: depends on DF 30//config: depends on DF
31//config: help 31//config: help
32//config: This option enables -a, -i and -B. 32//config: -a Show all filesystems
33//config: 33//config: -i Inodes
34//config: -a Show all filesystems 34//config: -B <SIZE> Blocksize
35//config: -i Inodes
36//config: -B <SIZE> Blocksize
37 35
38//applet:IF_DF(APPLET(df, BB_DIR_BIN, BB_SUID_DROP)) 36//applet:IF_DF(APPLET(df, BB_DIR_BIN, BB_SUID_DROP))
39 37
diff --git a/coreutils/echo.c b/coreutils/echo.c
index fd0d9b780..d0dba650d 100644
--- a/coreutils/echo.c
+++ b/coreutils/echo.c
@@ -26,11 +26,9 @@
26//config: 26//config:
27//config:# this entry also appears in shell/Config.in, next to the echo builtin 27//config:# this entry also appears in shell/Config.in, next to the echo builtin
28//config:config FEATURE_FANCY_ECHO 28//config:config FEATURE_FANCY_ECHO
29//config: bool "Enable echo options (-n and -e)" 29//config: bool "Enable -n and -e options"
30//config: default y 30//config: default y
31//config: depends on ECHO || ASH_BUILTIN_ECHO || HUSH 31//config: depends on ECHO || ASH_BUILTIN_ECHO || HUSH_ECHO
32//config: help
33//config: This adds options (-n and -e) to echo.
34 32
35//applet:IF_ECHO(APPLET_NOFORK(echo, echo, BB_DIR_BIN, BB_SUID_DROP, echo)) 33//applet:IF_ECHO(APPLET_NOFORK(echo, echo, BB_DIR_BIN, BB_SUID_DROP, echo))
36 34
diff --git a/coreutils/env.c b/coreutils/env.c
index e91eddb5c..2bd5f41d0 100644
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -35,8 +35,6 @@
35//config: bool "Enable long options" 35//config: bool "Enable long options"
36//config: default y 36//config: default y
37//config: depends on ENV && LONG_OPTS 37//config: depends on ENV && LONG_OPTS
38//config: help
39//config: Support long options for the env applet.
40 38
41//applet:IF_ENV(APPLET_NOEXEC(env, env, BB_DIR_USR_BIN, BB_SUID_DROP, env)) 39//applet:IF_ENV(APPLET_NOEXEC(env, env, BB_DIR_USR_BIN, BB_SUID_DROP, env))
42 40
diff --git a/coreutils/expand.c b/coreutils/expand.c
index bb59af46d..29affc932 100644
--- a/coreutils/expand.c
+++ b/coreutils/expand.c
@@ -30,8 +30,6 @@
30//config: bool "Enable long options" 30//config: bool "Enable long options"
31//config: default y 31//config: default y
32//config: depends on EXPAND && LONG_OPTS 32//config: depends on EXPAND && LONG_OPTS
33//config: help
34//config: Support long options for the expand applet.
35//config: 33//config:
36//config:config UNEXPAND 34//config:config UNEXPAND
37//config: bool "unexpand" 35//config: bool "unexpand"
@@ -43,8 +41,6 @@
43//config: bool "Enable long options" 41//config: bool "Enable long options"
44//config: default y 42//config: default y
45//config: depends on UNEXPAND && LONG_OPTS 43//config: depends on UNEXPAND && LONG_OPTS
46//config: help
47//config: Support long options for the unexpand applet.
48 44
49//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))
50//applet:IF_UNEXPAND(APPLET_ODDNAME(unexpand, expand, BB_DIR_USR_BIN, BB_SUID_DROP, unexpand)) 46//applet:IF_UNEXPAND(APPLET_ODDNAME(unexpand, expand, BB_DIR_USR_BIN, BB_SUID_DROP, unexpand))
diff --git a/coreutils/head.c b/coreutils/head.c
index 176e91e3a..d49113e7f 100644
--- a/coreutils/head.c
+++ b/coreutils/head.c
@@ -14,11 +14,9 @@
14//config: from files. 14//config: from files.
15//config: 15//config:
16//config:config FEATURE_FANCY_HEAD 16//config:config FEATURE_FANCY_HEAD
17//config: bool "Enable head options (-c, -q, and -v)" 17//config: bool "Enable -c, -q, and -v"
18//config: default y 18//config: default y
19//config: depends on HEAD 19//config: depends on HEAD
20//config: help
21//config: This enables the head options (-c, -q, and -v).
22 20
23//applet:IF_HEAD(APPLET_NOEXEC(head, head, BB_DIR_USR_BIN, BB_SUID_DROP, head)) 21//applet:IF_HEAD(APPLET_NOEXEC(head, head, BB_DIR_USR_BIN, BB_SUID_DROP, head))
24 22
diff --git a/coreutils/install.c b/coreutils/install.c
index 831f9b802..2a642bdb6 100644
--- a/coreutils/install.c
+++ b/coreutils/install.c
@@ -15,8 +15,6 @@
15//config: bool "Enable long options" 15//config: bool "Enable long options"
16//config: default y 16//config: default y
17//config: depends on INSTALL && LONG_OPTS 17//config: depends on INSTALL && LONG_OPTS
18//config: help
19//config: Support long options for the install applet.
20 18
21//applet:IF_INSTALL(APPLET(install, BB_DIR_USR_BIN, BB_SUID_DROP)) 19//applet:IF_INSTALL(APPLET(install, BB_DIR_USR_BIN, BB_SUID_DROP))
22 20
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 0f35c70d5..531eb85b5 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -37,22 +37,16 @@
37//config: bool "Enable filetyping options (-p and -F)" 37//config: bool "Enable filetyping options (-p and -F)"
38//config: default y 38//config: default y
39//config: depends on LS 39//config: depends on LS
40//config: help
41//config: Enable the ls options (-p and -F).
42//config: 40//config:
43//config:config FEATURE_LS_FOLLOWLINKS 41//config:config FEATURE_LS_FOLLOWLINKS
44//config: bool "Enable symlinks dereferencing (-L)" 42//config: bool "Enable symlinks dereferencing (-L)"
45//config: default y 43//config: default y
46//config: depends on LS 44//config: depends on LS
47//config: help
48//config: Enable the ls option (-L).
49//config: 45//config:
50//config:config FEATURE_LS_RECURSIVE 46//config:config FEATURE_LS_RECURSIVE
51//config: bool "Enable recursion (-R)" 47//config: bool "Enable recursion (-R)"
52//config: default y 48//config: default y
53//config: depends on LS 49//config: depends on LS
54//config: help
55//config: Enable the ls option (-R).
56//config: 50//config:
57//config:config FEATURE_LS_SORTFILES 51//config:config FEATURE_LS_SORTFILES
58//config: bool "Sort the file names" 52//config: bool "Sort the file names"
diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c
index 783f44027..76788554c 100644
--- a/coreutils/md5_sha1_sum.c
+++ b/coreutils/md5_sha1_sum.c
@@ -45,7 +45,6 @@
45//config: help 45//config: help
46//config: Enabling the -c options allows files to be checked 46//config: Enabling the -c options allows files to be checked
47//config: against pre-calculated hash values. 47//config: against pre-calculated hash values.
48//config:
49//config: -s and -w are useful options when verifying checksums. 48//config: -s and -w are useful options when verifying checksums.
50 49
51//applet:IF_MD5SUM(APPLET_NOEXEC(md5sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, md5sum)) 50//applet:IF_MD5SUM(APPLET_NOEXEC(md5sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, md5sum))
diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index 3afe76c28..fcc34f1ad 100644
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -23,8 +23,6 @@
23//config: bool "Enable long options" 23//config: bool "Enable long options"
24//config: default y 24//config: default y
25//config: depends on MKDIR && LONG_OPTS 25//config: depends on MKDIR && LONG_OPTS
26//config: help
27//config: Support long options for the mkdir applet.
28 26
29//applet:IF_MKDIR(APPLET_NOFORK(mkdir, mkdir, BB_DIR_BIN, BB_SUID_DROP, mkdir)) 27//applet:IF_MKDIR(APPLET_NOFORK(mkdir, mkdir, BB_DIR_BIN, BB_SUID_DROP, mkdir))
30 28
diff --git a/coreutils/mv.c b/coreutils/mv.c
index 1cc318fd1..df2ef0a52 100644
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -21,8 +21,6 @@
21//config: bool "Enable long options" 21//config: bool "Enable long options"
22//config: default y 22//config: default y
23//config: depends on MV && LONG_OPTS 23//config: depends on MV && LONG_OPTS
24//config: help
25//config: Support long options for the mv applet.
26 24
27//applet:IF_MV(APPLET(mv, BB_DIR_BIN, BB_SUID_DROP)) 25//applet:IF_MV(APPLET(mv, BB_DIR_BIN, BB_SUID_DROP))
28 26
diff --git a/coreutils/split.c b/coreutils/split.c
index 50918a1ce..7af359d0e 100644
--- a/coreutils/split.c
+++ b/coreutils/split.c
@@ -9,7 +9,7 @@
9//config: bool "split" 9//config: bool "split"
10//config: default y 10//config: default y
11//config: help 11//config: help
12//config: split a file into pieces. 12//config: Split a file into pieces.
13//config: 13//config:
14//config:config FEATURE_SPLIT_FANCY 14//config:config FEATURE_SPLIT_FANCY
15//config: bool "Fancy extensions" 15//config: bool "Fancy extensions"
diff --git a/coreutils/tail.c b/coreutils/tail.c
index 99f58ddd8..e7a24a7a8 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -26,13 +26,12 @@
26//config: from files. 26//config: from files.
27//config: 27//config:
28//config:config FEATURE_FANCY_TAIL 28//config:config FEATURE_FANCY_TAIL
29//config: bool "Enable extra tail options (-q, -s, -v, and -F)" 29//config: bool "Enable -q, -s, -v, and -F options"
30//config: default y 30//config: default y
31//config: depends on TAIL 31//config: depends on TAIL
32//config: help 32//config: help
33//config: The options (-q, -s, -v and -F) are provided by GNU tail, but 33//config: These options are provided by GNU tail, but
34//config: are not specific in the SUSv3 standard. 34//config: are not specific in the SUSv3 standard:
35//config:
36//config: -q Never output headers giving file names 35//config: -q Never output headers giving file names
37//config: -s SEC Wait SEC seconds between reads with -f 36//config: -s SEC Wait SEC seconds between reads with -f
38//config: -v Always output headers giving file names 37//config: -v Always output headers giving file names
diff --git a/coreutils/wc.c b/coreutils/wc.c
index 73837141e..4c53049b0 100644
--- a/coreutils/wc.c
+++ b/coreutils/wc.c
@@ -40,11 +40,11 @@
40//config: in specified files. 40//config: in specified files.
41//config: 41//config:
42//config:config FEATURE_WC_LARGE 42//config:config FEATURE_WC_LARGE
43//config: bool "Support very large files in wc" 43//config: bool "Support very large counts"
44//config: default y 44//config: default y
45//config: depends on WC 45//config: depends on WC
46//config: help 46//config: help
47//config: Use "unsigned long long" in wc for counter variables. 47//config: Use "unsigned long long" for counter variables.
48 48
49//applet:IF_WC(APPLET(wc, BB_DIR_USR_BIN, BB_SUID_DROP)) 49//applet:IF_WC(APPLET(wc, BB_DIR_USR_BIN, BB_SUID_DROP))
50 50
diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c
index 0bb666abc..3ef28f1d4 100644
--- a/debianutils/run_parts.c
+++ b/debianutils/run_parts.c
@@ -41,8 +41,6 @@
41//config: bool "Enable long options" 41//config: bool "Enable long options"
42//config: default y 42//config: default y
43//config: depends on RUN_PARTS && LONG_OPTS 43//config: depends on RUN_PARTS && LONG_OPTS
44//config: help
45//config: Support long options for the run-parts applet.
46//config: 44//config:
47//config:config FEATURE_RUN_PARTS_FANCY 45//config:config FEATURE_RUN_PARTS_FANCY
48//config: bool "Support additional arguments" 46//config: bool "Support additional arguments"
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index 3625ffee8..4a9e0653e 100644
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -64,22 +64,19 @@ Misc options:
64//config: termination of system-level processes, usually the ones 64//config: termination of system-level processes, usually the ones
65//config: started during the startup of the system. 65//config: started during the startup of the system.
66//config: 66//config:
67//config:config FEATURE_START_STOP_DAEMON_LONG_OPTIONS
68//config: bool "Enable long options"
69//config: default y
70//config: depends on START_STOP_DAEMON && LONG_OPTS
71//config:
67//config:config FEATURE_START_STOP_DAEMON_FANCY 72//config:config FEATURE_START_STOP_DAEMON_FANCY
68//config: bool "Support additional arguments" 73//config: bool "Support additional arguments"
69//config: default y 74//config: default y
70//config: depends on START_STOP_DAEMON 75//config: depends on START_STOP_DAEMON
71//config: help 76//config: help
72//config: Support additional arguments.
73//config: -o|--oknodo ignored since we exit with 0 anyway 77//config: -o|--oknodo ignored since we exit with 0 anyway
74//config: -v|--verbose 78//config: -v|--verbose
75//config: -N|--nicelevel N 79//config: -N|--nicelevel N
76//config:
77//config:config FEATURE_START_STOP_DAEMON_LONG_OPTIONS
78//config: bool "Enable long options"
79//config: default y
80//config: depends on START_STOP_DAEMON && LONG_OPTS
81//config: help
82//config: Support long options for the start-stop-daemon applet.
83 80
84//applet:IF_START_STOP_DAEMON(APPLET_ODDNAME(start-stop-daemon, start_stop_daemon, BB_DIR_SBIN, BB_SUID_DROP, start_stop_daemon)) 81//applet:IF_START_STOP_DAEMON(APPLET_ODDNAME(start-stop-daemon, start_stop_daemon, BB_DIR_SBIN, BB_SUID_DROP, start_stop_daemon))
85 82
diff --git a/editors/Config.src b/editors/Config.src
index c6e9d92af..8f2b265bd 100644
--- a/editors/Config.src
+++ b/editors/Config.src
@@ -12,7 +12,7 @@ config FEATURE_ALLOW_EXEC
12 default y 12 default y
13 depends on VI || AWK 13 depends on VI || AWK
14 help 14 help
15 Enables vi and awk features which allows user to execute 15 Enables vi and awk features which allow user to execute
16 shell commands (using system() C call). 16 shell commands (using system() C call).
17 17
18endmenu 18endmenu
diff --git a/editors/diff.c b/editors/diff.c
index 75229ad8c..0eb825cfb 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -88,8 +88,6 @@
88//config: bool "Enable long options" 88//config: bool "Enable long options"
89//config: default y 89//config: default y
90//config: depends on DIFF && LONG_OPTS 90//config: depends on DIFF && LONG_OPTS
91//config: help
92//config: Enable use of long options.
93//config: 91//config:
94//config:config FEATURE_DIFF_DIR 92//config:config FEATURE_DIFF_DIR
95//config: bool "Enable directory support" 93//config: bool "Enable directory support"
diff --git a/editors/vi.c b/editors/vi.c
index 38a4692fd..b56b04bdd 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -30,7 +30,7 @@
30//config: you may wish to use something else. 30//config: you may wish to use something else.
31//config: 31//config:
32//config:config FEATURE_VI_MAX_LEN 32//config:config FEATURE_VI_MAX_LEN
33//config: int "Maximum screen width in vi" 33//config: int "Maximum screen width"
34//config: range 256 16384 34//config: range 256 16384
35//config: default 4096 35//config: default 4096
36//config: depends on VI 36//config: depends on VI
@@ -39,7 +39,7 @@
39//config: Make it smaller than 4k only if you are very limited on memory. 39//config: Make it smaller than 4k only if you are very limited on memory.
40//config: 40//config:
41//config:config FEATURE_VI_8BIT 41//config:config FEATURE_VI_8BIT
42//config: bool "Allow vi to display 8-bit chars (otherwise shows dots)" 42//config: bool "Allow to display 8-bit chars (otherwise shows dots)"
43//config: default n 43//config: default n
44//config: depends on VI 44//config: depends on VI
45//config: help 45//config: help
@@ -53,7 +53,7 @@
53//config: default y 53//config: default y
54//config: depends on VI 54//config: depends on VI
55//config: help 55//config: help
56//config: Enable a limited set of colon commands for vi. This does not 56//config: Enable a limited set of colon commands. This does not
57//config: provide an "ex" mode. 57//config: provide an "ex" mode.
58//config: 58//config:
59//config:config FEATURE_VI_YANKMARK 59//config:config FEATURE_VI_YANKMARK
@@ -61,16 +61,14 @@
61//config: default y 61//config: default y
62//config: depends on VI 62//config: depends on VI
63//config: help 63//config: help
64//config: This will enable you to use yank and put, as well as mark in 64//config: This will enable you to use yank and put, as well as mark.
65//config: busybox vi.
66//config: 65//config:
67//config:config FEATURE_VI_SEARCH 66//config:config FEATURE_VI_SEARCH
68//config: bool "Enable search and replace cmds" 67//config: bool "Enable search and replace cmds"
69//config: default y 68//config: default y
70//config: depends on VI 69//config: depends on VI
71//config: help 70//config: help
72//config: Select this if you wish to be able to do search and replace in 71//config: Select this if you wish to be able to do search and replace.
73//config: busybox vi.
74//config: 72//config:
75//config:config FEATURE_VI_REGEX_SEARCH 73//config:config FEATURE_VI_REGEX_SEARCH
76//config: bool "Enable regex in search and replace" 74//config: bool "Enable regex in search and replace"
@@ -84,16 +82,15 @@
84//config: default y 82//config: default y
85//config: depends on VI 83//config: depends on VI
86//config: help 84//config: help
87//config: Selecting this option will make busybox vi signal aware. This will 85//config: Selecting this option will make vi signal aware. This will support
88//config: make busybox vi support SIGWINCH to deal with Window Changes, catch 86//config: SIGWINCH to deal with Window Changes, catch ^Z and ^C and alarms.
89//config: Ctrl-Z and Ctrl-C and alarms.
90//config: 87//config:
91//config:config FEATURE_VI_DOT_CMD 88//config:config FEATURE_VI_DOT_CMD
92//config: bool "Remember previous cmd and \".\" cmd" 89//config: bool "Remember previous cmd and \".\" cmd"
93//config: default y 90//config: default y
94//config: depends on VI 91//config: depends on VI
95//config: help 92//config: help
96//config: Make busybox vi remember the last command and be able to repeat it. 93//config: Make vi remember the last command and be able to repeat it.
97//config: 94//config:
98//config:config FEATURE_VI_READONLY 95//config:config FEATURE_VI_READONLY
99//config: bool "Enable -R option and \"view\" mode" 96//config: bool "Enable -R option and \"view\" mode"
@@ -104,25 +101,23 @@
104//config: open a file in read-only mode. 101//config: open a file in read-only mode.
105//config: 102//config:
106//config:config FEATURE_VI_SETOPTS 103//config:config FEATURE_VI_SETOPTS
107//config: bool "Enable set-able options, ai ic showmatch" 104//config: bool "Enable settable options, ai ic showmatch"
108//config: default y 105//config: default y
109//config: depends on VI 106//config: depends on VI
110//config: help 107//config: help
111//config: Enable the editor to set some (ai, ic, showmatch) options. 108//config: Enable the editor to set some (ai, ic, showmatch) options.
112//config: 109//config:
113//config:config FEATURE_VI_SET 110//config:config FEATURE_VI_SET
114//config: bool "Support for :set" 111//config: bool "Support :set"
115//config: default y 112//config: default y
116//config: depends on VI 113//config: depends on VI
117//config: help
118//config: Support for ":set".
119//config: 114//config:
120//config:config FEATURE_VI_WIN_RESIZE 115//config:config FEATURE_VI_WIN_RESIZE
121//config: bool "Handle window resize" 116//config: bool "Handle window resize"
122//config: default y 117//config: default y
123//config: depends on VI 118//config: depends on VI
124//config: help 119//config: help
125//config: Make busybox vi behave nicely with terminals that get resized. 120//config: Behave nicely with terminals that get resized.
126//config: 121//config:
127//config:config FEATURE_VI_ASK_TERMINAL 122//config:config FEATURE_VI_ASK_TERMINAL
128//config: bool "Use 'tell me cursor position' ESC sequence to measure window" 123//config: bool "Use 'tell me cursor position' ESC sequence to measure window"
@@ -133,15 +128,16 @@
133//config: this option makes vi perform a last-ditch effort to find it: 128//config: this option makes vi perform a last-ditch effort to find it:
134//config: position cursor to 999,999 and ask terminal to report real 129//config: position cursor to 999,999 and ask terminal to report real
135//config: cursor position using "ESC [ 6 n" escape sequence, then read stdin. 130//config: cursor position using "ESC [ 6 n" escape sequence, then read stdin.
136//config:
137//config: This is not clean but helps a lot on serial lines and such. 131//config: This is not clean but helps a lot on serial lines and such.
132//config:
138//config:config FEATURE_VI_UNDO 133//config:config FEATURE_VI_UNDO
139//config: bool "Support undo command 'u'" 134//config: bool "Support undo command \"u\""
140//config: default y 135//config: default y
141//config: depends on VI 136//config: depends on VI
142//config: help 137//config: help
143//config: Support the 'u' command to undo insertion, deletion, and replacement 138//config: Support the 'u' command to undo insertion, deletion, and replacement
144//config: of text. 139//config: of text.
140//config:
145//config:config FEATURE_VI_UNDO_QUEUE 141//config:config FEATURE_VI_UNDO_QUEUE
146//config: bool "Enable undo operation queuing" 142//config: bool "Enable undo operation queuing"
147//config: default y 143//config: default y
@@ -152,6 +148,7 @@
152//config: reached, the contents of the queue are committed to the undo stack. 148//config: reached, the contents of the queue are committed to the undo stack.
153//config: This increases the size of the undo code and allows some undo 149//config: This increases the size of the undo code and allows some undo
154//config: operations (especially un-typing/backspacing) to be far more useful. 150//config: operations (especially un-typing/backspacing) to be far more useful.
151//config:
155//config:config FEATURE_VI_UNDO_QUEUE_MAX 152//config:config FEATURE_VI_UNDO_QUEUE_MAX
156//config: int "Maximum undo character queue size" 153//config: int "Maximum undo character queue size"
157//config: default 256 154//config: default 256
diff --git a/findutils/find.c b/findutils/find.c
index 27698e537..67aa40b21 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -89,8 +89,6 @@
89//config: bool "Enable -perm: permissions matching" 89//config: bool "Enable -perm: permissions matching"
90//config: default y 90//config: default y
91//config: depends on FIND 91//config: depends on FIND
92//config: help
93//config: Enable searching based on file permissions.
94//config: 92//config:
95//config:config FEATURE_FIND_TYPE 93//config:config FEATURE_FIND_TYPE
96//config: bool "Enable -type: file type matching (file/dir/link/...)" 94//config: bool "Enable -type: file type matching (file/dir/link/...)"
@@ -104,15 +102,11 @@
104//config: bool "Enable -xdev: 'stay in filesystem'" 102//config: bool "Enable -xdev: 'stay in filesystem'"
105//config: default y 103//config: default y
106//config: depends on FIND 104//config: depends on FIND
107//config: help
108//config: This option allows find to restrict searches to a single filesystem.
109//config: 105//config:
110//config:config FEATURE_FIND_MAXDEPTH 106//config:config FEATURE_FIND_MAXDEPTH
111//config: bool "Enable -mindepth N and -maxdepth N" 107//config: bool "Enable -mindepth N and -maxdepth N"
112//config: default y 108//config: default y
113//config: depends on FIND 109//config: depends on FIND
114//config: help
115//config: This option enables -mindepth N and -maxdepth N option.
116//config: 110//config:
117//config:config FEATURE_FIND_NEWER 111//config:config FEATURE_FIND_NEWER
118//config: bool "Enable -newer: compare file modification times" 112//config: bool "Enable -newer: compare file modification times"
@@ -126,8 +120,6 @@
126//config: bool "Enable -inum: inode number matching" 120//config: bool "Enable -inum: inode number matching"
127//config: default y 121//config: default y
128//config: depends on FIND 122//config: depends on FIND
129//config: help
130//config: Support the 'find -inum' option for searching by inode number.
131//config: 123//config:
132//config:config FEATURE_FIND_EXEC 124//config:config FEATURE_FIND_EXEC
133//config: bool "Enable -exec: execute commands" 125//config: bool "Enable -exec: execute commands"
@@ -151,15 +143,11 @@
151//config: bool "Enable -user: username/uid matching" 143//config: bool "Enable -user: username/uid matching"
152//config: default y 144//config: default y
153//config: depends on FIND 145//config: depends on FIND
154//config: help
155//config: Support the 'find -user' option for searching by username or uid.
156//config: 146//config:
157//config:config FEATURE_FIND_GROUP 147//config:config FEATURE_FIND_GROUP
158//config: bool "Enable -group: group/gid matching" 148//config: bool "Enable -group: group/gid matching"
159//config: default y 149//config: default y
160//config: depends on FIND 150//config: depends on FIND
161//config: help
162//config: Support the 'find -group' option for searching by group name or gid.
163//config: 151//config:
164//config:config FEATURE_FIND_NOT 152//config:config FEATURE_FIND_NOT
165//config: bool "Enable the 'not' (!) operator" 153//config: bool "Enable the 'not' (!) operator"
@@ -188,8 +176,6 @@
188//config: bool "Enable -size: file size matching" 176//config: bool "Enable -size: file size matching"
189//config: default y 177//config: default y
190//config: depends on FIND 178//config: depends on FIND
191//config: help
192//config: Support the 'find -size' option for searching by file size.
193//config: 179//config:
194//config:config FEATURE_FIND_PRUNE 180//config:config FEATURE_FIND_PRUNE
195//config: bool "Enable -prune: exclude subdirectories" 181//config: bool "Enable -prune: exclude subdirectories"
diff --git a/init/init.c b/init/init.c
index 08cfa2f8c..8db4ced58 100644
--- a/init/init.c
+++ b/init/init.c
@@ -104,13 +104,13 @@
104//config: sets TERM to "vt102" if one is found. 104//config: sets TERM to "vt102" if one is found.
105//config: 105//config:
106//config:config FEATURE_INIT_MODIFY_CMDLINE 106//config:config FEATURE_INIT_MODIFY_CMDLINE
107//config: bool "Modify the command-line to \"init\"" 107//config: bool "Clear init's command line"
108//config: default y 108//config: default y
109//config: depends on INIT || LINUXRC 109//config: depends on INIT || LINUXRC
110//config: help 110//config: help
111//config: When launched as PID 1 and after parsing its arguments, init 111//config: When launched as PID 1 and after parsing its arguments, init
112//config: wipes all the arguments but argv[0] and rewrites argv[0] to 112//config: wipes all the arguments but argv[0] and rewrites argv[0] to
113//config: contain only "init", so that its command-line appears solely as 113//config: contain only "init", so that its command line appears solely as
114//config: "init" in tools such as ps. 114//config: "init" in tools such as ps.
115//config: If this option is set to Y, init will keep its original behavior, 115//config: If this option is set to Y, init will keep its original behavior,
116//config: otherwise, all the arguments including argv[0] will be preserved, 116//config: otherwise, all the arguments including argv[0] will be preserved,
diff --git a/libbb/Config.src b/libbb/Config.src
index 172fbcc0e..c51640305 100644
--- a/libbb/Config.src
+++ b/libbb/Config.src
@@ -70,24 +70,13 @@ config FEATURE_FAST_TOP
70 but code size is slightly bigger. 70 but code size is slightly bigger.
71 71
72config FEATURE_ETC_NETWORKS 72config FEATURE_ETC_NETWORKS
73 bool "Support for /etc/networks" 73 bool "Support /etc/networks"
74 default n 74 default n
75 help 75 help
76 Enable support for network names in /etc/networks. This is 76 Enable support for network names in /etc/networks. This is
77 a rarely used feature which allows you to use names 77 a rarely used feature which allows you to use names
78 instead of IP/mask pairs in route command. 78 instead of IP/mask pairs in route command.
79 79
80config FEATURE_USE_TERMIOS
81 bool "Use termios to manipulate the screen"
82 default y
83 depends on MORE || TOP || POWERTOP
84 help
85 This option allows utilities such as 'more' and 'top' to determine
86 the size of the screen. If you leave this disabled, your utilities
87 that display things on the screen will be especially primitive and
88 will be unable to determine the current screen size, and will be
89 unable to move the cursor.
90
91config FEATURE_EDITING 80config FEATURE_EDITING
92 bool "Command line editing" 81 bool "Command line editing"
93 default y 82 default y
@@ -147,15 +136,11 @@ config FEATURE_TAB_COMPLETION
147 bool "Tab completion" 136 bool "Tab completion"
148 default y 137 default y
149 depends on FEATURE_EDITING 138 depends on FEATURE_EDITING
150 help
151 Enable tab completion.
152 139
153config FEATURE_USERNAME_COMPLETION 140config FEATURE_USERNAME_COMPLETION
154 bool "Username completion" 141 bool "Username completion"
155 default y 142 default y
156 depends on FEATURE_TAB_COMPLETION 143 depends on FEATURE_TAB_COMPLETION
157 help
158 Enable username completion.
159 144
160config FEATURE_EDITING_FANCY_PROMPT 145config FEATURE_EDITING_FANCY_PROMPT
161 bool "Fancy shell prompts" 146 bool "Fancy shell prompts"
diff --git a/loginutils/Config.src b/loginutils/Config.src
index efb954b6c..beb4eb855 100644
--- a/loginutils/Config.src
+++ b/loginutils/Config.src
@@ -6,7 +6,7 @@
6menu "Login/Password Management Utilities" 6menu "Login/Password Management Utilities"
7 7
8config FEATURE_SHADOWPASSWDS 8config FEATURE_SHADOWPASSWDS
9 bool "Support for shadow passwords" 9 bool "Support shadow passwords"
10 default y 10 default y
11 help 11 help
12 Build support for shadow password in /etc/shadow. This file is only 12 Build support for shadow password in /etc/shadow. This file is only
diff --git a/loginutils/addgroup.c b/loginutils/addgroup.c
index 6b2fd7ba9..94da4efbb 100644
--- a/loginutils/addgroup.c
+++ b/loginutils/addgroup.c
@@ -19,15 +19,13 @@
19//config: bool "Enable long options" 19//config: bool "Enable long options"
20//config: default y 20//config: default y
21//config: depends on ADDGROUP && LONG_OPTS 21//config: depends on ADDGROUP && LONG_OPTS
22//config: help
23//config: Support long options for the addgroup applet.
24//config: 22//config:
25//config:config FEATURE_ADDUSER_TO_GROUP 23//config:config FEATURE_ADDUSER_TO_GROUP
26//config: bool "Support for adding users to groups" 24//config: bool "Support adding users to groups"
27//config: default y 25//config: default y
28//config: depends on ADDGROUP 26//config: depends on ADDGROUP
29//config: help 27//config: help
30//config: If called with two non-option arguments, 28//config: If called with two non-option arguments,
31//config: addgroup will add an existing user to an 29//config: addgroup will add an existing user to an
32//config: existing group. 30//config: existing group.
33 31
diff --git a/loginutils/adduser.c b/loginutils/adduser.c
index 608fb8437..c218ac4aa 100644
--- a/loginutils/adduser.c
+++ b/loginutils/adduser.c
@@ -17,8 +17,6 @@
17//config: bool "Enable long options" 17//config: bool "Enable long options"
18//config: default y 18//config: default y
19//config: depends on ADDUSER && LONG_OPTS 19//config: depends on ADDUSER && LONG_OPTS
20//config: help
21//config: Support long options for the adduser applet.
22//config: 20//config:
23//config:config FEATURE_CHECK_NAMES 21//config:config FEATURE_CHECK_NAMES
24//config: bool "Enable sanity check on user/group names in adduser and addgroup" 22//config: bool "Enable sanity check on user/group names in adduser and addgroup"
diff --git a/loginutils/deluser.c b/loginutils/deluser.c
index 7c3caf9e3..fbb1614fb 100644
--- a/loginutils/deluser.c
+++ b/loginutils/deluser.c
@@ -21,7 +21,7 @@
21//config: Utility for deleting a group account. 21//config: Utility for deleting a group account.
22//config: 22//config:
23//config:config FEATURE_DEL_USER_FROM_GROUP 23//config:config FEATURE_DEL_USER_FROM_GROUP
24//config: bool "Support for removing users from groups" 24//config: bool "Support removing users from groups"
25//config: default y 25//config: default y
26//config: depends on DELGROUP 26//config: depends on DELGROUP
27//config: help 27//config: help
diff --git a/loginutils/login.c b/loginutils/login.c
index 3ca8213bb..d1757a65d 100644
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -24,7 +24,7 @@
24//config: will not be cleaned up. 24//config: will not be cleaned up.
25//config: 25//config:
26//config:config LOGIN_SCRIPTS 26//config:config LOGIN_SCRIPTS
27//config: bool "Support for login scripts" 27//config: bool "Support login scripts"
28//config: depends on LOGIN 28//config: depends on LOGIN
29//config: default y 29//config: default y
30//config: help 30//config: help
@@ -32,7 +32,7 @@
32//config: just prior to switching from root to logged-in user. 32//config: just prior to switching from root to logged-in user.
33//config: 33//config:
34//config:config FEATURE_NOLOGIN 34//config:config FEATURE_NOLOGIN
35//config: bool "Support for /etc/nologin" 35//config: bool "Support /etc/nologin"
36//config: default y 36//config: default y
37//config: depends on LOGIN 37//config: depends on LOGIN
38//config: help 38//config: help
@@ -40,7 +40,7 @@
40//config: If it exists, non-root logins are prohibited. 40//config: If it exists, non-root logins are prohibited.
41//config: 41//config:
42//config:config FEATURE_SECURETTY 42//config:config FEATURE_SECURETTY
43//config: bool "Support for /etc/securetty" 43//config: bool "Support /etc/securetty"
44//config: default y 44//config: default y
45//config: depends on LOGIN 45//config: depends on LOGIN
46//config: help 46//config: help
diff --git a/loginutils/su.c b/loginutils/su.c
index 24ffbde86..d04b85fb1 100644
--- a/loginutils/su.c
+++ b/loginutils/su.c
@@ -11,19 +11,18 @@
11//config: help 11//config: help
12//config: su is used to become another user during a login session. 12//config: su is used to become another user during a login session.
13//config: Invoked without a username, su defaults to becoming the super user. 13//config: Invoked without a username, su defaults to becoming the super user.
14//config: 14//config: Note that busybox binary must be setuid root for this applet to
15//config: Note that Busybox binary must be setuid root for this applet to
16//config: work properly. 15//config: work properly.
17//config: 16//config:
18//config:config FEATURE_SU_SYSLOG 17//config:config FEATURE_SU_SYSLOG
19//config: bool "Enable su to write to syslog" 18//config: bool "Log to syslog all attempts to use su"
20//config: default y 19//config: default y
21//config: depends on SU 20//config: depends on SU
22//config: 21//config:
23//config:config FEATURE_SU_CHECKS_SHELLS 22//config:config FEATURE_SU_CHECKS_SHELLS
24//config: bool "Enable su to check user's shell to be listed in /etc/shells" 23//config: bool "If user's shell is not in /etc/shells, disallow -s PROG"
25//config: depends on SU
26//config: default y 24//config: default y
25//config: depends on SU
27 26
28//applet:/* Needs to be run by root or be suid root - needs to change uid and gid: */ 27//applet:/* Needs to be run by root or be suid root - needs to change uid and gid: */
29//applet:IF_SU(APPLET(su, BB_DIR_BIN, BB_SUID_REQUIRE)) 28//applet:IF_SU(APPLET(su, BB_DIR_BIN, BB_SUID_REQUIRE))
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index 99bdc72b8..334f1071b 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -82,7 +82,7 @@
82//config: the external modutils. 82//config: the external modutils.
83//config: 83//config:
84//config:config DEVFSD_FG_NP 84//config:config DEVFSD_FG_NP
85//config: bool "Enables the -fg and -np options" 85//config: bool "Enable the -fg and -np options"
86//config: default y 86//config: default y
87//config: depends on DEVFSD 87//config: depends on DEVFSD
88//config: help 88//config: help
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index e43a0dec2..84675285a 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -25,7 +25,7 @@
25//config: default y 25//config: default y
26//config: depends on HDPARM 26//config: depends on HDPARM
27//config: help 27//config: help
28//config: Enables the -I and -i options to obtain detailed information 28//config: Enable the -I and -i options to obtain detailed information
29//config: directly from drives about their capabilities and supported ATA 29//config: directly from drives about their capabilities and supported ATA
30//config: feature set. If no device name is specified, hdparm will read 30//config: feature set. If no device name is specified, hdparm will read
31//config: identify data from stdin. Enabling this option will add about 16k... 31//config: identify data from stdin. Enabling this option will add about 16k...
@@ -35,7 +35,7 @@
35//config: default y 35//config: default y
36//config: depends on HDPARM 36//config: depends on HDPARM
37//config: help 37//config: help
38//config: Enables the 'hdparm -R' option to register an IDE interface. 38//config: Enable the 'hdparm -R' option to register an IDE interface.
39//config: This is dangerous stuff, so you should probably say N. 39//config: This is dangerous stuff, so you should probably say N.
40//config: 40//config:
41//config:config FEATURE_HDPARM_HDIO_UNREGISTER_HWIF 41//config:config FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
@@ -43,7 +43,7 @@
43//config: default y 43//config: default y
44//config: depends on HDPARM 44//config: depends on HDPARM
45//config: help 45//config: help
46//config: Enables the 'hdparm -U' option to un-register an IDE interface. 46//config: Enable the 'hdparm -U' option to un-register an IDE interface.
47//config: This is dangerous stuff, so you should probably say N. 47//config: This is dangerous stuff, so you should probably say N.
48//config: 48//config:
49//config:config FEATURE_HDPARM_HDIO_DRIVE_RESET 49//config:config FEATURE_HDPARM_HDIO_DRIVE_RESET
@@ -51,7 +51,7 @@
51//config: default y 51//config: default y
52//config: depends on HDPARM 52//config: depends on HDPARM
53//config: help 53//config: help
54//config: Enables the 'hdparm -w' option to perform a device reset. 54//config: Enable the 'hdparm -w' option to perform a device reset.
55//config: This is dangerous stuff, so you should probably say N. 55//config: This is dangerous stuff, so you should probably say N.
56//config: 56//config:
57//config:config FEATURE_HDPARM_HDIO_TRISTATE_HWIF 57//config:config FEATURE_HDPARM_HDIO_TRISTATE_HWIF
@@ -59,7 +59,7 @@
59//config: default y 59//config: default y
60//config: depends on HDPARM 60//config: depends on HDPARM
61//config: help 61//config: help
62//config: Enables the 'hdparm -x' option to tristate device for hotswap, 62//config: Enable the 'hdparm -x' option to tristate device for hotswap,
63//config: and the '-b' option to get/set bus state. This is dangerous 63//config: and the '-b' option to get/set bus state. This is dangerous
64//config: stuff, so you should probably say N. 64//config: stuff, so you should probably say N.
65//config: 65//config:
@@ -68,7 +68,7 @@
68//config: default y 68//config: default y
69//config: depends on HDPARM 69//config: depends on HDPARM
70//config: help 70//config: help
71//config: Enables the 'hdparm -d' option to get/set using_dma flag. 71//config: Enable the 'hdparm -d' option to get/set using_dma flag.
72 72
73//applet:IF_HDPARM(APPLET(hdparm, BB_DIR_SBIN, BB_SUID_DROP)) 73//applet:IF_HDPARM(APPLET(hdparm, BB_DIR_SBIN, BB_SUID_DROP))
74 74
diff --git a/miscutils/last.c b/miscutils/last.c
index 67c1343f1..b3f125c3f 100644
--- a/miscutils/last.c
+++ b/miscutils/last.c
@@ -14,7 +14,7 @@
14//config: 'last' displays a list of the last users that logged into the system. 14//config: 'last' displays a list of the last users that logged into the system.
15//config: 15//config:
16//config:config FEATURE_LAST_FANCY 16//config:config FEATURE_LAST_FANCY
17//config: bool "Turn on output of extra information" 17//config: bool "Output extra information"
18//config: default y 18//config: default y
19//config: depends on LAST 19//config: depends on LAST
20//config: help 20//config: help
diff --git a/miscutils/less.c b/miscutils/less.c
index e90691b49..0b0a9aed4 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -87,7 +87,6 @@
87//config: this option makes less perform a last-ditch effort to find it: 87//config: this option makes less perform a last-ditch effort to find it:
88//config: position cursor to 999,999 and ask terminal to report real 88//config: position cursor to 999,999 and ask terminal to report real
89//config: cursor position using "ESC [ 6 n" escape sequence, then read stdin. 89//config: cursor position using "ESC [ 6 n" escape sequence, then read stdin.
90//config:
91//config: This is not clean but helps a lot on serial lines and such. 90//config: This is not clean but helps a lot on serial lines and such.
92//config: 91//config:
93//config:config FEATURE_LESS_DASHCMD 92//config:config FEATURE_LESS_DASHCMD
@@ -99,11 +98,9 @@
99//config: less itself ('-' keyboard command). 98//config: less itself ('-' keyboard command).
100//config: 99//config:
101//config:config FEATURE_LESS_LINENUMS 100//config:config FEATURE_LESS_LINENUMS
102//config: bool "Enable dynamic switching of line numbers" 101//config: bool "Enable -N (dynamic switching of line numbers)"
103//config: default y 102//config: default y
104//config: depends on FEATURE_LESS_DASHCMD 103//config: depends on FEATURE_LESS_DASHCMD
105//config: help
106//config: Enables "-N" command.
107 104
108//applet:IF_LESS(APPLET(less, BB_DIR_USR_BIN, BB_SUID_DROP)) 105//applet:IF_LESS(APPLET(less, BB_DIR_USR_BIN, BB_SUID_DROP))
109 106
diff --git a/modutils/Config.src b/modutils/Config.src
index 84ff34a08..1808f332d 100644
--- a/modutils/Config.src
+++ b/modutils/Config.src
@@ -133,7 +133,7 @@ config FEATURE_CHECK_TAINTED_MODULE
133 This option is required to support GPLONLY modules. 133 This option is required to support GPLONLY modules.
134 134
135config FEATURE_MODUTILS_ALIAS 135config FEATURE_MODUTILS_ALIAS
136 bool "Support for module.aliases file" 136 bool "Support module.aliases file"
137 default y 137 default y
138 depends on DEPMOD || MODPROBE 138 depends on DEPMOD || MODPROBE
139 select PLATFORM_LINUX 139 select PLATFORM_LINUX
@@ -150,7 +150,7 @@ config FEATURE_MODUTILS_ALIAS
150 Say Y if unsure. 150 Say Y if unsure.
151 151
152config FEATURE_MODUTILS_SYMBOLS 152config FEATURE_MODUTILS_SYMBOLS
153 bool "Support for module.symbols file" 153 bool "Support module.symbols file"
154 default y 154 default y
155 depends on DEPMOD || MODPROBE 155 depends on DEPMOD || MODPROBE
156 select PLATFORM_LINUX 156 select PLATFORM_LINUX
diff --git a/networking/ftpd.c b/networking/ftpd.c
index bcd60a2ad..a4626c0b5 100644
--- a/networking/ftpd.c
+++ b/networking/ftpd.c
@@ -15,7 +15,7 @@
15//config: bool "ftpd" 15//config: bool "ftpd"
16//config: default y 16//config: default y
17//config: help 17//config: help
18//config: simple FTP daemon. You have to run it via inetd. 18//config: Simple FTP daemon. You have to run it via inetd.
19//config: 19//config:
20//config:config FEATURE_FTPD_WRITE 20//config:config FEATURE_FTPD_WRITE
21//config: bool "Enable upload commands" 21//config: bool "Enable upload commands"
diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index 40a3271ab..35b4e4b64 100644
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -28,8 +28,6 @@
28//config: bool "Enable long options in ftpget/ftpput" 28//config: bool "Enable long options in ftpget/ftpput"
29//config: default y 29//config: default y
30//config: depends on LONG_OPTS && (FTPGET || FTPPUT) 30//config: depends on LONG_OPTS && (FTPGET || FTPPUT)
31//config: help
32//config: Support long options for the ftpget/ftpput applet.
33 31
34//applet:IF_FTPGET(APPLET_ODDNAME(ftpget, ftpgetput, BB_DIR_USR_BIN, BB_SUID_DROP, ftpget)) 32//applet:IF_FTPGET(APPLET_ODDNAME(ftpget, ftpgetput, BB_DIR_USR_BIN, BB_SUID_DROP, ftpget))
35//applet:IF_FTPPUT(APPLET_ODDNAME(ftpput, ftpgetput, BB_DIR_USR_BIN, BB_SUID_DROP, ftpput)) 33//applet:IF_FTPPUT(APPLET_ODDNAME(ftpput, ftpgetput, BB_DIR_USR_BIN, BB_SUID_DROP, ftpput))
diff --git a/networking/httpd.c b/networking/httpd.c
index cfcd2a06e..39aad90a8 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -102,7 +102,7 @@
102//config: bool "httpd" 102//config: bool "httpd"
103//config: default y 103//config: default y
104//config: help 104//config: help
105//config: Serve web pages via an HTTP server. 105//config: HTTP server.
106//config: 106//config:
107//config:config FEATURE_HTTPD_RANGES 107//config:config FEATURE_HTTPD_RANGES
108//config: bool "Support 'Ranges:' header" 108//config: bool "Support 'Ranges:' header"
@@ -156,7 +156,7 @@
156//config: when specific URLs are requested. 156//config: when specific URLs are requested.
157//config: 157//config:
158//config:config FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR 158//config:config FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
159//config: bool "Support for running scripts through an interpreter" 159//config: bool "Support running scripts through an interpreter"
160//config: default y 160//config: default y
161//config: depends on FEATURE_HTTPD_CGI 161//config: depends on FEATURE_HTTPD_CGI
162//config: help 162//config: help
@@ -185,7 +185,7 @@
185//config: "&#60Hello&#32World&#62". 185//config: "&#60Hello&#32World&#62".
186//config: 186//config:
187//config:config FEATURE_HTTPD_ERROR_PAGES 187//config:config FEATURE_HTTPD_ERROR_PAGES
188//config: bool "Support for custom error pages" 188//config: bool "Support custom error pages"
189//config: default y 189//config: default y
190//config: depends on HTTPD 190//config: depends on HTTPD
191//config: help 191//config: help
@@ -198,7 +198,7 @@
198//config: message. 198//config: message.
199//config: 199//config:
200//config:config FEATURE_HTTPD_PROXY 200//config:config FEATURE_HTTPD_PROXY
201//config: bool "Support for reverse proxy" 201//config: bool "Support reverse proxy"
202//config: default y 202//config: default y
203//config: depends on HTTPD 203//config: depends on HTTPD
204//config: help 204//config: help
@@ -210,7 +210,7 @@
210//config: http://hostname[:port]/new/path/myfile. 210//config: http://hostname[:port]/new/path/myfile.
211//config: 211//config:
212//config:config FEATURE_HTTPD_GZIP 212//config:config FEATURE_HTTPD_GZIP
213//config: bool "Support for GZIP content encoding" 213//config: bool "Support GZIP content encoding"
214//config: default y 214//config: default y
215//config: depends on HTTPD 215//config: depends on HTTPD
216//config: help 216//config: help
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 1806a6ccc..78baa6690 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -66,14 +66,14 @@
66//config: utilities, or enable these applets in Busybox. 66//config: utilities, or enable these applets in Busybox.
67//config: 67//config:
68//config:config FEATURE_IFUPDOWN_IPV4 68//config:config FEATURE_IFUPDOWN_IPV4
69//config: bool "Support for IPv4" 69//config: bool "Support IPv4"
70//config: default y 70//config: default y
71//config: depends on IFUP || IFDOWN 71//config: depends on IFUP || IFDOWN
72//config: help 72//config: help
73//config: If you want ifup/ifdown to talk IPv4, leave this on. 73//config: If you want ifup/ifdown to talk IPv4, leave this on.
74//config: 74//config:
75//config:config FEATURE_IFUPDOWN_IPV6 75//config:config FEATURE_IFUPDOWN_IPV6
76//config: bool "Support for IPv6" 76//config: bool "Support IPv6"
77//config: default y 77//config: default y
78//config: depends on (IFUP || IFDOWN) && FEATURE_IPV6 78//config: depends on (IFUP || IFDOWN) && FEATURE_IPV6
79//config: help 79//config: help
@@ -81,7 +81,7 @@
81//config: 81//config:
82//UNUSED: 82//UNUSED:
83////////:config FEATURE_IFUPDOWN_IPX 83////////:config FEATURE_IFUPDOWN_IPX
84////////: bool "Support for IPX" 84////////: bool "Support IPX"
85////////: default y 85////////: default y
86////////: depends on IFUP || IFDOWN 86////////: depends on IFUP || IFDOWN
87////////: help 87////////: help
@@ -97,7 +97,7 @@
97//config: a weird network setup you don't need it. 97//config: a weird network setup you don't need it.
98//config: 98//config:
99//config:config FEATURE_IFUPDOWN_EXTERNAL_DHCP 99//config:config FEATURE_IFUPDOWN_EXTERNAL_DHCP
100//config: bool "Support for external dhcp clients" 100//config: bool "Support external DHCP clients"
101//config: default n 101//config: default n
102//config: depends on IFUP || IFDOWN 102//config: depends on IFUP || IFDOWN
103//config: help 103//config: help
diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index 21219424f..9359f9016 100644
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -18,6 +18,11 @@
18//config: ipcalc takes an IP address and netmask and calculates the 18//config: ipcalc takes an IP address and netmask and calculates the
19//config: resulting broadcast, network, and host range. 19//config: resulting broadcast, network, and host range.
20//config: 20//config:
21//config:config FEATURE_IPCALC_LONG_OPTIONS
22//config: bool "Enable long options"
23//config: default y
24//config: depends on IPCALC && LONG_OPTS
25//config:
21//config:config FEATURE_IPCALC_FANCY 26//config:config FEATURE_IPCALC_FANCY
22//config: bool "Fancy IPCALC, more options, adds 1 kbyte" 27//config: bool "Fancy IPCALC, more options, adds 1 kbyte"
23//config: default y 28//config: default y
@@ -25,13 +30,6 @@
25//config: help 30//config: help
26//config: Adds the options hostname, prefix and silent to the output of 31//config: Adds the options hostname, prefix and silent to the output of
27//config: "ipcalc". 32//config: "ipcalc".
28//config:
29//config:config FEATURE_IPCALC_LONG_OPTIONS
30//config: bool "Enable long options"
31//config: default y
32//config: depends on IPCALC && LONG_OPTS
33//config: help
34//config: Support long options for the ipcalc applet.
35 33
36//applet:IF_IPCALC(APPLET(ipcalc, BB_DIR_BIN, BB_SUID_DROP)) 34//applet:IF_IPCALC(APPLET(ipcalc, BB_DIR_BIN, BB_SUID_DROP))
37 35
diff --git a/networking/netstat.c b/networking/netstat.c
index 90da6cdb8..68e0c1a04 100644
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -21,7 +21,7 @@
21//config: netstat prints information about the Linux networking subsystem. 21//config: netstat prints information about the Linux networking subsystem.
22//config: 22//config:
23//config:config FEATURE_NETSTAT_WIDE 23//config:config FEATURE_NETSTAT_WIDE
24//config: bool "Enable wide netstat output" 24//config: bool "Enable wide output"
25//config: default y 25//config: default y
26//config: depends on NETSTAT 26//config: depends on NETSTAT
27//config: help 27//config: help
diff --git a/networking/tftp.c b/networking/tftp.c
index ed8672025..189364f0c 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -69,11 +69,9 @@
69//config: "blksize" and "tsize" options. 69//config: "blksize" and "tsize" options.
70//config: 70//config:
71//config:config FEATURE_TFTP_PROGRESS_BAR 71//config:config FEATURE_TFTP_PROGRESS_BAR
72//config: bool "Enable tftp progress meter" 72//config: bool "Enable progress bar"
73//config: default y 73//config: default y
74//config: depends on TFTP && FEATURE_TFTP_BLOCKSIZE 74//config: depends on TFTP && FEATURE_TFTP_BLOCKSIZE
75//config: help
76//config: Show progress bar.
77//config: 75//config:
78//config:config TFTP_DEBUG 76//config:config TFTP_DEBUG
79//config: bool "Enable debug" 77//config: bool "Enable debug"
diff --git a/networking/traceroute.c b/networking/traceroute.c
index a463b0faa..6817861ef 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -235,8 +235,6 @@
235//config: bool "Enable -I option (use ICMP instead of UDP)" 235//config: bool "Enable -I option (use ICMP instead of UDP)"
236//config: default y 236//config: default y
237//config: depends on TRACEROUTE || TRACEROUTE6 237//config: depends on TRACEROUTE || TRACEROUTE6
238//config: help
239//config: Add option -I to use ICMP ECHO instead of UDP datagrams.
240 238
241/* Needs socket(AF_INET, SOCK_RAW, IPPROTO_ICMP), therefore BB_SUID_MAYBE: */ 239/* Needs socket(AF_INET, SOCK_RAW, IPPROTO_ICMP), therefore BB_SUID_MAYBE: */
242//applet:IF_TRACEROUTE(APPLET(traceroute, BB_DIR_USR_BIN, BB_SUID_MAYBE)) 240//applet:IF_TRACEROUTE(APPLET(traceroute, BB_DIR_USR_BIN, BB_SUID_MAYBE))
diff --git a/networking/udhcp/Config.src b/networking/udhcp/Config.src
index 7bc13a719..5c068441a 100644
--- a/networking/udhcp/Config.src
+++ b/networking/udhcp/Config.src
@@ -123,7 +123,7 @@ config UDHCP_DEBUG
123 are very verbose and useful for debugging only. 123 are very verbose and useful for debugging only.
124 124
125config FEATURE_UDHCP_RFC3397 125config FEATURE_UDHCP_RFC3397
126 bool "Support for RFC3397 domain search (experimental)" 126 bool "Support RFC3397 domain search (experimental)"
127 default y 127 default y
128 depends on UDHCPD || UDHCPC 128 depends on UDHCPD || UDHCPC
129 help 129 help
@@ -132,7 +132,7 @@ config FEATURE_UDHCP_RFC3397
132 and SIP servers option 120, specified in RFC 3361. 132 and SIP servers option 120, specified in RFC 3361.
133 133
134config FEATURE_UDHCP_8021Q 134config FEATURE_UDHCP_8021Q
135 bool "Support for 802.1Q VLAN parameters" 135 bool "Support 802.1Q VLAN parameters"
136 default y 136 default y
137 depends on UDHCPD || UDHCPC 137 depends on UDHCPD || UDHCPC
138 help 138 help
diff --git a/networking/wget.c b/networking/wget.c
index b082a0f59..c82086878 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -16,12 +16,15 @@
16//config: wget is a utility for non-interactive download of files from HTTP 16//config: wget is a utility for non-interactive download of files from HTTP
17//config: and FTP servers. 17//config: and FTP servers.
18//config: 18//config:
19//config:config FEATURE_WGET_LONG_OPTIONS
20//config: bool "Enable long options"
21//config: default y
22//config: depends on WGET && LONG_OPTS
23//config:
19//config:config FEATURE_WGET_STATUSBAR 24//config:config FEATURE_WGET_STATUSBAR
20//config: bool "Enable a nifty process meter (+2k)" 25//config: bool "Enable progress bar (+2k)"
21//config: default y 26//config: default y
22//config: depends on WGET 27//config: depends on WGET
23//config: help
24//config: Enable the transfer progress bar for wget transfers.
25//config: 28//config:
26//config:config FEATURE_WGET_AUTHENTICATION 29//config:config FEATURE_WGET_AUTHENTICATION
27//config: bool "Enable HTTP authentication" 30//config: bool "Enable HTTP authentication"
@@ -30,13 +33,6 @@
30//config: help 33//config: help
31//config: Support authenticated HTTP transfers. 34//config: Support authenticated HTTP transfers.
32//config: 35//config:
33//config:config FEATURE_WGET_LONG_OPTIONS
34//config: bool "Enable long options"
35//config: default y
36//config: depends on WGET && LONG_OPTS
37//config: help
38//config: Support long options for the wget applet.
39//config:
40//config:config FEATURE_WGET_TIMEOUT 36//config:config FEATURE_WGET_TIMEOUT
41//config: bool "Enable timeout option -T SEC" 37//config: bool "Enable timeout option -T SEC"
42//config: default y 38//config: default y
diff --git a/procps/Config.src b/procps/Config.src
index eb4760752..35fef2eda 100644
--- a/procps/Config.src
+++ b/procps/Config.src
@@ -8,7 +8,7 @@ menu "Process Utilities"
8INSERT 8INSERT
9 9
10config FEATURE_SHOW_THREADS 10config FEATURE_SHOW_THREADS
11 bool "Support for showing threads in ps/pstree/top" 11 bool "Support thread display in ps/pstree/top"
12 default y 12 default y
13 depends on PS || TOP || PSTREE 13 depends on PS || TOP || PSTREE
14 help 14 help
diff --git a/procps/pidof.c b/procps/pidof.c
index 069adb7a4..b64f0cbd6 100644
--- a/procps/pidof.c
+++ b/procps/pidof.c
@@ -14,18 +14,18 @@
14//config: those id's on the standard output. 14//config: those id's on the standard output.
15//config: 15//config:
16//config:config FEATURE_PIDOF_SINGLE 16//config:config FEATURE_PIDOF_SINGLE
17//config: bool "Enable argument for single shot (-s)" 17//config: bool "Enable single shot (-s)"
18//config: default y 18//config: default y
19//config: depends on PIDOF 19//config: depends on PIDOF
20//config: help 20//config: help
21//config: Support argument '-s' for returning only the first pid found. 21//config: Support '-s' for returning only the first pid found.
22//config: 22//config:
23//config:config FEATURE_PIDOF_OMIT 23//config:config FEATURE_PIDOF_OMIT
24//config: bool "Enable argument for omitting pids (-o)" 24//config: bool "Enable omitting pids (-o PID)"
25//config: default y 25//config: default y
26//config: depends on PIDOF 26//config: depends on PIDOF
27//config: help 27//config: help
28//config: Support argument '-o' for omitting the given pids in output. 28//config: Support '-o PID' for omitting the given pid(s) in output.
29//config: The special pid %PPID can be used to name the parent process 29//config: The special pid %PPID can be used to name the parent process
30//config: of the pidof, in other words the calling shell or shell script. 30//config: of the pidof, in other words the calling shell or shell script.
31 31
diff --git a/procps/ps.c b/procps/ps.c
index e291ecd7e..1d380590d 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -32,19 +32,10 @@
32//config: Adds fields PPID, RSS, START, TIME & TTY 32//config: Adds fields PPID, RSS, START, TIME & TTY
33//config: 33//config:
34//config:config FEATURE_PS_TIME 34//config:config FEATURE_PS_TIME
35//config: bool "Enable time and elapsed time output" 35//config: bool "Support -o time and -o etime output specifiers"
36//config: default y 36//config: default y
37//config: depends on PS && DESKTOP 37//config: depends on PS && DESKTOP
38//config: select PLATFORM_LINUX 38//config: select PLATFORM_LINUX
39//config: help
40//config: Support -o time and -o etime output specifiers.
41//config:
42//config:config FEATURE_PS_ADDITIONAL_COLUMNS
43//config: bool "Enable additional ps columns"
44//config: default y
45//config: depends on PS && DESKTOP
46//config: help
47//config: Support -o rgroup, -o ruser, -o nice output specifiers.
48//config: 39//config:
49//config:config FEATURE_PS_UNUSUAL_SYSTEMS 40//config:config FEATURE_PS_UNUSUAL_SYSTEMS
50//config: bool "Support Linux prior to 2.4.0 and non-ELF systems" 41//config: bool "Support Linux prior to 2.4.0 and non-ELF systems"
@@ -53,6 +44,11 @@
53//config: help 44//config: help
54//config: Include support for measuring HZ on old kernels and non-ELF systems 45//config: Include support for measuring HZ on old kernels and non-ELF systems
55//config: (if you are on Linux 2.4.0+ and use ELF, you don't need this) 46//config: (if you are on Linux 2.4.0+ and use ELF, you don't need this)
47//config:
48//config:config FEATURE_PS_ADDITIONAL_COLUMNS
49//config: bool "Support -o rgroup, -o ruser, -o nice specifiers"
50//config: default y
51//config: depends on PS && DESKTOP
56 52
57//applet:IF_PS(APPLET(ps, BB_DIR_BIN, BB_SUID_DROP)) 53//applet:IF_PS(APPLET(ps, BB_DIR_BIN, BB_SUID_DROP))
58 54
diff --git a/procps/uptime.c b/procps/uptime.c
index 436193925..8e8956c0f 100644
--- a/procps/uptime.c
+++ b/procps/uptime.c
@@ -21,11 +21,11 @@
21//config: on, and the system load averages for the past 1, 5, and 15 minutes. 21//config: on, and the system load averages for the past 1, 5, and 15 minutes.
22//config: 22//config:
23//config:config FEATURE_UPTIME_UTMP_SUPPORT 23//config:config FEATURE_UPTIME_UTMP_SUPPORT
24//config: bool "Support for showing the number of users" 24//config: bool "Show the number of users"
25//config: default y 25//config: default y
26//config: depends on UPTIME && FEATURE_UTMP 26//config: depends on UPTIME && FEATURE_UTMP
27//config: help 27//config: help
28//config: Makes uptime display the number of users currently logged on. 28//config: Display the number of users currently logged on.
29 29
30//applet:IF_UPTIME(APPLET(uptime, BB_DIR_USR_BIN, BB_SUID_DROP)) 30//applet:IF_UPTIME(APPLET(uptime, BB_DIR_USR_BIN, BB_SUID_DROP))
31 31
diff --git a/selinux/chcon.c b/selinux/chcon.c
index c743013ce..4a9a4d3d5 100644
--- a/selinux/chcon.c
+++ b/selinux/chcon.c
@@ -18,8 +18,6 @@
18//config: bool "Enable long options" 18//config: bool "Enable long options"
19//config: default y 19//config: default y
20//config: depends on CHCON && LONG_OPTS 20//config: depends on CHCON && LONG_OPTS
21//config: help
22//config: Support long options for the chcon applet.
23 21
24//applet:IF_CHCON(APPLET(chcon, BB_DIR_USR_BIN, BB_SUID_DROP)) 22//applet:IF_CHCON(APPLET(chcon, BB_DIR_USR_BIN, BB_SUID_DROP))
25 23
diff --git a/selinux/runcon.c b/selinux/runcon.c
index 16f171101..a30e3552f 100644
--- a/selinux/runcon.c
+++ b/selinux/runcon.c
@@ -39,8 +39,6 @@
39//config: bool "Enable long options" 39//config: bool "Enable long options"
40//config: default y 40//config: default y
41//config: depends on RUNCON && LONG_OPTS 41//config: depends on RUNCON && LONG_OPTS
42//config: help
43//config: Support long options for the runcon applet.
44 42
45//applet:IF_RUNCON(APPLET(runcon, BB_DIR_USR_BIN, BB_SUID_DROP)) 43//applet:IF_RUNCON(APPLET(runcon, BB_DIR_USR_BIN, BB_SUID_DROP))
46 44
diff --git a/shell/ash.c b/shell/ash.c
index 9c46a93e0..20ed9652c 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -35,8 +35,6 @@
35//config: bool "Optimize for size instead of speed" 35//config: bool "Optimize for size instead of speed"
36//config: default y 36//config: default y
37//config: depends on ASH || SH_IS_ASH || BASH_IS_ASH 37//config: depends on ASH || SH_IS_ASH || BASH_IS_ASH
38//config: help
39//config: Compile ash for reduced size at the price of speed.
40//config: 38//config:
41//config:config ASH_INTERNAL_GLOB 39//config:config ASH_INTERNAL_GLOB
42//config: bool "Use internal glob() implementation" 40//config: bool "Use internal glob() implementation"
@@ -46,6 +44,23 @@
46//config: Do not use glob() function from libc, use internal implementation. 44//config: Do not use glob() function from libc, use internal implementation.
47//config: Use this if you are getting "glob.h: No such file or directory" 45//config: Use this if you are getting "glob.h: No such file or directory"
48//config: or similar build errors. 46//config: or similar build errors.
47//config: Note that as of now (2017-01), uclibc and musl glob() both have bugs
48//config: which would break ash if you select N here.
49//config:
50//config:config ASH_BASH_COMPAT
51//config: bool "bash-compatible extensions"
52//config: default y
53//config: depends on ASH || SH_IS_ASH || BASH_IS_ASH
54//config:
55//config:config ASH_JOB_CONTROL
56//config: bool "Job control"
57//config: default y
58//config: depends on ASH || SH_IS_ASH || BASH_IS_ASH
59//config:
60//config:config ASH_ALIAS
61//config: bool "Alias support"
62//config: default y
63//config: depends on ASH || SH_IS_ASH || BASH_IS_ASH
49//config: 64//config:
50//config:config ASH_RANDOM_SUPPORT 65//config:config ASH_RANDOM_SUPPORT
51//config: bool "Pseudorandom generator and $RANDOM variable" 66//config: bool "Pseudorandom generator and $RANDOM variable"
@@ -63,88 +78,60 @@
63//config: default y 78//config: default y
64//config: depends on ASH || SH_IS_ASH || BASH_IS_ASH 79//config: depends on ASH || SH_IS_ASH || BASH_IS_ASH
65//config: help 80//config: help
66//config: "PS#" may contain volatile content, such as backquote commands. 81//config: $PS# may contain volatile content, such as backquote commands.
67//config: This option recreates the prompt string from the environment 82//config: This option recreates the prompt string from the environment
68//config: variable each time it is displayed. 83//config: variable each time it is displayed.
69//config: 84//config:
70//config:config ASH_BASH_COMPAT
71//config: bool "bash-compatible extensions"
72//config: default y
73//config: depends on ASH || SH_IS_ASH || BASH_IS_ASH
74//config: help
75//config: Enable bash-compatible extensions.
76//config:
77//config:config ASH_IDLE_TIMEOUT 85//config:config ASH_IDLE_TIMEOUT
78//config: bool "Idle timeout variable" 86//config: bool "Idle timeout variable $TMOUT"
79//config: default n
80//config: depends on ASH || SH_IS_ASH || BASH_IS_ASH
81//config: help
82//config: Enables bash-like auto-logout after $TMOUT seconds of idle time.
83//config:
84//config:config ASH_JOB_CONTROL
85//config: bool "Job control"
86//config: default y
87//config: depends on ASH || SH_IS_ASH || BASH_IS_ASH
88//config: help
89//config: Enable job control in the ash shell.
90//config:
91//config:config ASH_ALIAS
92//config: bool "Alias support"
93//config: default y 87//config: default y
94//config: depends on ASH || SH_IS_ASH || BASH_IS_ASH 88//config: depends on ASH || SH_IS_ASH || BASH_IS_ASH
95//config: help 89//config: help
96//config: Enable alias support in the ash shell. 90//config: Enable bash-like auto-logout after $TMOUT seconds of idle time.
97//config: 91//config:
98//config:config ASH_GETOPTS 92//config:config ASH_MAIL
99//config: bool "Builtin getopt to parse positional parameters" 93//config: bool "Check for new mail in interactive shell"
100//config: default y 94//config: default y
101//config: depends on ASH || SH_IS_ASH || BASH_IS_ASH 95//config: depends on ASH || SH_IS_ASH || BASH_IS_ASH
102//config: help 96//config: help
103//config: Enable support for getopts builtin in ash. 97//config: Enable "check for new mail" function:
98//config: if set, $MAIL file and $MAILPATH list of files
99//config: are checked for mtime changes, and "you have mail"
100//config: message is printed if change is detected.
104//config: 101//config:
105//config:config ASH_BUILTIN_ECHO 102//config:config ASH_BUILTIN_ECHO
106//config: bool "Builtin version of 'echo'" 103//config: bool "echo builtin"
107//config: default y 104//config: default y
108//config: depends on ASH || SH_IS_ASH || BASH_IS_ASH 105//config: depends on ASH || SH_IS_ASH || BASH_IS_ASH
109//config: help
110//config: Enable support for echo builtin in ash.
111//config: 106//config:
112//config:config ASH_BUILTIN_PRINTF 107//config:config ASH_BUILTIN_PRINTF
113//config: bool "Builtin version of 'printf'" 108//config: bool "printf builtin"
114//config: default y 109//config: default y
115//config: depends on ASH || SH_IS_ASH || BASH_IS_ASH 110//config: depends on ASH || SH_IS_ASH || BASH_IS_ASH
116//config: help
117//config: Enable support for printf builtin in ash.
118//config: 111//config:
119//config:config ASH_BUILTIN_TEST 112//config:config ASH_BUILTIN_TEST
120//config: bool "Builtin version of 'test'" 113//config: bool "test builtin"
121//config: default y 114//config: default y
122//config: depends on ASH || SH_IS_ASH || BASH_IS_ASH 115//config: depends on ASH || SH_IS_ASH || BASH_IS_ASH
123//config: help
124//config: Enable support for test builtin in ash.
125//config: 116//config:
126//config:config ASH_HELP 117//config:config ASH_HELP
127//config: bool "help builtin" 118//config: bool "help builtin"
128//config: default y 119//config: default y
129//config: depends on ASH || SH_IS_ASH || BASH_IS_ASH 120//config: depends on ASH || SH_IS_ASH || BASH_IS_ASH
130//config: help
131//config: Enable help builtin in ash.
132//config: 121//config:
133//config:config ASH_CMDCMD 122//config:config ASH_GETOPTS
134//config: bool "'command' command to override shell builtins" 123//config: bool "getopts builtin"
135//config: default y 124//config: default y
136//config: depends on ASH || SH_IS_ASH || BASH_IS_ASH 125//config: depends on ASH || SH_IS_ASH || BASH_IS_ASH
137//config: help
138//config: Enable support for the ash 'command' builtin, which allows
139//config: you to run the specified command with the specified arguments,
140//config: even when there is an ash builtin command with the same name.
141//config: 126//config:
142//config:config ASH_MAIL 127//config:config ASH_CMDCMD
143//config: bool "Check for new mail on interactive shells" 128//config: bool "command builtin"
144//config: default y 129//config: default y
145//config: depends on ASH || SH_IS_ASH || BASH_IS_ASH 130//config: depends on ASH || SH_IS_ASH || BASH_IS_ASH
146//config: help 131//config: help
147//config: Enable "check for new mail" function in the ash shell. 132//config: Enable support for the 'command' builtin, which allows
133//config: you to run the specified command or builtin,
134//config: even when there is a function with the same name.
148//config: 135//config:
149//config:endif # ash options 136//config:endif # ash options
150 137
diff --git a/shell/hush.c b/shell/hush.c
index 22d71cb07..9e508fc6d 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -99,8 +99,6 @@
99//config: bool "bash-compatible extensions" 99//config: bool "bash-compatible extensions"
100//config: default y 100//config: default y
101//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH 101//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
102//config: help
103//config: Enable bash-compatible extensions.
104//config: 102//config:
105//config:config HUSH_BRACE_EXPANSION 103//config:config HUSH_BRACE_EXPANSION
106//config: bool "Brace expansion" 104//config: bool "Brace expansion"
@@ -123,8 +121,6 @@
123//config: bool "Save command history to .hush_history" 121//config: bool "Save command history to .hush_history"
124//config: default y 122//config: default y
125//config: depends on HUSH_INTERACTIVE && FEATURE_EDITING_SAVEHISTORY 123//config: depends on HUSH_INTERACTIVE && FEATURE_EDITING_SAVEHISTORY
126//config: help
127//config: Enable history saving in hush.
128//config: 124//config:
129//config:config HUSH_JOB 125//config:config HUSH_JOB
130//config: bool "Job control" 126//config: bool "Job control"
@@ -138,39 +134,35 @@
138//config: but no separate process group is formed. 134//config: but no separate process group is formed.
139//config: 135//config:
140//config:config HUSH_TICK 136//config:config HUSH_TICK
141//config: bool "Process substitution" 137//config: bool "Support process substitution"
142//config: default y 138//config: default y
143//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH 139//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
144//config: help 140//config: help
145//config: Enable process substitution `command` and $(command) in hush. 141//config: Enable `command` and $(command).
146//config: 142//config:
147//config:config HUSH_IF 143//config:config HUSH_IF
148//config: bool "Support if/then/elif/else/fi" 144//config: bool "Support if/then/elif/else/fi"
149//config: default y 145//config: default y
150//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH 146//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
151//config: help
152//config: Enable if/then/elif/else/fi in hush.
153//config: 147//config:
154//config:config HUSH_LOOPS 148//config:config HUSH_LOOPS
155//config: bool "Support for, while and until loops" 149//config: bool "Support for, while and until loops"
156//config: default y 150//config: default y
157//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH 151//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
158//config: help
159//config: Enable for, while and until loops in hush.
160//config: 152//config:
161//config:config HUSH_CASE 153//config:config HUSH_CASE
162//config: bool "Support case ... esac statement" 154//config: bool "Support case ... esac statement"
163//config: default y 155//config: default y
164//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH 156//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
165//config: help 157//config: help
166//config: Enable case ... esac statement in hush. +400 bytes. 158//config: Enable case ... esac statement. +400 bytes.
167//config: 159//config:
168//config:config HUSH_FUNCTIONS 160//config:config HUSH_FUNCTIONS
169//config: bool "Support funcname() { commands; } syntax" 161//config: bool "Support funcname() { commands; } syntax"
170//config: default y 162//config: default y
171//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH 163//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
172//config: help 164//config: help
173//config: Enable support for shell functions in hush. +800 bytes. 165//config: Enable support for shell functions. +800 bytes.
174//config: 166//config:
175//config:config HUSH_LOCAL 167//config:config HUSH_LOCAL
176//config: bool "local builtin" 168//config: bool "local builtin"
@@ -199,22 +191,21 @@
199//config: bool "echo builtin" 191//config: bool "echo builtin"
200//config: default y 192//config: default y
201//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH 193//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
202//config: help
203//config: Enable echo builtin in hush.
204//config: 194//config:
205//config:config HUSH_PRINTF 195//config:config HUSH_PRINTF
206//config: bool "printf builtin" 196//config: bool "printf builtin"
207//config: default y 197//config: default y
208//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH 198//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
209//config: help 199//config:
210//config: Enable printf builtin in hush. 200//config:config HUSH_HELP
201//config: bool "help builtin"
202//config: default y
203//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
211//config: 204//config:
212//config:config HUSH_EXPORT 205//config:config HUSH_EXPORT
213//config: bool "export builtin" 206//config: bool "export builtin"
214//config: default y 207//config: default y
215//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH 208//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
216//config: help
217//config: Enable export builtin in hush.
218//config: 209//config:
219//config:config HUSH_EXPORT_N 210//config:config HUSH_EXPORT_N
220//config: bool "Support 'export -n' option" 211//config: bool "Support 'export -n' option"
@@ -223,82 +214,55 @@
223//config: help 214//config: help
224//config: export -n unexports variables. It is a bash extension. 215//config: export -n unexports variables. It is a bash extension.
225//config: 216//config:
226//config:config HUSH_HELP
227//config: bool "help builtin"
228//config: default y
229//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
230//config: help
231//config: Enable help builtin in hush. Code size + ~1 kbyte.
232//config:
233//config:config HUSH_KILL 217//config:config HUSH_KILL
234//config: bool "kill builtin (for kill %jobspec)" 218//config: bool "kill builtin (supports kill %jobspec)"
235//config: default y 219//config: default y
236//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH 220//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
237//config: help
238//config: Enable kill builtin in hush.
239//config: 221//config:
240//config:config HUSH_WAIT 222//config:config HUSH_WAIT
241//config: bool "wait builtin" 223//config: bool "wait builtin"
242//config: default y 224//config: default y
243//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH 225//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
244//config: help
245//config: Enable wait builtin in hush.
246//config: 226//config:
247//config:config HUSH_TRAP 227//config:config HUSH_TRAP
248//config: bool "trap builtin" 228//config: bool "trap builtin"
249//config: default y 229//config: default y
250//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH 230//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
251//config: help
252//config: Enable trap builtin in hush.
253//config:
254//config:config HUSH_ULIMIT
255//config: bool "ulimit builtin"
256//config: default y
257//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
258//config: help
259//config: Enable ulimit builtin in hush.
260//config: 231//config:
261//config:config HUSH_TYPE 232//config:config HUSH_TYPE
262//config: bool "type builtin" 233//config: bool "type builtin"
263//config: default y 234//config: default y
264//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH 235//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
265//config: help
266//config: Enable type builtin in hush.
267//config: 236//config:
268//config:config HUSH_READ 237//config:config HUSH_READ
269//config: bool "read builtin" 238//config: bool "read builtin"
270//config: default y 239//config: default y
271//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH 240//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
272//config: help
273//config: Enable read builtin in hush.
274//config: 241//config:
275//config:config HUSH_SET 242//config:config HUSH_SET
276//config: bool "set builtin" 243//config: bool "set builtin"
277//config: default y 244//config: default y
278//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH 245//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
279//config: help
280//config: Enable set builtin in hush.
281//config: 246//config:
282//config:config HUSH_UNSET 247//config:config HUSH_UNSET
283//config: bool "unset builtin" 248//config: bool "unset builtin"
284//config: default y 249//config: default y
285//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH 250//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
286//config: help 251//config:
287//config: Enable unset builtin in hush. 252//config:config HUSH_ULIMIT
253//config: bool "ulimit builtin"
254//config: default y
255//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
288//config: 256//config:
289//config:config HUSH_UMASK 257//config:config HUSH_UMASK
290//config: bool "umask builtin" 258//config: bool "umask builtin"
291//config: default y 259//config: default y
292//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH 260//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
293//config: help
294//config: Enable umask builtin in hush.
295//config: 261//config:
296//config:config HUSH_MEMLEAK 262//config:config HUSH_MEMLEAK
297//config: bool "memleak builtin (debugging)" 263//config: bool "memleak builtin (debugging)"
298//config: default n 264//config: default n
299//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH 265//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
300//config: help
301//config: Enable memleak builtin in hush.
302//config: 266//config:
303//config:config MSH 267//config:config MSH
304//config: bool "msh (deprecated: aliased to hush)" 268//config: bool "msh (deprecated: aliased to hush)"
@@ -1096,8 +1060,6 @@ static const struct built_in_command bltins1[] = {
1096 BLTIN("wait" , builtin_wait , "Wait for process"), 1060 BLTIN("wait" , builtin_wait , "Wait for process"),
1097#endif 1061#endif
1098}; 1062};
1099/* For now, echo and test are unconditionally enabled.
1100 * Maybe make it configurable? */
1101static const struct built_in_command bltins2[] = { 1063static const struct built_in_command bltins2[] = {
1102 BLTIN("[" , builtin_test , NULL), 1064 BLTIN("[" , builtin_test , NULL),
1103#if ENABLE_HUSH_ECHO 1065#if ENABLE_HUSH_ECHO
diff --git a/util-linux/Config.src b/util-linux/Config.src
index 3c522f948..0971d714a 100644
--- a/util-linux/Config.src
+++ b/util-linux/Config.src
@@ -40,7 +40,7 @@ config FEATURE_MOUNT_LOOP_CREATE
40 if it does not find a free one. 40 if it does not find a free one.
41 41
42config FEATURE_MTAB_SUPPORT 42config FEATURE_MTAB_SUPPORT
43 bool "Support for the old /etc/mtab file" 43 bool "Support old /etc/mtab file"
44 default n 44 default n
45 depends on MOUNT || UMOUNT 45 depends on MOUNT || UMOUNT
46 select FEATURE_MOUNT_FAKE 46 select FEATURE_MOUNT_FAKE
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index b7b2c6924..c3574f8f5 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -22,7 +22,7 @@
22//config: wish to enable the 'dmesg' utility. 22//config: wish to enable the 'dmesg' utility.
23//config: 23//config:
24//config:config FEATURE_DMESG_PRETTY 24//config:config FEATURE_DMESG_PRETTY
25//config: bool "Pretty dmesg output" 25//config: bool "Pretty output"
26//config: default y 26//config: default y
27//config: depends on DMESG 27//config: depends on DMESG
28//config: help 28//config: help
diff --git a/util-linux/fbset.c b/util-linux/fbset.c
index 8a78c1ef9..673bf9aa4 100644
--- a/util-linux/fbset.c
+++ b/util-linux/fbset.c
@@ -22,7 +22,7 @@
22//config: if you wish to enable the 'fbset' utility. 22//config: if you wish to enable the 'fbset' utility.
23//config: 23//config:
24//config:config FEATURE_FBSET_FANCY 24//config:config FEATURE_FBSET_FANCY
25//config: bool "Turn on extra fbset options" 25//config: bool "Enable extra options"
26//config: default y 26//config: default y
27//config: depends on FBSET 27//config: depends on FBSET
28//config: help 28//config: help
@@ -32,7 +32,7 @@
32//config: options. 32//config: options.
33//config: 33//config:
34//config:config FEATURE_FBSET_READMODE 34//config:config FEATURE_FBSET_READMODE
35//config: bool "Turn on fbset readmode support" 35//config: bool "Enable readmode support"
36//config: default y 36//config: default y
37//config: depends on FBSET 37//config: depends on FBSET
38//config: help 38//config: help
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index b988e65a9..54f37baa6 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -21,8 +21,6 @@
21//config: default y 21//config: default y
22//config: depends on FDISK 22//config: depends on FDISK
23//config: depends on !LFS # with LFS no special code is needed 23//config: depends on !LFS # with LFS no special code is needed
24//config: help
25//config: Enable this option to support large disks > 4GB.
26//config: 24//config:
27//config:config FEATURE_FDISK_WRITABLE 25//config:config FEATURE_FDISK_WRITABLE
28//config: bool "Write support" 26//config: bool "Write support"
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index 084a7f1e9..d65011a71 100644
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -20,10 +20,6 @@
20//config: bool "Support long options (--hctosys,...)" 20//config: bool "Support long options (--hctosys,...)"
21//config: default y 21//config: default y
22//config: depends on HWCLOCK && LONG_OPTS 22//config: depends on HWCLOCK && LONG_OPTS
23//config: help
24//config: By default, the hwclock utility only uses short options. If you
25//config: are overly fond of its long options, such as --hctosys, --utc, etc)
26//config: then enable this option.
27//config: 23//config:
28//config:config FEATURE_HWCLOCK_ADJTIME_FHS 24//config:config FEATURE_HWCLOCK_ADJTIME_FHS
29//config: bool "Use FHS /var/lib/hwclock/adjtime" 25//config: bool "Use FHS /var/lib/hwclock/adjtime"
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 42962b859..4f5dced10 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -90,7 +90,7 @@
90//config: 90//config:
91//config:config FEATURE_MOUNT_FLAGS 91//config:config FEATURE_MOUNT_FLAGS
92//config: depends on MOUNT 92//config: depends on MOUNT
93//config: bool "Support lots of -o flags in mount" 93//config: bool "Support lots of -o flags"
94//config: default y 94//config: default y
95//config: help 95//config: help
96//config: Without this, mount only supports ro/rw/remount. With this, it 96//config: Without this, mount only supports ro/rw/remount. With this, it
diff --git a/util-linux/volume_id/bcache.c b/util-linux/volume_id/bcache.c
index fd40eb081..334a341c3 100644
--- a/util-linux/volume_id/bcache.c
+++ b/util-linux/volume_id/bcache.c
@@ -10,14 +10,10 @@
10 10
11//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_BCACHE) += bcache.o 11//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_BCACHE) += bcache.o
12 12
13//config:
14//config:config FEATURE_VOLUMEID_BCACHE 13//config:config FEATURE_VOLUMEID_BCACHE
15//config: bool "bcache filesystem" 14//config: bool "bcache filesystem"
16//config: default y 15//config: default y
17//config: depends on VOLUMEID 16//config: depends on VOLUMEID
18//config: help
19//config: TODO
20//config:
21 17
22#include "volume_id_internal.h" 18#include "volume_id_internal.h"
23 19
diff --git a/util-linux/volume_id/btrfs.c b/util-linux/volume_id/btrfs.c
index e4dddf26d..338a48762 100644
--- a/util-linux/volume_id/btrfs.c
+++ b/util-linux/volume_id/btrfs.c
@@ -21,14 +21,10 @@
21 21
22//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_BTRFS) += btrfs.o 22//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_BTRFS) += btrfs.o
23 23
24//config:
25//config:config FEATURE_VOLUMEID_BTRFS 24//config:config FEATURE_VOLUMEID_BTRFS
26//config: bool "btrfs filesystem" 25//config: bool "btrfs filesystem"
27//config: default y 26//config: default y
28//config: depends on VOLUMEID 27//config: depends on VOLUMEID
29//config: help
30//config: TODO
31//config:
32 28
33#include "volume_id_internal.h" 29#include "volume_id_internal.h"
34 30
diff --git a/util-linux/volume_id/cramfs.c b/util-linux/volume_id/cramfs.c
index aeb7f20ac..c63223e2b 100644
--- a/util-linux/volume_id/cramfs.c
+++ b/util-linux/volume_id/cramfs.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_CRAMFS) += cramfs.o 21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_CRAMFS) += cramfs.o
22 22
23//config:
24//config:config FEATURE_VOLUMEID_CRAMFS 23//config:config FEATURE_VOLUMEID_CRAMFS
25//config: bool "cramfs filesystem" 24//config: bool "cramfs filesystem"
26//config: default y 25//config: default y
27//config: depends on VOLUMEID 26//config: depends on VOLUMEID
28//config: help
29//config: TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33 29
diff --git a/util-linux/volume_id/exfat.c b/util-linux/volume_id/exfat.c
index c3aa36804..7ed13a70e 100644
--- a/util-linux/volume_id/exfat.c
+++ b/util-linux/volume_id/exfat.c
@@ -20,7 +20,6 @@
20 20
21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXFAT) += exfat.o 21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXFAT) += exfat.o
22 22
23//config:
24//config:config FEATURE_VOLUMEID_EXFAT 23//config:config FEATURE_VOLUMEID_EXFAT
25//config: bool "exFAT filesystem" 24//config: bool "exFAT filesystem"
26//config: default y 25//config: default y
@@ -29,7 +28,6 @@
29//config: exFAT (extended FAT) is a proprietary file system designed especially 28//config: exFAT (extended FAT) is a proprietary file system designed especially
30//config: for flash drives. It has many features from NTFS, but with less 29//config: for flash drives. It has many features from NTFS, but with less
31//config: overhead. exFAT is used on most SDXC cards for consumer electronics. 30//config: overhead. exFAT is used on most SDXC cards for consumer electronics.
32//config:
33 31
34#include "volume_id_internal.h" 32#include "volume_id_internal.h"
35 33
diff --git a/util-linux/volume_id/ext.c b/util-linux/volume_id/ext.c
index df39d9342..473b3229a 100644
--- a/util-linux/volume_id/ext.c
+++ b/util-linux/volume_id/ext.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXT) += ext.o 21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXT) += ext.o
22 22
23//config:
24//config:config FEATURE_VOLUMEID_EXT 23//config:config FEATURE_VOLUMEID_EXT
25//config: bool "Ext filesystem" 24//config: bool "Ext filesystem"
26//config: default y 25//config: default y
27//config: depends on VOLUMEID 26//config: depends on VOLUMEID
28//config: help
29//config: TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33#include "bb_e2fs_defs.h" 29#include "bb_e2fs_defs.h"
diff --git a/util-linux/volume_id/f2fs.c b/util-linux/volume_id/f2fs.c
index bf0b66278..1d3bdae36 100644
--- a/util-linux/volume_id/f2fs.c
+++ b/util-linux/volume_id/f2fs.c
@@ -8,7 +8,6 @@
8 8
9//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_F2FS) += f2fs.o 9//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_F2FS) += f2fs.o
10 10
11//config:
12//config:config FEATURE_VOLUMEID_F2FS 11//config:config FEATURE_VOLUMEID_F2FS
13//config: bool "f2fs filesystem" 12//config: bool "f2fs filesystem"
14//config: default y 13//config: default y
@@ -18,7 +17,6 @@
18//config: which is adapted to newer forms of storage. F2FS also remedies some 17//config: which is adapted to newer forms of storage. F2FS also remedies some
19//config: known issues of the older log structured file systems, such as high 18//config: known issues of the older log structured file systems, such as high
20//config: cleaning overhead. 19//config: cleaning overhead.
21//config:
22 20
23#include "volume_id_internal.h" 21#include "volume_id_internal.h"
24 22
diff --git a/util-linux/volume_id/fat.c b/util-linux/volume_id/fat.c
index 476d500a6..bc3433daf 100644
--- a/util-linux/volume_id/fat.c
+++ b/util-linux/volume_id/fat.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_FAT) += fat.o 21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_FAT) += fat.o
22 22
23//config:
24//config:config FEATURE_VOLUMEID_FAT 23//config:config FEATURE_VOLUMEID_FAT
25//config: bool "fat filesystem" 24//config: bool "fat filesystem"
26//config: default y 25//config: default y
27//config: depends on VOLUMEID 26//config: depends on VOLUMEID
28//config: help
29//config: TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33 29
diff --git a/util-linux/volume_id/hfs.c b/util-linux/volume_id/hfs.c
index 8d34aaf68..78dae0790 100644
--- a/util-linux/volume_id/hfs.c
+++ b/util-linux/volume_id/hfs.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_HFS) += hfs.o 21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_HFS) += hfs.o
22 22
23//config:
24//config:config FEATURE_VOLUMEID_HFS 23//config:config FEATURE_VOLUMEID_HFS
25//config: bool "hfs filesystem" 24//config: bool "hfs filesystem"
26//config: default y 25//config: default y
27//config: depends on VOLUMEID 26//config: depends on VOLUMEID
28//config: help
29//config: TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33 29
diff --git a/util-linux/volume_id/iso9660.c b/util-linux/volume_id/iso9660.c
index 3848de453..23072f87c 100644
--- a/util-linux/volume_id/iso9660.c
+++ b/util-linux/volume_id/iso9660.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ISO9660) += iso9660.o 21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ISO9660) += iso9660.o
22 22
23//config:
24//config:config FEATURE_VOLUMEID_ISO9660 23//config:config FEATURE_VOLUMEID_ISO9660
25//config: bool "iso9660 filesystem" 24//config: bool "iso9660 filesystem"
26//config: default y 25//config: default y
27//config: depends on VOLUMEID 26//config: depends on VOLUMEID
28//config: help
29//config: TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33 29
diff --git a/util-linux/volume_id/jfs.c b/util-linux/volume_id/jfs.c
index a6eaff45b..543d90fe5 100644
--- a/util-linux/volume_id/jfs.c
+++ b/util-linux/volume_id/jfs.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_JFS) += jfs.o 21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_JFS) += jfs.o
22 22
23//config:
24//config:config FEATURE_VOLUMEID_JFS 23//config:config FEATURE_VOLUMEID_JFS
25//config: bool "jfs filesystem" 24//config: bool "jfs filesystem"
26//config: default y 25//config: default y
27//config: depends on VOLUMEID 26//config: depends on VOLUMEID
28//config: help
29//config: TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33 29
diff --git a/util-linux/volume_id/linux_raid.c b/util-linux/volume_id/linux_raid.c
index f20823a6e..0db6e8662 100644
--- a/util-linux/volume_id/linux_raid.c
+++ b/util-linux/volume_id/linux_raid.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXRAID) += linux_raid.o 21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXRAID) += linux_raid.o
22 22
23//config:
24//config:config FEATURE_VOLUMEID_LINUXRAID 23//config:config FEATURE_VOLUMEID_LINUXRAID
25//config: bool "linuxraid" 24//config: bool "linuxraid"
26//config: default y 25//config: default y
27//config: depends on VOLUMEID 26//config: depends on VOLUMEID
28//config: help
29//config: TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33 29
diff --git a/util-linux/volume_id/linux_swap.c b/util-linux/volume_id/linux_swap.c
index 39470d48c..a35769dfc 100644
--- a/util-linux/volume_id/linux_swap.c
+++ b/util-linux/volume_id/linux_swap.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXSWAP) += linux_swap.o 21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXSWAP) += linux_swap.o
22 22
23//config:
24//config:config FEATURE_VOLUMEID_LINUXSWAP 23//config:config FEATURE_VOLUMEID_LINUXSWAP
25//config: bool "linux swap filesystem" 24//config: bool "linux swap filesystem"
26//config: default y 25//config: default y
27//config: depends on VOLUMEID 26//config: depends on VOLUMEID
28//config: help
29//config: TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33 29
diff --git a/util-linux/volume_id/luks.c b/util-linux/volume_id/luks.c
index 21cb26f51..4b80b7a6d 100644
--- a/util-linux/volume_id/luks.c
+++ b/util-linux/volume_id/luks.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LUKS) += luks.o 21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LUKS) += luks.o
22 22
23//config:
24//config:config FEATURE_VOLUMEID_LUKS 23//config:config FEATURE_VOLUMEID_LUKS
25//config: bool "luks filesystem" 24//config: bool "luks filesystem"
26//config: default y 25//config: default y
27//config: depends on VOLUMEID 26//config: depends on VOLUMEID
28//config: help
29//config: TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33 29
diff --git a/util-linux/volume_id/nilfs.c b/util-linux/volume_id/nilfs.c
index f3a9ef58d..ffe919f36 100644
--- a/util-linux/volume_id/nilfs.c
+++ b/util-linux/volume_id/nilfs.c
@@ -21,7 +21,6 @@
21 21
22//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NILFS) += nilfs.o 22//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NILFS) += nilfs.o
23 23
24//config:
25//config:config FEATURE_VOLUMEID_NILFS 24//config:config FEATURE_VOLUMEID_NILFS
26//config: bool "nilfs filesystem" 25//config: bool "nilfs filesystem"
27//config: default y 26//config: default y
@@ -37,7 +36,6 @@
37//config: SOX compliance logging, and so forth. It can serve as an alternative 36//config: SOX compliance logging, and so forth. It can serve as an alternative
38//config: filesystem for Linux desktop environment, or as a basis of advanced 37//config: filesystem for Linux desktop environment, or as a basis of advanced
39//config: storage appliances. 38//config: storage appliances.
40//config:
41 39
42#include "volume_id_internal.h" 40#include "volume_id_internal.h"
43 41
diff --git a/util-linux/volume_id/ntfs.c b/util-linux/volume_id/ntfs.c
index 46f687a56..bf85f7ed3 100644
--- a/util-linux/volume_id/ntfs.c
+++ b/util-linux/volume_id/ntfs.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NTFS) += ntfs.o 21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NTFS) += ntfs.o
22 22
23//config:
24//config:config FEATURE_VOLUMEID_NTFS 23//config:config FEATURE_VOLUMEID_NTFS
25//config: bool "ntfs filesystem" 24//config: bool "ntfs filesystem"
26//config: default y 25//config: default y
27//config: depends on VOLUMEID 26//config: depends on VOLUMEID
28//config: help
29//config: TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33 29
diff --git a/util-linux/volume_id/ocfs2.c b/util-linux/volume_id/ocfs2.c
index 415e0bf61..2dedac98b 100644
--- a/util-linux/volume_id/ocfs2.c
+++ b/util-linux/volume_id/ocfs2.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_OCFS2) += ocfs2.o 21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_OCFS2) += ocfs2.o
22 22
23//config:
24//config:config FEATURE_VOLUMEID_OCFS2 23//config:config FEATURE_VOLUMEID_OCFS2
25//config: bool "ocfs2 filesystem" 24//config: bool "ocfs2 filesystem"
26//config: default y 25//config: default y
27//config: depends on VOLUMEID 26//config: depends on VOLUMEID
28//config: help
29//config: TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33 29
diff --git a/util-linux/volume_id/reiserfs.c b/util-linux/volume_id/reiserfs.c
index 24979fb1c..369d4d9bb 100644
--- a/util-linux/volume_id/reiserfs.c
+++ b/util-linux/volume_id/reiserfs.c
@@ -21,14 +21,10 @@
21 21
22//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_REISERFS) += reiserfs.o 22//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_REISERFS) += reiserfs.o
23 23
24//config:
25//config:config FEATURE_VOLUMEID_REISERFS 24//config:config FEATURE_VOLUMEID_REISERFS
26//config: bool "Reiser filesystem" 25//config: bool "Reiser filesystem"
27//config: default y 26//config: default y
28//config: depends on VOLUMEID 27//config: depends on VOLUMEID
29//config: help
30//config: TODO
31//config:
32 28
33#include "volume_id_internal.h" 29#include "volume_id_internal.h"
34 30
diff --git a/util-linux/volume_id/romfs.c b/util-linux/volume_id/romfs.c
index 4754fdb37..95a65f9ef 100644
--- a/util-linux/volume_id/romfs.c
+++ b/util-linux/volume_id/romfs.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ROMFS) += romfs.o 21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ROMFS) += romfs.o
22 22
23//config:
24//config:config FEATURE_VOLUMEID_ROMFS 23//config:config FEATURE_VOLUMEID_ROMFS
25//config: bool "romfs filesystem" 24//config: bool "romfs filesystem"
26//config: default y 25//config: default y
27//config: depends on VOLUMEID 26//config: depends on VOLUMEID
28//config: help
29//config: TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33 29
diff --git a/util-linux/volume_id/squashfs.c b/util-linux/volume_id/squashfs.c
index 079b6cc31..6bba199cd 100644
--- a/util-linux/volume_id/squashfs.c
+++ b/util-linux/volume_id/squashfs.c
@@ -8,7 +8,6 @@
8 8
9//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_SQUASHFS) += squashfs.o 9//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_SQUASHFS) += squashfs.o
10 10
11//config:
12//config:config FEATURE_VOLUMEID_SQUASHFS 11//config:config FEATURE_VOLUMEID_SQUASHFS
13//config: bool "SquashFS filesystem" 12//config: bool "SquashFS filesystem"
14//config: default y 13//config: default y
@@ -18,7 +17,6 @@
18//config: intended for general read-only filesystem use and in constrained block 17//config: intended for general read-only filesystem use and in constrained block
19//config: device/memory systems (e.g. embedded systems) where low overhead is 18//config: device/memory systems (e.g. embedded systems) where low overhead is
20//config: needed. 19//config: needed.
21//config:
22 20
23#include "volume_id_internal.h" 21#include "volume_id_internal.h"
24 22
diff --git a/util-linux/volume_id/sysv.c b/util-linux/volume_id/sysv.c
index 7b4b5360b..cd4cd906b 100644
--- a/util-linux/volume_id/sysv.c
+++ b/util-linux/volume_id/sysv.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_SYSV) += sysv.o 21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_SYSV) += sysv.o
22 22
23//config:
24//config:config FEATURE_VOLUMEID_SYSV 23//config:config FEATURE_VOLUMEID_SYSV
25//config: bool "sysv filesystem" 24//config: bool "sysv filesystem"
26//config: default y 25//config: default y
27//config: depends on VOLUMEID 26//config: depends on VOLUMEID
28//config: help
29//config: TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33 29
diff --git a/util-linux/volume_id/ubifs.c b/util-linux/volume_id/ubifs.c
index 13604ec35..99b0aa830 100644
--- a/util-linux/volume_id/ubifs.c
+++ b/util-linux/volume_id/ubifs.c
@@ -8,7 +8,6 @@
8 8
9//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_UBIFS) += ubifs.o 9//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_UBIFS) += ubifs.o
10 10
11//config:
12//config:config FEATURE_VOLUMEID_UBIFS 11//config:config FEATURE_VOLUMEID_UBIFS
13//config: bool "UBIFS filesystem" 12//config: bool "UBIFS filesystem"
14//config: default y 13//config: default y
@@ -16,7 +15,6 @@
16//config: help 15//config: help
17//config: UBIFS (Unsorted Block Image File System) is a file 16//config: UBIFS (Unsorted Block Image File System) is a file
18//config: system for use with raw flash memory media. 17//config: system for use with raw flash memory media.
19//config:
20 18
21#include "volume_id_internal.h" 19#include "volume_id_internal.h"
22 20
diff --git a/util-linux/volume_id/udf.c b/util-linux/volume_id/udf.c
index 921454503..613c80c86 100644
--- a/util-linux/volume_id/udf.c
+++ b/util-linux/volume_id/udf.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_UDF) += udf.o 21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_UDF) += udf.o
22 22
23//config:
24//config:config FEATURE_VOLUMEID_UDF 23//config:config FEATURE_VOLUMEID_UDF
25//config: bool "udf filesystem" 24//config: bool "udf filesystem"
26//config: default y 25//config: default y
27//config: depends on VOLUMEID 26//config: depends on VOLUMEID
28//config: help
29//config: TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33 29
diff --git a/util-linux/volume_id/unused_highpoint.c b/util-linux/volume_id/unused_highpoint.c
index 7231a1db2..4afa6d927 100644
--- a/util-linux/volume_id/unused_highpoint.c
+++ b/util-linux/volume_id/unused_highpoint.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HIGHPOINTRAID) += highpoint.o 21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HIGHPOINTRAID) += highpoint.o
22 22
23//config:
24//config:### config FEATURE_VOLUMEID_HIGHPOINTRAID 23//config:### config FEATURE_VOLUMEID_HIGHPOINTRAID
25//config:### bool "highpoint raid" 24//config:### bool "highpoint raid"
26//config:### default y 25//config:### default y
27//config:### depends on VOLUMEID 26//config:### depends on VOLUMEID
28//config:### help
29//config:### TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33 29
diff --git a/util-linux/volume_id/unused_hpfs.c b/util-linux/volume_id/unused_hpfs.c
index a87c89fb3..3e16dedbd 100644
--- a/util-linux/volume_id/unused_hpfs.c
+++ b/util-linux/volume_id/unused_hpfs.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HPFS) += hpfs.o 21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HPFS) += hpfs.o
22 22
23//config:
24//config:### config FEATURE_VOLUMEID_HPFS 23//config:### config FEATURE_VOLUMEID_HPFS
25//config:### bool "hpfs filesystem" 24//config:### bool "hpfs filesystem"
26//config:### default y 25//config:### default y
27//config:### depends on VOLUMEID 26//config:### depends on VOLUMEID
28//config:### help
29//config:### TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33 29
diff --git a/util-linux/volume_id/unused_isw_raid.c b/util-linux/volume_id/unused_isw_raid.c
index 851bd2f8f..fba99be58 100644
--- a/util-linux/volume_id/unused_isw_raid.c
+++ b/util-linux/volume_id/unused_isw_raid.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_ISWRAID) += isw_raid.o 21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_ISWRAID) += isw_raid.o
22 22
23//config:
24//config:### config FEATURE_VOLUMEID_ISWRAID 23//config:### config FEATURE_VOLUMEID_ISWRAID
25//config:### bool "intel raid" 24//config:### bool "intel raid"
26//config:### default y 25//config:### default y
27//config:### depends on VOLUMEID 26//config:### depends on VOLUMEID
28//config:### help
29//config:### TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33 29
diff --git a/util-linux/volume_id/unused_lsi_raid.c b/util-linux/volume_id/unused_lsi_raid.c
index 52d68deab..9dd2b409c 100644
--- a/util-linux/volume_id/unused_lsi_raid.c
+++ b/util-linux/volume_id/unused_lsi_raid.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LSIRAID) += lsi_raid.o 21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LSIRAID) += lsi_raid.o
22 22
23//config:
24//config:### config FEATURE_VOLUMEID_LSIRAID 23//config:### config FEATURE_VOLUMEID_LSIRAID
25//config:### bool "lsi raid" 24//config:### bool "lsi raid"
26//config:### default y 25//config:### default y
27//config:### depends on VOLUMEID 26//config:### depends on VOLUMEID
28//config:### help
29//config:### TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33 29
diff --git a/util-linux/volume_id/unused_lvm.c b/util-linux/volume_id/unused_lvm.c
index 08fa05243..5ad6d585c 100644
--- a/util-linux/volume_id/unused_lvm.c
+++ b/util-linux/volume_id/unused_lvm.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LVM) += lvm.o 21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LVM) += lvm.o
22 22
23//config:
24//config:### config FEATURE_VOLUMEID_LVM 23//config:### config FEATURE_VOLUMEID_LVM
25//config:### bool "lvm" 24//config:### bool "lvm"
26//config:### default y 25//config:### default y
27//config:### depends on VOLUMEID 26//config:### depends on VOLUMEID
28//config:### help
29//config:### TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33 29
diff --git a/util-linux/volume_id/unused_mac.c b/util-linux/volume_id/unused_mac.c
index a1a53d1fb..997d330a4 100644
--- a/util-linux/volume_id/unused_mac.c
+++ b/util-linux/volume_id/unused_mac.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MAC) += mac.o 21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MAC) += mac.o
22 22
23//config:
24//config:### config FEATURE_VOLUMEID_MAC 23//config:### config FEATURE_VOLUMEID_MAC
25//config:### bool "mac filesystem" 24//config:### bool "mac filesystem"
26//config:### default y 25//config:### default y
27//config:### depends on VOLUMEID 26//config:### depends on VOLUMEID
28//config:### help
29//config:### TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33 29
diff --git a/util-linux/volume_id/unused_minix.c b/util-linux/volume_id/unused_minix.c
index 50afd5c3e..443dbc272 100644
--- a/util-linux/volume_id/unused_minix.c
+++ b/util-linux/volume_id/unused_minix.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MINIX) += minix.o 21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MINIX) += minix.o
22 22
23//config:
24//config:### config FEATURE_VOLUMEID_MINIX 23//config:### config FEATURE_VOLUMEID_MINIX
25//config:### bool "minix filesystem" 24//config:### bool "minix filesystem"
26//config:### default y 25//config:### default y
27//config:### depends on VOLUMEID 26//config:### depends on VOLUMEID
28//config:### help
29//config:### TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33 29
diff --git a/util-linux/volume_id/unused_msdos.c b/util-linux/volume_id/unused_msdos.c
index 5ebaa3eef..f84c0f06f 100644
--- a/util-linux/volume_id/unused_msdos.c
+++ b/util-linux/volume_id/unused_msdos.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MSDOS) += msdos.o 21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MSDOS) += msdos.o
22 22
23//config:
24//config:### config FEATURE_VOLUMEID_MSDOS 23//config:### config FEATURE_VOLUMEID_MSDOS
25//config:### bool "msdos filesystem" 24//config:### bool "msdos filesystem"
26//config:### default y 25//config:### default y
27//config:### depends on VOLUMEID 26//config:### depends on VOLUMEID
28//config:### help
29//config:### TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33 29
diff --git a/util-linux/volume_id/unused_nvidia_raid.c b/util-linux/volume_id/unused_nvidia_raid.c
index d99a108f3..dfb54fa9d 100644
--- a/util-linux/volume_id/unused_nvidia_raid.c
+++ b/util-linux/volume_id/unused_nvidia_raid.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_NVIDIARAID) += nvidia_raid.o 21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_NVIDIARAID) += nvidia_raid.o
22 22
23//config:
24//config:### config FEATURE_VOLUMEID_NVIDIARAID 23//config:### config FEATURE_VOLUMEID_NVIDIARAID
25//config:### bool "nvidia raid" 24//config:### bool "nvidia raid"
26//config:### default y 25//config:### default y
27//config:### depends on VOLUMEID 26//config:### depends on VOLUMEID
28//config:### help
29//config:### TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33 29
diff --git a/util-linux/volume_id/unused_promise_raid.c b/util-linux/volume_id/unused_promise_raid.c
index cebebe35f..d594de39c 100644
--- a/util-linux/volume_id/unused_promise_raid.c
+++ b/util-linux/volume_id/unused_promise_raid.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_PROMISERAID) += promise_raid.o 21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_PROMISERAID) += promise_raid.o
22 22
23//config:
24//config:### config FEATURE_VOLUMEID_PROMISERAID 23//config:### config FEATURE_VOLUMEID_PROMISERAID
25//config:### bool "promise raid" 24//config:### bool "promise raid"
26//config:### default y 25//config:### default y
27//config:### depends on VOLUMEID 26//config:### depends on VOLUMEID
28//config:### help
29//config:### TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33 29
diff --git a/util-linux/volume_id/unused_silicon_raid.c b/util-linux/volume_id/unused_silicon_raid.c
index 40c8faa9e..886721b61 100644
--- a/util-linux/volume_id/unused_silicon_raid.c
+++ b/util-linux/volume_id/unused_silicon_raid.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_SILICONRAID) += silicon_raid.o 21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_SILICONRAID) += silicon_raid.o
22 22
23//config:
24//config:### config FEATURE_VOLUMEID_SILICONRAID 23//config:### config FEATURE_VOLUMEID_SILICONRAID
25//config:### bool "silicon raid" 24//config:### bool "silicon raid"
26//config:### default y 25//config:### default y
27//config:### depends on VOLUMEID 26//config:### depends on VOLUMEID
28//config:### help
29//config:### TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33 29
diff --git a/util-linux/volume_id/unused_ufs.c b/util-linux/volume_id/unused_ufs.c
index d33c10fc4..78ef26ad4 100644
--- a/util-linux/volume_id/unused_ufs.c
+++ b/util-linux/volume_id/unused_ufs.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_UFS) += ufs.o 21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_UFS) += ufs.o
22 22
23//config:
24//config:### config FEATURE_VOLUMEID_UFS 23//config:### config FEATURE_VOLUMEID_UFS
25//config:### bool "ufs filesystem" 24//config:### bool "ufs filesystem"
26//config:### default y 25//config:### default y
27//config:### depends on VOLUMEID 26//config:### depends on VOLUMEID
28//config:### help
29//config:### TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33 29
diff --git a/util-linux/volume_id/unused_via_raid.c b/util-linux/volume_id/unused_via_raid.c
index 258f93a4f..f82626655 100644
--- a/util-linux/volume_id/unused_via_raid.c
+++ b/util-linux/volume_id/unused_via_raid.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_VIARAID) += via_raid.o 21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_VIARAID) += via_raid.o
22 22
23//config:
24//config:### config FEATURE_VOLUMEID_VIARAID 23//config:### config FEATURE_VOLUMEID_VIARAID
25//config:### bool "via raid" 24//config:### bool "via raid"
26//config:### default y 25//config:### default y
27//config:### depends on VOLUMEID 26//config:### depends on VOLUMEID
28//config:### help
29//config:### TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33 29
diff --git a/util-linux/volume_id/xfs.c b/util-linux/volume_id/xfs.c
index 5eefc201d..656d5bfcf 100644
--- a/util-linux/volume_id/xfs.c
+++ b/util-linux/volume_id/xfs.c
@@ -20,14 +20,10 @@
20 20
21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_XFS) += xfs.o 21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_XFS) += xfs.o
22 22
23//config:
24//config:config FEATURE_VOLUMEID_XFS 23//config:config FEATURE_VOLUMEID_XFS
25//config: bool "xfs filesystem" 24//config: bool "xfs filesystem"
26//config: default y 25//config: default y
27//config: depends on VOLUMEID 26//config: depends on VOLUMEID
28//config: help
29//config: TODO
30//config:
31 27
32#include "volume_id_internal.h" 28#include "volume_id_internal.h"
33 29
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-23 14:22:35 +0000