aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2016-11-29 11:26:45 +0000
committerRon Yorston <rmy@pobox.com>2016-11-29 11:26:45 +0000
commitbb8d79eadbba1942dbdb9f9cee5c47833afe269f (patch)
treeb8c517e9ca895d60d7227aef7177b6291df5e2cd /include
parent9fa1e4990e655a85025c9d270a1606983e375e47 (diff)
parent7d877fc9312a742b06125927bb1d34bd35398c6c (diff)
downloadbusybox-w32-bb8d79eadbba1942dbdb9f9cee5c47833afe269f.tar.gz
busybox-w32-bb8d79eadbba1942dbdb9f9cee5c47833afe269f.tar.bz2
busybox-w32-bb8d79eadbba1942dbdb9f9cee5c47833afe269f.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'include')
-rwxr-xr-xinclude/applets.h.sh24
-rw-r--r--include/applets.src.h264
-rw-r--r--include/libbb.h76
3 files changed, 63 insertions, 301 deletions
diff --git a/include/applets.h.sh b/include/applets.h.sh
new file mode 100755
index 000000000..bab4e0d72
--- /dev/null
+++ b/include/applets.h.sh
@@ -0,0 +1,24 @@
1#!/bin/sh
2#
3# This script allows to check whether every applet has a separate option
4# enabling it. Run it after applets.h is generated.
5
6# CONFIG_applet names
7grep ^IF_ applets.h | grep -v IF_FEATURE_ | sed 's/IF_\([A-Z0-9._-]*\)(.*/\1/' \
8| grep -v MODPROBE_SMALL \
9| sed 's/BB_SYSCTL/SYSCTL/' \
10| sed 's/TEST1/[/' \
11| sed 's/TEST2/[[/' \
12| sort | uniq \
13>applets_APP1
14
15# command line applet names
16grep ^IF_ applets.h | sed -e's/ //g' -e's/.*(\([a-z[][^,]*\),.*/\1/' \
17| grep -v '^bash$' \
18| grep -v '^sh$' \
19| tr a-z A-Z \
20| sort | uniq \
21>applets_APP2
22
23diff -u applets_APP1 applets_APP2 >applets_APP.diff
24rm applets_APP1 applets_APP2
diff --git a/include/applets.src.h b/include/applets.src.h
index 248d539c4..2ddf120ad 100644
--- a/include/applets.src.h
+++ b/include/applets.src.h
@@ -73,269 +73,7 @@ s - suid type:
73 73
74 74
75INSERT 75INSERT
76IF_TEST(APPLET_NOFORK([, test, BB_DIR_USR_BIN, BB_SUID_DROP, test)) 76
77IF_TEST(APPLET_NOFORK([[, test, BB_DIR_USR_BIN, BB_SUID_DROP, test))
78IF_ACPID(APPLET(acpid, BB_DIR_SBIN, BB_SUID_DROP))
79IF_ADJTIMEX(APPLET(adjtimex, BB_DIR_SBIN, BB_SUID_DROP))
80IF_ARP(APPLET(arp, BB_DIR_SBIN, BB_SUID_DROP))
81IF_ARPING(APPLET(arping, BB_DIR_USR_SBIN, BB_SUID_DROP))
82IF_BASENAME(APPLET_NOFORK(basename, basename, BB_DIR_USR_BIN, BB_SUID_DROP, basename))
83IF_BBCONFIG(APPLET(bbconfig, BB_DIR_BIN, BB_SUID_DROP))
84IF_BEEP(APPLET(beep, BB_DIR_USR_BIN, BB_SUID_DROP))
85IF_BLKID(APPLET(blkid, BB_DIR_SBIN, BB_SUID_DROP))
86IF_BRCTL(APPLET(brctl, BB_DIR_USR_SBIN, BB_SUID_DROP))
87IF_CAL(APPLET(cal, BB_DIR_USR_BIN, BB_SUID_DROP))
88IF_CAT(APPLET_NOFORK(cat, cat, BB_DIR_BIN, BB_SUID_DROP, cat))
89IF_CATV(APPLET(catv, BB_DIR_BIN, BB_SUID_DROP))
90IF_CHAT(APPLET(chat, BB_DIR_USR_SBIN, BB_SUID_DROP))
91IF_CHCON(APPLET(chcon, BB_DIR_USR_BIN, BB_SUID_DROP))
92IF_CHGRP(APPLET_NOEXEC(chgrp, chgrp, BB_DIR_BIN, BB_SUID_DROP, chgrp))
93IF_CHMOD(APPLET_NOEXEC(chmod, chmod, BB_DIR_BIN, BB_SUID_DROP, chmod))
94IF_CHOWN(APPLET_NOEXEC(chown, chown, BB_DIR_BIN, BB_SUID_DROP, chown))
95IF_CHROOT(APPLET(chroot, BB_DIR_USR_SBIN, BB_SUID_DROP))
96IF_CHRT(APPLET(chrt, BB_DIR_USR_BIN, BB_SUID_DROP))
97IF_CHVT(APPLET(chvt, BB_DIR_USR_BIN, BB_SUID_DROP))
98IF_CKSUM(APPLET_NOEXEC(cksum, cksum, BB_DIR_USR_BIN, BB_SUID_DROP, cksum))
99IF_CLEAR(APPLET(clear, BB_DIR_USR_BIN, BB_SUID_DROP))
100IF_COMM(APPLET(comm, BB_DIR_USR_BIN, BB_SUID_DROP))
101IF_CP(APPLET_NOEXEC(cp, cp, BB_DIR_BIN, BB_SUID_DROP, cp))
102/* Needs to be run by root or be suid root - needs to change /var/spool/cron* files: */
103IF_CRONTAB(APPLET(crontab, BB_DIR_USR_BIN, BB_SUID_REQUIRE))
104IF_CUT(APPLET_NOEXEC(cut, cut, BB_DIR_USR_BIN, BB_SUID_DROP, cut))
105IF_DC(APPLET(dc, BB_DIR_USR_BIN, BB_SUID_DROP))
106IF_DD(APPLET_NOEXEC(dd, dd, BB_DIR_BIN, BB_SUID_DROP, dd))
107IF_DEALLOCVT(APPLET(deallocvt, BB_DIR_USR_BIN, BB_SUID_DROP))
108IF_DEVFSD(APPLET(devfsd, BB_DIR_SBIN, BB_SUID_DROP))
109IF_DEVMEM(APPLET(devmem, BB_DIR_SBIN, BB_SUID_DROP))
110IF_DF(APPLET(df, BB_DIR_BIN, BB_SUID_DROP))
111IF_DHCPRELAY(APPLET(dhcprelay, BB_DIR_USR_SBIN, BB_SUID_DROP))
112IF_DIRNAME(APPLET_NOFORK(dirname, dirname, BB_DIR_USR_BIN, BB_SUID_DROP, dirname))
113IF_DMESG(APPLET(dmesg, BB_DIR_BIN, BB_SUID_DROP))
114IF_DNSD(APPLET(dnsd, BB_DIR_USR_SBIN, BB_SUID_DROP))
115IF_HOSTNAME(APPLET_ODDNAME(dnsdomainname, hostname, BB_DIR_BIN, BB_SUID_DROP, dnsdomainname))
116IF_DOS2UNIX(APPLET_NOEXEC(dos2unix, dos2unix, BB_DIR_USR_BIN, BB_SUID_DROP, dos2unix))
117IF_DU(APPLET(du, BB_DIR_USR_BIN, BB_SUID_DROP))
118IF_DUMPKMAP(APPLET(dumpkmap, BB_DIR_BIN, BB_SUID_DROP))
119IF_DUMPLEASES(APPLET(dumpleases, BB_DIR_USR_BIN, BB_SUID_DROP))
120//IF_E2FSCK(APPLET(e2fsck, BB_DIR_SBIN, BB_SUID_DROP))
121//IF_E2LABEL(APPLET_ODDNAME(e2label, tune2fs, BB_DIR_SBIN, BB_SUID_DROP, e2label))
122IF_ECHO(APPLET_NOFORK(echo, echo, BB_DIR_BIN, BB_SUID_DROP, echo))
123IF_EJECT(APPLET(eject, BB_DIR_USR_BIN, BB_SUID_DROP))
124IF_ENV(APPLET_NOEXEC(env, env, BB_DIR_USR_BIN, BB_SUID_DROP, env))
125IF_ETHER_WAKE(APPLET_ODDNAME(ether-wake, ether_wake, BB_DIR_USR_SBIN, BB_SUID_DROP, ether_wake))
126IF_EXPAND(APPLET(expand, BB_DIR_USR_BIN, BB_SUID_DROP))
127IF_EXPR(APPLET(expr, BB_DIR_USR_BIN, BB_SUID_DROP))
128IF_FAKEIDENTD(APPLET(fakeidentd, BB_DIR_USR_SBIN, BB_SUID_DROP))
129IF_FALSE(APPLET_NOFORK(false, false, BB_DIR_BIN, BB_SUID_DROP, false))
130IF_FBSET(APPLET(fbset, BB_DIR_USR_SBIN, BB_SUID_DROP))
131IF_FBSPLASH(APPLET(fbsplash, BB_DIR_SBIN, BB_SUID_DROP))
132IF_FDFLUSH(APPLET_ODDNAME(fdflush, freeramdisk, BB_DIR_BIN, BB_SUID_DROP, fdflush))
133IF_FDFORMAT(APPLET(fdformat, BB_DIR_USR_SBIN, BB_SUID_DROP))
134IF_FDISK(APPLET(fdisk, BB_DIR_SBIN, BB_SUID_DROP))
135IF_FGCONSOLE(APPLET(fgconsole, BB_DIR_USR_BIN, BB_SUID_DROP))
136/* Benefits from suid root: better access to /dev/BLOCKDEVs: */
137IF_FINDFS(APPLET(findfs, BB_DIR_SBIN, BB_SUID_MAYBE))
138IF_FLASH_ERASEALL(APPLET(flash_eraseall, BB_DIR_USR_SBIN, BB_SUID_DROP))
139IF_FLASH_LOCK(APPLET_ODDNAME(flash_lock, flash_lock_unlock, BB_DIR_USR_SBIN, BB_SUID_DROP, flash_lock))
140IF_FLASH_UNLOCK(APPLET_ODDNAME(flash_unlock, flash_lock_unlock, BB_DIR_USR_SBIN, BB_SUID_DROP, flash_unlock))
141IF_FLASHCP(APPLET(flashcp, BB_DIR_USR_SBIN, BB_SUID_DROP))
142IF_FLOCK(APPLET(flock, BB_DIR_USR_BIN, BB_SUID_DROP))
143IF_FOLD(APPLET_NOEXEC(fold, fold, BB_DIR_USR_BIN, BB_SUID_DROP, fold))
144IF_FREE(APPLET(free, BB_DIR_USR_BIN, BB_SUID_DROP))
145IF_FREERAMDISK(APPLET(freeramdisk, BB_DIR_SBIN, BB_SUID_DROP))
146//IF_E2FSCK(APPLET_ODDNAME(fsck.ext2, e2fsck, BB_DIR_SBIN, BB_SUID_DROP, fsck_ext2))
147//IF_E2FSCK(APPLET_ODDNAME(fsck.ext3, e2fsck, BB_DIR_SBIN, BB_SUID_DROP, fsck_ext3))
148IF_FSCK_MINIX(APPLET_ODDNAME(fsck.minix, fsck_minix, BB_DIR_SBIN, BB_SUID_DROP, fsck_minix))
149IF_FSYNC(APPLET_NOFORK(fsync, fsync, BB_DIR_BIN, BB_SUID_DROP, fsync))
150IF_FTPD(APPLET(ftpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
151IF_FTPGET(APPLET_ODDNAME(ftpget, ftpgetput, BB_DIR_USR_BIN, BB_SUID_DROP, ftpget))
152IF_FTPPUT(APPLET_ODDNAME(ftpput, ftpgetput, BB_DIR_USR_BIN, BB_SUID_DROP, ftpput))
153IF_FUSER(APPLET(fuser, BB_DIR_USR_BIN, BB_SUID_DROP))
154IF_GETENFORCE(APPLET(getenforce, BB_DIR_USR_SBIN, BB_SUID_DROP))
155IF_GETOPT(APPLET(getopt, BB_DIR_BIN, BB_SUID_DROP))
156IF_GETSEBOOL(APPLET(getsebool, BB_DIR_USR_SBIN, BB_SUID_DROP))
157IF_HD(APPLET_NOEXEC(hd, hexdump, BB_DIR_USR_BIN, BB_SUID_DROP, hd))
158IF_HDPARM(APPLET(hdparm, BB_DIR_SBIN, BB_SUID_DROP))
159IF_HEAD(APPLET_NOEXEC(head, head, BB_DIR_USR_BIN, BB_SUID_DROP, head))
160IF_HEXDUMP(APPLET_NOEXEC(hexdump, hexdump, BB_DIR_USR_BIN, BB_SUID_DROP, hexdump))
161IF_HOSTNAME(APPLET(hostname, BB_DIR_BIN, BB_SUID_DROP))
162IF_HTTPD(APPLET(httpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
163IF_HWCLOCK(APPLET(hwclock, BB_DIR_SBIN, BB_SUID_DROP))
164IF_IFCONFIG(APPLET(ifconfig, BB_DIR_SBIN, BB_SUID_DROP))
165IF_IFUPDOWN(APPLET_ODDNAME(ifdown, ifupdown, BB_DIR_SBIN, BB_SUID_DROP, ifdown))
166IF_IFENSLAVE(APPLET(ifenslave, BB_DIR_SBIN, BB_SUID_DROP))
167IF_IFPLUGD(APPLET(ifplugd, BB_DIR_USR_SBIN, BB_SUID_DROP))
168IF_IFUPDOWN(APPLET_ODDNAME(ifup, ifupdown, BB_DIR_SBIN, BB_SUID_DROP, ifup))
169IF_INETD(APPLET(inetd, BB_DIR_USR_SBIN, BB_SUID_DROP))
170IF_INOTIFYD(APPLET(inotifyd, BB_DIR_SBIN, BB_SUID_DROP))
171IF_INSTALL(APPLET(install, BB_DIR_USR_BIN, BB_SUID_DROP))
172IF_IONICE(APPLET(ionice, BB_DIR_BIN, BB_SUID_DROP))
173#if ENABLE_FEATURE_IP_ADDRESS \
174 || ENABLE_FEATURE_IP_ROUTE \
175 || ENABLE_FEATURE_IP_LINK \
176 || ENABLE_FEATURE_IP_TUNNEL \
177 || ENABLE_FEATURE_IP_RULE
178IF_IP(APPLET(ip, BB_DIR_SBIN, BB_SUID_DROP))
179#endif
180IF_IPADDR(APPLET(ipaddr, BB_DIR_SBIN, BB_SUID_DROP))
181IF_IPCALC(APPLET(ipcalc, BB_DIR_BIN, BB_SUID_DROP))
182IF_IPCRM(APPLET(ipcrm, BB_DIR_USR_BIN, BB_SUID_DROP))
183IF_IPCS(APPLET(ipcs, BB_DIR_USR_BIN, BB_SUID_DROP))
184IF_IPLINK(APPLET(iplink, BB_DIR_SBIN, BB_SUID_DROP))
185IF_IPROUTE(APPLET(iproute, BB_DIR_SBIN, BB_SUID_DROP))
186IF_IPRULE(APPLET(iprule, BB_DIR_SBIN, BB_SUID_DROP))
187IF_IPTUNNEL(APPLET(iptunnel, BB_DIR_SBIN, BB_SUID_DROP))
188IF_KBD_MODE(APPLET(kbd_mode, BB_DIR_BIN, BB_SUID_DROP))
189IF_KILL(APPLET(kill, BB_DIR_BIN, BB_SUID_DROP))
190IF_KILLALL(APPLET_ODDNAME(killall, kill, BB_DIR_USR_BIN, BB_SUID_DROP, killall))
191IF_KILLALL5(APPLET_ODDNAME(killall5, kill, BB_DIR_USR_SBIN, BB_SUID_DROP, killall5))
192IF_LAST(APPLET(last, BB_DIR_USR_BIN, BB_SUID_DROP))
193//IF_LENGTH(APPLET_NOFORK(length, length, BB_DIR_USR_BIN, BB_SUID_DROP, length))
194IF_LESS(APPLET(less, BB_DIR_USR_BIN, BB_SUID_DROP))
195IF_LN(APPLET_NOEXEC(ln, ln, BB_DIR_BIN, BB_SUID_DROP, ln))
196IF_LOAD_POLICY(APPLET(load_policy, BB_DIR_USR_SBIN, BB_SUID_DROP))
197IF_LOADFONT(APPLET(loadfont, BB_DIR_USR_SBIN, BB_SUID_DROP))
198IF_LOADKMAP(APPLET(loadkmap, BB_DIR_SBIN, BB_SUID_DROP))
199IF_LOGNAME(APPLET_NOFORK(logname, logname, BB_DIR_USR_BIN, BB_SUID_DROP, logname))
200IF_LOSETUP(APPLET(losetup, BB_DIR_SBIN, BB_SUID_DROP))
201IF_LS(APPLET_NOEXEC(ls, ls, BB_DIR_BIN, BB_SUID_DROP, ls))
202IF_LSPCI(APPLET(lspci, BB_DIR_USR_BIN, BB_SUID_DROP))
203IF_LSUSB(APPLET(lsusb, BB_DIR_USR_BIN, BB_SUID_DROP))
204IF_MAKEDEVS(APPLET(makedevs, BB_DIR_SBIN, BB_SUID_DROP))
205IF_MAKEMIME(APPLET(makemime, BB_DIR_BIN, BB_SUID_DROP))
206IF_MAN(APPLET(man, BB_DIR_USR_BIN, BB_SUID_DROP))
207IF_MATCHPATHCON(APPLET(matchpathcon, BB_DIR_USR_SBIN, BB_SUID_DROP))
208IF_MICROCOM(APPLET(microcom, BB_DIR_USR_BIN, BB_SUID_DROP))
209IF_MKDIR(APPLET_NOFORK(mkdir, mkdir, BB_DIR_BIN, BB_SUID_DROP, mkdir))
210IF_MKFS_VFAT(APPLET_ODDNAME(mkdosfs, mkfs_vfat, BB_DIR_SBIN, BB_SUID_DROP, mkfs_vfat))
211IF_MKFS_EXT2(APPLET_ODDNAME(mke2fs, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2))
212IF_MKFIFO(APPLET_NOEXEC(mkfifo, mkfifo, BB_DIR_USR_BIN, BB_SUID_DROP, mkfifo))
213IF_MKFS_EXT2(APPLET_ODDNAME(mkfs.ext2, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2))
214//IF_MKE2FS(APPLET_ODDNAME(mkfs.ext3, mke2fs, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext3))
215IF_MKFS_MINIX(APPLET_ODDNAME(mkfs.minix, mkfs_minix, BB_DIR_SBIN, BB_SUID_DROP, mkfs_minix))
216IF_MKFS_REISER(APPLET_ODDNAME(mkfs.reiser, mkfs_reiser, BB_DIR_SBIN, BB_SUID_DROP, mkfs_reiser))
217IF_MKFS_VFAT(APPLET_ODDNAME(mkfs.vfat, mkfs_vfat, BB_DIR_SBIN, BB_SUID_DROP, mkfs_vfat))
218IF_MKNOD(APPLET_NOEXEC(mknod, mknod, BB_DIR_BIN, BB_SUID_DROP, mknod))
219IF_MKSWAP(APPLET(mkswap, BB_DIR_SBIN, BB_SUID_DROP))
220IF_MORE(APPLET(more, BB_DIR_BIN, BB_SUID_DROP))
221/* On full-blown systems, requires suid for user mounts.
222 * But it's not unthinkable to have it available in non-suid flavor on some systems,
223 * for viewing mount table.
224 * Therefore we use BB_SUID_MAYBE instead of BB_SUID_REQUIRE: */
225IF_MOUNT(APPLET(mount, BB_DIR_BIN, IF_DESKTOP(BB_SUID_MAYBE) IF_NOT_DESKTOP(BB_SUID_DROP)))
226IF_MOUNTPOINT(APPLET(mountpoint, BB_DIR_BIN, BB_SUID_DROP))
227IF_MT(APPLET(mt, BB_DIR_BIN, BB_SUID_DROP))
228IF_MV(APPLET(mv, BB_DIR_BIN, BB_SUID_DROP))
229IF_NAMEIF(APPLET(nameif, BB_DIR_SBIN, BB_SUID_DROP))
230IF_NC(APPLET(nc, BB_DIR_USR_BIN, BB_SUID_DROP))
231IF_NETSTAT(APPLET(netstat, BB_DIR_BIN, BB_SUID_DROP))
232IF_NICE(APPLET(nice, BB_DIR_BIN, BB_SUID_DROP))
233IF_NOHUP(APPLET(nohup, BB_DIR_USR_BIN, BB_SUID_DROP))
234IF_NSLOOKUP(APPLET(nslookup, BB_DIR_USR_BIN, BB_SUID_DROP))
235IF_NTPD(APPLET(ntpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
236IF_OD(APPLET(od, BB_DIR_USR_BIN, BB_SUID_DROP))
237IF_OPENVT(APPLET(openvt, BB_DIR_USR_BIN, BB_SUID_DROP))
238//IF_PARSE(APPLET(parse, BB_DIR_USR_BIN, BB_SUID_DROP))
239IF_PGREP(APPLET(pgrep, BB_DIR_USR_BIN, BB_SUID_DROP))
240IF_PIDOF(APPLET(pidof, BB_DIR_BIN, BB_SUID_DROP))
241IF_PIVOT_ROOT(APPLET(pivot_root, BB_DIR_SBIN, BB_SUID_DROP))
242IF_PKILL(APPLET_ODDNAME(pkill, pgrep, BB_DIR_USR_BIN, BB_SUID_DROP, pkill))
243IF_POPMAILDIR(APPLET(popmaildir, BB_DIR_USR_SBIN, BB_SUID_DROP))
244IF_PRINTENV(APPLET_NOFORK(printenv, printenv, BB_DIR_BIN, BB_SUID_DROP, printenv))
245IF_PRINTF(APPLET_NOFORK(printf, printf, BB_DIR_USR_BIN, BB_SUID_DROP, printf))
246IF_PS(APPLET(ps, BB_DIR_BIN, BB_SUID_DROP))
247IF_PSCAN(APPLET(pscan, BB_DIR_USR_BIN, BB_SUID_DROP))
248IF_PWD(APPLET_NOFORK(pwd, pwd, BB_DIR_BIN, BB_SUID_DROP, pwd))
249IF_RAIDAUTORUN(APPLET(raidautorun, BB_DIR_SBIN, BB_SUID_DROP))
250IF_RDATE(APPLET(rdate, BB_DIR_USR_SBIN, BB_SUID_DROP))
251IF_RDEV(APPLET(rdev, BB_DIR_USR_SBIN, BB_SUID_DROP))
252IF_READAHEAD(APPLET(readahead, BB_DIR_USR_SBIN, BB_SUID_DROP))
253IF_READLINK(APPLET(readlink, BB_DIR_USR_BIN, BB_SUID_DROP))
254IF_READPROFILE(APPLET(readprofile, BB_DIR_USR_SBIN, BB_SUID_DROP))
255IF_REALPATH(APPLET(realpath, BB_DIR_USR_BIN, BB_SUID_DROP))
256IF_REFORMIME(APPLET(reformime, BB_DIR_BIN, BB_SUID_DROP))
257IF_RENICE(APPLET(renice, BB_DIR_USR_BIN, BB_SUID_DROP))
258IF_RESET(APPLET(reset, BB_DIR_USR_BIN, BB_SUID_DROP))
259IF_RESIZE(APPLET(resize, BB_DIR_USR_BIN, BB_SUID_DROP))
260IF_RESTORECON(APPLET_ODDNAME(restorecon, setfiles, BB_DIR_SBIN, BB_SUID_DROP, restorecon))
261IF_RM(APPLET_NOFORK(rm, rm, BB_DIR_BIN, BB_SUID_DROP, rm))
262IF_RMDIR(APPLET_NOFORK(rmdir, rmdir, BB_DIR_BIN, BB_SUID_DROP, rmdir))
263IF_ROUTE(APPLET(route, BB_DIR_SBIN, BB_SUID_DROP))
264IF_RTCWAKE(APPLET(rtcwake, BB_DIR_USR_SBIN, BB_SUID_DROP))
265IF_RUNCON(APPLET(runcon, BB_DIR_USR_BIN, BB_SUID_DROP))
266IF_RUNLEVEL(APPLET(runlevel, BB_DIR_SBIN, BB_SUID_DROP))
267IF_RX(APPLET(rx, BB_DIR_USR_BIN, BB_SUID_DROP))
268IF_SCRIPT(APPLET(script, BB_DIR_USR_BIN, BB_SUID_DROP))
269IF_SCRIPTREPLAY(APPLET(scriptreplay, BB_DIR_BIN, BB_SUID_DROP))
270IF_SELINUXENABLED(APPLET(selinuxenabled, BB_DIR_USR_SBIN, BB_SUID_DROP))
271IF_SENDMAIL(APPLET(sendmail, BB_DIR_USR_SBIN, BB_SUID_DROP))
272IF_SEQ(APPLET_NOFORK(seq, seq, BB_DIR_USR_BIN, BB_SUID_DROP, seq))
273IF_SESTATUS(APPLET(sestatus, BB_DIR_USR_SBIN, BB_SUID_DROP))
274IF_SETCONSOLE(APPLET(setconsole, BB_DIR_SBIN, BB_SUID_DROP))
275IF_SETENFORCE(APPLET(setenforce, BB_DIR_USR_SBIN, BB_SUID_DROP))
276IF_SETFILES(APPLET(setfiles, BB_DIR_SBIN, BB_SUID_DROP))
277IF_SETFONT(APPLET(setfont, BB_DIR_USR_SBIN, BB_SUID_DROP))
278IF_SETKEYCODES(APPLET(setkeycodes, BB_DIR_USR_BIN, BB_SUID_DROP))
279IF_SETLOGCONS(APPLET(setlogcons, BB_DIR_USR_SBIN, BB_SUID_DROP))
280IF_SETSEBOOL(APPLET(setsebool, BB_DIR_USR_SBIN, BB_SUID_DROP))
281IF_SETSID(APPLET(setsid, BB_DIR_USR_BIN, BB_SUID_DROP))
282IF_SHOWKEY(APPLET(showkey, BB_DIR_USR_BIN, BB_SUID_DROP))
283IF_SLATTACH(APPLET(slattach, BB_DIR_SBIN, BB_SUID_DROP))
284/* Do not make this applet NOFORK. It breaks ^C-ing of pauses in shells: */
285IF_SLEEP(APPLET(sleep, BB_DIR_BIN, BB_SUID_DROP))
286IF_SORT(APPLET_NOEXEC(sort, sort, BB_DIR_USR_BIN, BB_SUID_DROP, sort))
287IF_SPLIT(APPLET(split, BB_DIR_USR_BIN, BB_SUID_DROP))
288IF_STAT(APPLET(stat, BB_DIR_BIN, BB_SUID_DROP))
289IF_STRINGS(APPLET(strings, BB_DIR_USR_BIN, BB_SUID_DROP))
290IF_STTY(APPLET(stty, BB_DIR_BIN, BB_SUID_DROP))
291IF_SUM(APPLET(sum, BB_DIR_USR_BIN, BB_SUID_DROP))
292IF_SWAPONOFF(APPLET_ODDNAME(swapoff, swap_on_off, BB_DIR_SBIN, BB_SUID_DROP, swapoff))
293IF_SWAPONOFF(APPLET_ODDNAME(swapon, swap_on_off, BB_DIR_SBIN, BB_SUID_DROP, swapon))
294IF_SWITCH_ROOT(APPLET(switch_root, BB_DIR_SBIN, BB_SUID_DROP))
295IF_BB_SYSCTL(APPLET(sysctl, BB_DIR_SBIN, BB_SUID_DROP))
296IF_TAC(APPLET_NOEXEC(tac, tac, BB_DIR_USR_BIN, BB_SUID_DROP, tac))
297IF_TAIL(APPLET(tail, BB_DIR_USR_BIN, BB_SUID_DROP))
298/* IF_TC(APPLET(tc, BB_DIR_SBIN, BB_SUID_DROP)) */
299IF_TCPSVD(APPLET_ODDNAME(tcpsvd, tcpudpsvd, BB_DIR_USR_BIN, BB_SUID_DROP, tcpsvd))
300IF_TEE(APPLET(tee, BB_DIR_USR_BIN, BB_SUID_DROP))
301IF_TELNET(APPLET(telnet, BB_DIR_USR_BIN, BB_SUID_DROP))
302IF_TELNETD(APPLET(telnetd, BB_DIR_USR_SBIN, BB_SUID_DROP))
303IF_TEST(APPLET_NOFORK(test, test, BB_DIR_USR_BIN, BB_SUID_DROP, test))
304#if ENABLE_FEATURE_TFTP_GET || ENABLE_FEATURE_TFTP_PUT
305IF_TFTP(APPLET(tftp, BB_DIR_USR_BIN, BB_SUID_DROP))
306IF_TFTPD(APPLET(tftpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
307#endif
308IF_TIME(APPLET(time, BB_DIR_USR_BIN, BB_SUID_DROP))
309IF_TIMEOUT(APPLET(timeout, BB_DIR_USR_BIN, BB_SUID_DROP))
310IF_TOP(APPLET(top, BB_DIR_USR_BIN, BB_SUID_DROP))
311IF_TR(APPLET(tr, BB_DIR_USR_BIN, BB_SUID_DROP))
312/* Needs socket(AF_INET, SOCK_RAW, IPPROTO_ICMP), therefore BB_SUID_MAYBE: */
313IF_TRACEROUTE(APPLET(traceroute, BB_DIR_USR_BIN, BB_SUID_MAYBE))
314IF_TRACEROUTE6(APPLET(traceroute6, BB_DIR_USR_BIN, BB_SUID_MAYBE))
315IF_TRUE(APPLET_NOFORK(true, true, BB_DIR_BIN, BB_SUID_DROP, true))
316IF_TTY(APPLET(tty, BB_DIR_USR_BIN, BB_SUID_DROP))
317IF_TTYSIZE(APPLET(ttysize, BB_DIR_USR_BIN, BB_SUID_DROP))
318IF_TUNCTL(APPLET(tunctl, BB_DIR_SBIN, BB_SUID_DROP))
319IF_UDHCPC(APPLET(udhcpc, BB_DIR_SBIN, BB_SUID_DROP))
320IF_UDHCPD(APPLET(udhcpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
321IF_UDPSVD(APPLET_ODDNAME(udpsvd, tcpudpsvd, BB_DIR_USR_BIN, BB_SUID_DROP, udpsvd))
322IF_UMOUNT(APPLET(umount, BB_DIR_BIN, BB_SUID_DROP))
323IF_UNAME(APPLET(uname, BB_DIR_BIN, BB_SUID_DROP))
324IF_UNEXPAND(APPLET_ODDNAME(unexpand, expand, BB_DIR_USR_BIN, BB_SUID_DROP, unexpand))
325IF_UNIQ(APPLET(uniq, BB_DIR_USR_BIN, BB_SUID_DROP))
326IF_UNIX2DOS(APPLET_NOEXEC(unix2dos, dos2unix, BB_DIR_USR_BIN, BB_SUID_DROP, unix2dos))
327IF_UPTIME(APPLET(uptime, BB_DIR_USR_BIN, BB_SUID_DROP))
328IF_USLEEP(APPLET_NOFORK(usleep, usleep, BB_DIR_BIN, BB_SUID_DROP, usleep))
329IF_UUDECODE(APPLET(uudecode, BB_DIR_USR_BIN, BB_SUID_DROP))
330IF_UUENCODE(APPLET(uuencode, BB_DIR_USR_BIN, BB_SUID_DROP))
331IF_VCONFIG(APPLET(vconfig, BB_DIR_SBIN, BB_SUID_DROP))
332IF_VOLNAME(APPLET(volname, BB_DIR_USR_BIN, BB_SUID_DROP))
333IF_WATCH(APPLET(watch, BB_DIR_BIN, BB_SUID_DROP))
334IF_WATCHDOG(APPLET(watchdog, BB_DIR_SBIN, BB_SUID_DROP))
335IF_WC(APPLET(wc, BB_DIR_USR_BIN, BB_SUID_DROP))
336IF_WHOAMI(APPLET_NOFORK(whoami, whoami, BB_DIR_USR_BIN, BB_SUID_DROP, whoami))
337IF_YES(APPLET_NOFORK(yes, yes, BB_DIR_USR_BIN, BB_SUID_DROP, yes))
338IF_ZCIP(APPLET(zcip, BB_DIR_SBIN, BB_SUID_DROP))
339 77
340#if !defined(PROTOTYPES) && !defined(NAME_MAIN) && !defined(MAKE_USAGE) \ 78#if !defined(PROTOTYPES) && !defined(NAME_MAIN) && !defined(MAKE_USAGE) \
341 && !defined(MAKE_LINKS) && !defined(MAKE_SUID) 79 && !defined(MAKE_LINKS) && !defined(MAKE_SUID)
diff --git a/include/libbb.h b/include/libbb.h
index 91702fa6e..a6de5e97b 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1482,46 +1482,46 @@ unsigned long long bb_makedev(unsigned major, unsigned minor) FAST_FUNC;
1482 * yet doesn't represent any valid Unicode character. 1482 * yet doesn't represent any valid Unicode character.
1483 * Also, -1 is reserved for error indication and we don't use it. */ 1483 * Also, -1 is reserved for error indication and we don't use it. */
1484enum { 1484enum {
1485 KEYCODE_UP = -2, 1485 KEYCODE_UP = -2,
1486 KEYCODE_DOWN = -3, 1486 KEYCODE_DOWN = -3,
1487 KEYCODE_RIGHT = -4, 1487 KEYCODE_RIGHT = -4,
1488 KEYCODE_LEFT = -5, 1488 KEYCODE_LEFT = -5,
1489 KEYCODE_HOME = -6, 1489 KEYCODE_HOME = -6,
1490 KEYCODE_END = -7, 1490 KEYCODE_END = -7,
1491 KEYCODE_INSERT = -8, 1491 KEYCODE_INSERT = -8,
1492 KEYCODE_DELETE = -9, 1492 KEYCODE_DELETE = -9,
1493 KEYCODE_PAGEUP = -10, 1493 KEYCODE_PAGEUP = -10,
1494 KEYCODE_PAGEDOWN = -11, 1494 KEYCODE_PAGEDOWN = -11,
1495 // -12 is reserved for Alt/Ctrl/Shift-TAB 1495 KEYCODE_BACKSPACE = -12, /* Used only if Alt/Ctrl/Shifted */
1496 KEYCODE_D = -13, /* Used only if Alted */
1496#if 0 1497#if 0
1497 KEYCODE_FUN1 = -13, 1498 KEYCODE_FUN1 = ,
1498 KEYCODE_FUN2 = -14, 1499 KEYCODE_FUN2 = ,
1499 KEYCODE_FUN3 = -15, 1500 KEYCODE_FUN3 = ,
1500 KEYCODE_FUN4 = -16, 1501 KEYCODE_FUN4 = ,
1501 KEYCODE_FUN5 = -17, 1502 KEYCODE_FUN5 = ,
1502 KEYCODE_FUN6 = -18, 1503 KEYCODE_FUN6 = ,
1503 KEYCODE_FUN7 = -19, 1504 KEYCODE_FUN7 = ,
1504 KEYCODE_FUN8 = -20, 1505 KEYCODE_FUN8 = ,
1505 KEYCODE_FUN9 = -21, 1506 KEYCODE_FUN9 = ,
1506 KEYCODE_FUN10 = -22, 1507 KEYCODE_FUN10 = ,
1507 KEYCODE_FUN11 = -23, 1508 KEYCODE_FUN11 = ,
1508 KEYCODE_FUN12 = -24, 1509 KEYCODE_FUN12 = ,
1509#endif 1510#endif
1510 /* Be sure that last defined value is small enough 1511 /* ^^^^^ Be sure that last defined value is small enough.
1511 * to not interfere with Alt/Ctrl/Shift bits. 1512 * Current read_key() code allows going up to -32 (0xfff..fffe0).
1512 * So far we do not exceed -31 (0xfff..fffe1), 1513 * This gives three upper bits in LSB to play with:
1513 * which gives us three upper bits in LSB to play with. 1514 * KEYCODE_foo values are 0xfff..fffXX, lowest XX bits are: scavvvvv,
1515 * s=0 if SHIFT, c=0 if CTRL, a=0 if ALT,
1516 * vvvvv bits are the same for same key regardless of "shift bits".
1514 */ 1517 */
1515 //KEYCODE_SHIFT_TAB = (-12) & ~0x80, 1518 //KEYCODE_SHIFT_... = KEYCODE_... & ~0x80,
1516 //KEYCODE_SHIFT_... = KEYCODE_... & ~0x80, 1519 KEYCODE_CTRL_RIGHT = KEYCODE_RIGHT & ~0x40,
1517 //KEYCODE_CTRL_UP = KEYCODE_UP & ~0x40, 1520 KEYCODE_CTRL_LEFT = KEYCODE_LEFT & ~0x40,
1518 //KEYCODE_CTRL_DOWN = KEYCODE_DOWN & ~0x40, 1521 KEYCODE_ALT_RIGHT = KEYCODE_RIGHT & ~0x20,
1519 KEYCODE_CTRL_RIGHT = KEYCODE_RIGHT & ~0x40, 1522 KEYCODE_ALT_LEFT = KEYCODE_LEFT & ~0x20,
1520 KEYCODE_CTRL_LEFT = KEYCODE_LEFT & ~0x40, 1523 KEYCODE_ALT_BACKSPACE = KEYCODE_BACKSPACE & ~0x20,
1521 //KEYCODE_ALT_UP = KEYCODE_UP & ~0x20, 1524 KEYCODE_ALT_D = KEYCODE_D & ~0x20,
1522 //KEYCODE_ALT_DOWN = KEYCODE_DOWN & ~0x20,
1523 KEYCODE_ALT_RIGHT = KEYCODE_RIGHT & ~0x20,
1524 KEYCODE_ALT_LEFT = KEYCODE_LEFT & ~0x20,
1525 1525
1526 KEYCODE_CURSOR_POS = -0x100, /* 0xfff..fff00 */ 1526 KEYCODE_CURSOR_POS = -0x100, /* 0xfff..fff00 */
1527 /* How long is the longest ESC sequence we know? 1527 /* How long is the longest ESC sequence we know?