5 files changed, 122 insertions, 376 deletions

diff --git a/include/applets.src.h b/include/applets.src.h
index 0e4f966de..879dbf760 100644
--- a/include/applets.src.h
+++ b/include/applets.src.h
@@ -56,11 +56,6 @@ s     - suid type:
 # define APPLET_NOFORK(name,main,l,s,name2)  { #name, #main, l, s, 1, 1 },
 #endif
 
-#if ENABLE_INSTALL_NO_USR
-# define _BB_DIR_USR_BIN _BB_DIR_BIN
-# define _BB_DIR_USR_SBIN _BB_DIR_SBIN
-#endif
-
 
 INSERT
 IF_TEST(APPLET_NOFORK([,  test, _BB_DIR_USR_BIN, _BB_SUID_DROP, test))
@@ -77,7 +72,6 @@ IF_BASENAME(APPLET_NOFORK(basename, basename, _BB_DIR_USR_BIN, _BB_SUID_DROP, ba
 IF_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_BEEP(APPLET(beep, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_BLKID(APPLET(blkid, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_BOOTCHARTD(APPLET(bootchartd, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_BRCTL(APPLET(brctl, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_BZIP2(APPLET(bzip2, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_CAL(APPLET(cal, _BB_DIR_USR_BIN, _BB_SUID_DROP))
@@ -94,7 +88,7 @@ IF_CHPST(APPLET(chpst, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_CHROOT(APPLET(chroot, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_CHRT(APPLET(chrt, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_CHVT(APPLET(chvt, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_CKSUM(APPLET(cksum, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+IF_CKSUM(APPLET_NOEXEC(cksum, cksum, _BB_DIR_USR_BIN, _BB_SUID_DROP, cksum))
 IF_CLEAR(APPLET(clear, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_CMP(APPLET(cmp, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_COMM(APPLET(comm, _BB_DIR_USR_BIN, _BB_SUID_DROP))
@@ -104,14 +98,11 @@ IF_CROND(APPLET(crond, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_CRONTAB(APPLET(crontab, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE))
 IF_CRYPTPW(APPLET(cryptpw, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_CUT(APPLET_NOEXEC(cut, cut, _BB_DIR_USR_BIN, _BB_SUID_DROP, cut))
-IF_DATE(APPLET(date, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_DC(APPLET(dc, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_DD(APPLET_NOEXEC(dd, dd, _BB_DIR_BIN, _BB_SUID_DROP, dd))
 IF_DEALLOCVT(APPLET(deallocvt, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_DELGROUP(APPLET_ODDNAME(delgroup, deluser, _BB_DIR_BIN, _BB_SUID_DROP, delgroup))
 IF_DELUSER(APPLET(deluser, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_DEPMOD(APPLET(depmod, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe))
 IF_DEVFSD(APPLET(devfsd, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_DEVMEM(APPLET(devmem, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_DF(APPLET(df, _BB_DIR_BIN, _BB_SUID_DROP))
@@ -121,7 +112,7 @@ IF_DIRNAME(APPLET_NOFORK(dirname, dirname, _BB_DIR_USR_BIN, _BB_SUID_DROP, dirna
 IF_DMESG(APPLET(dmesg, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_DNSD(APPLET(dnsd, _BB_DIR_USR_SBIN, _BB_SUID_REQUIRE))
 IF_HOSTNAME(APPLET_ODDNAME(dnsdomainname, hostname, _BB_DIR_BIN, _BB_SUID_DROP, dnsdomainname))
-IF_DOS2UNIX(APPLET(dos2unix, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+IF_DOS2UNIX(APPLET_NOEXEC(dos2unix, dos2unix, _BB_DIR_USR_BIN, _BB_SUID_DROP, dos2unix))
 IF_DPKG(APPLET(dpkg, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_DPKG_DEB(APPLET_ODDNAME(dpkg-deb, dpkg_deb, _BB_DIR_USR_BIN, _BB_SUID_DROP, dpkg_deb))
 IF_DU(APPLET(du, _BB_DIR_USR_BIN, _BB_SUID_DROP))
@@ -152,7 +143,7 @@ IF_FLASH_LOCK(APPLET_ODDNAME(flash_lock, flash_lock_unlock, _BB_DIR_USR_SBIN, _B
 IF_FLASH_UNLOCK(APPLET_ODDNAME(flash_unlock, flash_lock_unlock, _BB_DIR_USR_SBIN, _BB_SUID_DROP, flash_unlock))
 IF_FLASHCP(APPLET(flashcp, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_FLOCK(APPLET(flock, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_FOLD(APPLET(fold, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+IF_FOLD(APPLET_NOEXEC(fold, fold, _BB_DIR_USR_BIN, _BB_SUID_DROP, fold))
 IF_FREE(APPLET(free, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_FREERAMDISK(APPLET(freeramdisk, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_FSCK(APPLET(fsck, _BB_DIR_SBIN, _BB_SUID_DROP))
@@ -170,26 +161,22 @@ IF_GETSEBOOL(APPLET(getsebool, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_GETTY(APPLET(getty, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_GUNZIP(APPLET(gunzip, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_GZIP(APPLET(gzip, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_HALT(APPLET(halt, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_HD(APPLET_NOEXEC(hd, hexdump, _BB_DIR_USR_BIN, _BB_SUID_DROP, hd))
 IF_HDPARM(APPLET(hdparm, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_HEAD(APPLET(head, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+IF_HEAD(APPLET_NOEXEC(head, head, _BB_DIR_USR_BIN, _BB_SUID_DROP, head))
 IF_HEXDUMP(APPLET_NOEXEC(hexdump, hexdump, _BB_DIR_USR_BIN, _BB_SUID_DROP, hexdump))
 IF_HOSTID(APPLET_NOFORK(hostid, hostid, _BB_DIR_USR_BIN, _BB_SUID_DROP, hostid))
 IF_HOSTNAME(APPLET(hostname, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_HTTPD(APPLET(httpd, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_HWCLOCK(APPLET(hwclock, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_ID(APPLET(id, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+IF_ID(APPLET_NOEXEC(id, id, _BB_DIR_USR_BIN, _BB_SUID_DROP, id))
 IF_IFCONFIG(APPLET(ifconfig, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_IFUPDOWN(APPLET_ODDNAME(ifdown, ifupdown, _BB_DIR_SBIN, _BB_SUID_DROP, ifdown))
 IF_IFENSLAVE(APPLET(ifenslave, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_IFPLUGD(APPLET(ifplugd, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_IFUPDOWN(APPLET_ODDNAME(ifup, ifupdown, _BB_DIR_SBIN, _BB_SUID_DROP, ifup))
 IF_INETD(APPLET(inetd, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-IF_INIT(APPLET(init, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_INOTIFYD(APPLET(inotifyd, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_INSMOD(APPLET(insmod, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe))
 IF_INSTALL(APPLET(install, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_IONICE(APPLET(ionice, _BB_DIR_BIN, _BB_SUID_DROP))
 #if ENABLE_FEATURE_IP_ADDRESS \
@@ -217,7 +204,6 @@ IF_LENGTH(APPLET_NOFORK(length, length, _BB_DIR_USR_BIN, _BB_SUID_DROP, length))
 IF_LESS(APPLET(less, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_SETARCH(APPLET_ODDNAME(linux32, setarch, _BB_DIR_BIN, _BB_SUID_DROP, linux32))
 IF_SETARCH(APPLET_ODDNAME(linux64, setarch, _BB_DIR_BIN, _BB_SUID_DROP, linux64))
-IF_FEATURE_INITRD(APPLET_ODDNAME(linuxrc, init, _BB_DIR_ROOT, _BB_SUID_DROP, linuxrc))
 IF_LN(APPLET_NOEXEC(ln, ln, _BB_DIR_BIN, _BB_SUID_DROP, ln))
 IF_LOAD_POLICY(APPLET(load_policy, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_LOADFONT(APPLET(loadfont, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
@@ -232,8 +218,6 @@ IF_LPQ(APPLET_ODDNAME(lpq, lpqr, _BB_DIR_USR_BIN, _BB_SUID_DROP, lpq))
 IF_LPR(APPLET_ODDNAME(lpr, lpqr, _BB_DIR_USR_BIN, _BB_SUID_DROP, lpr))
 IF_LS(APPLET_NOEXEC(ls, ls, _BB_DIR_BIN, _BB_SUID_DROP, ls))
 IF_LSATTR(APPLET(lsattr, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_LSMOD(APPLET(lsmod, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_MODPROBE_SMALL(APPLET_ODDNAME(lsmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe))
 IF_LSPCI(APPLET(lspci, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_LSUSB(APPLET(lsusb, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_UNLZMA(APPLET_ODDNAME(lzcat, unlzma, _BB_DIR_USR_BIN, _BB_SUID_DROP, lzcat))
@@ -244,25 +228,22 @@ IF_MAKEDEVS(APPLET(makedevs, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_MAKEMIME(APPLET(makemime, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_MAN(APPLET(man, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_MATCHPATHCON(APPLET(matchpathcon, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-IF_MD5SUM(APPLET_ODDNAME(md5sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_DROP, md5sum))
+IF_MD5SUM(APPLET_NOEXEC(md5sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_DROP, md5sum))
 IF_MDEV(APPLET(mdev, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_MESG(APPLET(mesg, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_MICROCOM(APPLET(microcom, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_MKDIR(APPLET_NOFORK(mkdir, mkdir, _BB_DIR_BIN, _BB_SUID_DROP, mkdir))
 IF_MKFS_VFAT(APPLET_ODDNAME(mkdosfs, mkfs_vfat, _BB_DIR_SBIN, _BB_SUID_DROP, mkfs_vfat))
 IF_MKFS_EXT2(APPLET_ODDNAME(mke2fs, mkfs_ext2, _BB_DIR_SBIN, _BB_SUID_DROP, mkfs_ext2))
-IF_MKFIFO(APPLET(mkfifo, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+IF_MKFIFO(APPLET_NOEXEC(mkfifo, mkfifo, _BB_DIR_USR_BIN, _BB_SUID_DROP, mkfifo))
 IF_MKFS_EXT2(APPLET_ODDNAME(mkfs.ext2, mkfs_ext2, _BB_DIR_SBIN, _BB_SUID_DROP, mkfs_ext2))
 //IF_MKE2FS(APPLET_ODDNAME(mkfs.ext3, mke2fs, _BB_DIR_SBIN, _BB_SUID_DROP, mkfs_ext3))
 IF_MKFS_MINIX(APPLET_ODDNAME(mkfs.minix, mkfs_minix, _BB_DIR_SBIN, _BB_SUID_DROP, mkfs_minix))
 IF_MKFS_REISER(APPLET_ODDNAME(mkfs.reiser, mkfs_reiser, _BB_DIR_SBIN, _BB_SUID_DROP, mkfs_reiser))
 IF_MKFS_VFAT(APPLET_ODDNAME(mkfs.vfat, mkfs_vfat, _BB_DIR_SBIN, _BB_SUID_DROP, mkfs_vfat))
-IF_MKNOD(APPLET(mknod, _BB_DIR_BIN, _BB_SUID_DROP))
+IF_MKNOD(APPLET_NOEXEC(mknod, mknod, _BB_DIR_BIN, _BB_SUID_DROP, mknod))
 IF_CRYPTPW(APPLET_ODDNAME(mkpasswd, cryptpw, _BB_DIR_USR_BIN, _BB_SUID_DROP, mkpasswd))
 IF_MKSWAP(APPLET(mkswap, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_MKTEMP(APPLET(mktemp, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_MODPROBE(APPLET(modprobe, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_MODPROBE_SMALL(APPLET(modprobe, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_MORE(APPLET(more, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_MOUNT(APPLET(mount, _BB_DIR_BIN, IF_DESKTOP(_BB_SUID_MAYBE) IF_NOT_DESKTOP(_BB_SUID_DROP)))
 IF_MOUNTPOINT(APPLET(mountpoint, _BB_DIR_BIN, _BB_SUID_DROP))
@@ -289,8 +270,7 @@ IF_PIPE_PROGRESS(APPLET(pipe_progress, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_PIVOT_ROOT(APPLET(pivot_root, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_PKILL(APPLET_ODDNAME(pkill, pgrep, _BB_DIR_USR_BIN, _BB_SUID_DROP, pkill))
 IF_POPMAILDIR(APPLET(popmaildir, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-IF_HALT(APPLET_ODDNAME(poweroff, halt, _BB_DIR_SBIN, _BB_SUID_DROP, poweroff))
-IF_PRINTENV(APPLET(printenv, _BB_DIR_BIN, _BB_SUID_DROP))
+IF_PRINTENV(APPLET_NOFORK(printenv, printenv, _BB_DIR_BIN, _BB_SUID_DROP, printenv))
 IF_PRINTF(APPLET_NOFORK(printf, printf, _BB_DIR_USR_BIN, _BB_SUID_DROP, printf))
 IF_PS(APPLET(ps, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_PSCAN(APPLET(pscan, _BB_DIR_USR_BIN, _BB_SUID_DROP))
@@ -302,7 +282,6 @@ IF_READAHEAD(APPLET(readahead, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_READLINK(APPLET(readlink, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_READPROFILE(APPLET(readprofile, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_REALPATH(APPLET(realpath, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_HALT(APPLET_ODDNAME(reboot, halt, _BB_DIR_SBIN, _BB_SUID_DROP, reboot))
 IF_REFORMIME(APPLET(reformime, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_RENICE(APPLET(renice, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_RESET(APPLET(reset, _BB_DIR_USR_BIN, _BB_SUID_DROP))
@@ -311,8 +290,6 @@ IF_RESTORECON(APPLET_ODDNAME(restorecon, setfiles, _BB_DIR_SBIN, _BB_SUID_DROP,
 IF_RFKILL(APPLET(rfkill, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_RM(APPLET_NOFORK(rm, rm, _BB_DIR_BIN, _BB_SUID_DROP, rm))
 IF_RMDIR(APPLET_NOFORK(rmdir, rmdir, _BB_DIR_BIN, _BB_SUID_DROP, rmdir))
-IF_RMMOD(APPLET(rmmod, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_MODPROBE_SMALL(APPLET_ODDNAME(rmmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe))
 IF_ROUTE(APPLET(route, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_RPM(APPLET(rpm, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_RPM2CPIO(APPLET(rpm2cpio, _BB_DIR_USR_BIN, _BB_SUID_DROP))
@@ -340,12 +317,13 @@ IF_SETLOGCONS(APPLET(setlogcons, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_SETSEBOOL(APPLET(setsebool, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_SETSID(APPLET(setsid, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_SETUIDGID(APPLET_ODDNAME(setuidgid, chpst, _BB_DIR_USR_BIN, _BB_SUID_DROP, setuidgid))
-IF_SHA1SUM(APPLET_ODDNAME(sha1sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_DROP, sha1sum))
-IF_SHA256SUM(APPLET_ODDNAME(sha256sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_DROP, sha256sum))
-IF_SHA512SUM(APPLET_ODDNAME(sha512sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_DROP, sha512sum))
+IF_SHA1SUM(APPLET_NOEXEC(sha1sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_DROP, sha1sum))
+IF_SHA256SUM(APPLET_NOEXEC(sha256sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_DROP, sha256sum))
+IF_SHA512SUM(APPLET_NOEXEC(sha512sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_DROP, sha512sum))
 IF_SHOWKEY(APPLET(showkey, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_SLATTACH(APPLET(slattach, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_SLEEP(APPLET_NOFORK(sleep, sleep, _BB_DIR_BIN, _BB_SUID_DROP, sleep))
+/* Do not make this applet NOFORK. It breaks ^C-ing of pauses in shells */
+IF_SLEEP(APPLET(sleep, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_SOFTLIMIT(APPLET_ODDNAME(softlimit, chpst, _BB_DIR_USR_BIN, _BB_SUID_DROP, softlimit))
 IF_SORT(APPLET_NOEXEC(sort, sort, _BB_DIR_USR_BIN, _BB_SUID_DROP, sort))
 IF_SPLIT(APPLET(split, _BB_DIR_USR_BIN, _BB_SUID_DROP))
@@ -358,7 +336,7 @@ IF_SULOGIN(APPLET(sulogin, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_SUM(APPLET(sum, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_SV(APPLET(sv, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_SVLOGD(APPLET(svlogd, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-IF_SWAPONOFF(APPLET_ODDNAME(swapoff, swap_on_off, _BB_DIR_SBIN, _BB_SUID_DROP,swapoff))
+IF_SWAPONOFF(APPLET_ODDNAME(swapoff, swap_on_off, _BB_DIR_SBIN, _BB_SUID_DROP, swapoff))
 IF_SWAPONOFF(APPLET_ODDNAME(swapon, swap_on_off, _BB_DIR_SBIN, _BB_SUID_DROP, swapon))
 IF_SWITCH_ROOT(APPLET(switch_root, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_SYNC(APPLET_NOFORK(sync, sync, _BB_DIR_BIN, _BB_SUID_DROP, sync))
@@ -398,7 +376,7 @@ IF_UNAME(APPLET(uname, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_UNCOMPRESS(APPLET(uncompress, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_UNEXPAND(APPLET_ODDNAME(unexpand, expand, _BB_DIR_USR_BIN, _BB_SUID_DROP, unexpand))
 IF_UNIQ(APPLET(uniq, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_UNIX2DOS(APPLET_ODDNAME(unix2dos, dos2unix, _BB_DIR_USR_BIN, _BB_SUID_DROP, unix2dos))
+IF_UNIX2DOS(APPLET_NOEXEC(unix2dos, dos2unix, _BB_DIR_USR_BIN, _BB_SUID_DROP, unix2dos))
 IF_UNXZ(APPLET(unxz, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_UNLZMA(APPLET(unlzma, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_LZOP(APPLET_ODDNAME(unlzop, lzop, _BB_DIR_USR_BIN, _BB_SUID_DROP, unlzop))
diff --git a/include/busybox.h b/include/busybox.h
index 76415dd72..757317fc7 100644
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -16,8 +16,13 @@ typedef enum bb_install_loc_t {
         _BB_DIR_ROOT = 0,
         _BB_DIR_BIN,
         _BB_DIR_SBIN,
+#if ENABLE_INSTALL_NO_USR
+        _BB_DIR_USR_BIN  = _BB_DIR_BIN,
+        _BB_DIR_USR_SBIN = _BB_DIR_SBIN,
+#else
         _BB_DIR_USR_BIN,
-        _BB_DIR_USR_SBIN
+        _BB_DIR_USR_SBIN,
+#endif
 } bb_install_loc_t;
 
 typedef enum bb_suid_t {
diff --git a/include/libbb.h b/include/libbb.h
index 221837b64..9ece2f9ec 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1522,37 +1522,42 @@ unsigned get_cpu_count(void) FAST_FUNC;
 extern const char bb_uuenc_tbl_base64[];
 extern const char bb_uuenc_tbl_std[];
 void bb_uuencode(char *store, const void *s, int length, const char *tbl) FAST_FUNC;
+enum {
+        BASE64_FLAG_UU_STOP = 0x100,
+        /* Sign-extends to a value which never matches fgetc result: */
+        BASE64_FLAG_NO_STOP_CHAR = 0x80,
+};
+void FAST_FUNC read_base64(FILE *src_stream, FILE *dst_stream, int flags);
 
 typedef struct sha1_ctx_t {
         uint32_t hash[8];    /* 5, +3 elements for sha256 */
-        uint64_t total64;
+        uint64_t total64;    /* must be directly after hash[] */
         uint8_t wbuffer[64]; /* NB: always correctly aligned for uint64_t */
         void (*process_block)(struct sha1_ctx_t*) FAST_FUNC;
 } sha1_ctx_t;
 void sha1_begin(sha1_ctx_t *ctx) FAST_FUNC;
-void sha1_hash(const void *data, size_t length, sha1_ctx_t *ctx) FAST_FUNC;
-void sha1_end(void *resbuf, sha1_ctx_t *ctx) FAST_FUNC;
+void sha1_hash(sha1_ctx_t *ctx, const void *data, size_t length) FAST_FUNC;
+void sha1_end(sha1_ctx_t *ctx, void *resbuf) FAST_FUNC;
 typedef struct sha1_ctx_t sha256_ctx_t;
 void sha256_begin(sha256_ctx_t *ctx) FAST_FUNC;
 #define sha256_hash sha1_hash
 #define sha256_end sha1_end
 typedef struct sha512_ctx_t {
         uint64_t hash[8];
-        uint64_t total64[2];
+        uint64_t total64[2];  /* must be directly after hash[] */
         uint8_t wbuffer[128]; /* NB: always correctly aligned for uint64_t */
 } sha512_ctx_t;
 void sha512_begin(sha512_ctx_t *ctx) FAST_FUNC;
-void sha512_hash(const void *buffer, size_t len, sha512_ctx_t *ctx) FAST_FUNC;
-void sha512_end(void *resbuf, sha512_ctx_t *ctx) FAST_FUNC;
+void sha512_hash(sha512_ctx_t *ctx, const void *buffer, size_t len) FAST_FUNC;
+void sha512_end(sha512_ctx_t *ctx, void *resbuf) FAST_FUNC;
 #if 1
 typedef struct md5_ctx_t {
         uint32_t A;
         uint32_t B;
         uint32_t C;
         uint32_t D;
-        uint64_t total;
-        uint32_t buflen;
-        char buffer[128];
+        uint64_t total64;
+        char wbuffer[64];
 } md5_ctx_t;
 #else
 /* libbb/md5prime.c uses a bit different one: */
@@ -1563,8 +1568,8 @@ typedef struct md5_ctx_t {
 } md5_ctx_t;
 #endif
 void md5_begin(md5_ctx_t *ctx) FAST_FUNC;
-void md5_hash(const void *data, size_t length, md5_ctx_t *ctx) FAST_FUNC;
-void md5_end(void *resbuf, md5_ctx_t *ctx) FAST_FUNC;
+void md5_hash(md5_ctx_t *ctx, const void *data, size_t length) FAST_FUNC;
+void md5_end(md5_ctx_t *ctx, void *resbuf) FAST_FUNC;
 
 
 uint32_t *crc32_filltable(uint32_t *tbl256, int endian) FAST_FUNC;
diff --git a/include/platform.h b/include/platform.h
index 2b3ad42bd..ed8c137e1 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -215,6 +215,8 @@
 # define SWAP_LE16(x) bswap_16(x)
 # define SWAP_LE32(x) bswap_32(x)
 # define SWAP_LE64(x) bswap_64(x)
+# define IF_BIG_ENDIAN(...) __VA_ARGS__
+# define IF_LITTLE_ENDIAN(...)
 #else
 # define SWAP_BE16(x) bswap_16(x)
 # define SWAP_BE32(x) bswap_32(x)
@@ -222,6 +224,8 @@
 # define SWAP_LE16(x) (x)
 # define SWAP_LE32(x) (x)
 # define SWAP_LE64(x) (x)
+# define IF_BIG_ENDIAN(...)
+# define IF_LITTLE_ENDIAN(...) __VA_ARGS__
 #endif
 
 /* ---- Unaligned access ------------------------------------ */
diff --git a/include/usage.src.h b/include/usage.src.h
index 2866bdbba..5d7767bb4 100644
--- a/include/usage.src.h
+++ b/include/usage.src.h
@@ -18,21 +18,27 @@
 INSERT
 
 #define acpid_trivial_usage \
-       "[-d] [-c CONFDIR] [-l LOGFILE] [-e PROC_EVENT_FILE] [EVDEV_EVENT_FILE]..."
+       "[-d] [-c CONFDIR] [-l LOGFILE] [-a ACTIONFILE] [-M MAPFILE] [-e PROC_EVENT_FILE] [-p PIDFILE]"
 #define acpid_full_usage "\n\n" \
        "Listen to ACPI events and spawn specific helpers on event arrival\n" \
      "\nOptions:" \
-     "\n        -d      Don't daemonize, log to stderr" \
      "\n        -c DIR  Config directory [/etc/acpi]" \
+     "\n        -d      Don't daemonize, (implies -f)" \
      "\n        -e FILE /proc event file [/proc/acpi/event]" \
-     "\n        -l FILE Log file [/var/log/acpid]" \
+     "\n        -f      Run in foreground" \
+     "\n        -l FILE Log file [/var/log/acpid.log]" \
+     "\n        -p FILE Pid file [/var/run/acpid.pid]" \
+     "\n        -a FILE Action file [/etc/acpid.conf]" \
+     "\n        -M FILE Map file [/etc/acpi.map]" \
         IF_FEATURE_ACPID_COMPAT( \
      "\n\nAccept and ignore compatibility options -g -m -s -S -v" \
         )
 
 #define acpid_example_usage \
+       "Without -e option, acpid uses all /dev/input/event* files\n" \
+       "# acpid\n" \
        "# acpid -l /var/log/my-acpi-log\n" \
-       "# acpid -d /dev/input/event*\n"
+       "# acpid -e /proc/acpi/event\n"
 
 #define addgroup_trivial_usage \
        "[-g GID] " IF_FEATURE_ADDUSER_TO_GROUP("[USER] ") "GROUP"
@@ -95,7 +101,7 @@ INSERT
        "\n      -n              Don't resolve names" \
        "\n      -i IF           Network interface" \
        "\n      -D              Read <hwaddr> from given device" \
-       "\n      -A, -p AF       Protocol family" \
+       "\n      -A,-p AF        Protocol family" \
        "\n      -H HWTYPE       Hardware address type" \
 
 #define arping_trivial_usage \
@@ -214,7 +220,7 @@ INSERT
      "\n        -F      Don't store or verify checksum" \
 
 #define unlzma_trivial_usage \
-       "[OPTIONS] [FILE]..."
+       "[-cf] [FILE]..."
 #define unlzma_full_usage "\n\n" \
        "Decompress FILE (or stdin)\n" \
      "\nOptions:" \
@@ -222,7 +228,7 @@ INSERT
      "\n        -f      Force" \
 
 #define lzma_trivial_usage \
-       "-d [OPTIONS] [FILE]..."
+       "-d [-cf] [FILE]..."
 #define lzma_full_usage "\n\n" \
        "Decompress FILE (or stdin)\n" \
      "\nOptions:" \
@@ -236,7 +242,7 @@ INSERT
        "Decompress to stdout"
 
 #define unxz_trivial_usage \
-       "[OPTIONS] [FILE]..."
+       "[-cf] [FILE]..."
 #define unxz_full_usage "\n\n" \
        "Decompress FILE (or stdin)\n" \
      "\nOptions:" \
@@ -244,7 +250,7 @@ INSERT
      "\n        -f      Force" \
 
 #define xz_trivial_usage \
-       "-d [OPTIONS] [FILE]..."
+       "-d [-cf] [FILE]..."
 #define xz_full_usage "\n\n" \
        "Decompress FILE (or stdin)\n" \
      "\nOptions:" \
@@ -528,7 +534,7 @@ INSERT
        "Print the config file used by busybox build"
 
 #define chrt_trivial_usage \
-       "[OPTIONS] [PRIO] [PID | PROG ARGS]"
+       "[-prfom] [PRIO] [PID | PROG ARGS]"
 #define chrt_full_usage "\n\n" \
        "Change scheduling priority and class for a process\n" \
      "\nOptions:" \
@@ -696,46 +702,6 @@ INSERT
        "$ echo \"Hello world\" | cut -f 2 -d ' '\n" \
        "world\n"
 
-#define date_trivial_usage \
-       "[OPTIONS] [+FMT] [TIME]"
-#define date_full_usage "\n\n" \
-       "Display time (using +FMT), or set time\n" \
-     "\nOptions:" \
-        IF_NOT_LONG_OPTS( \
-     "\n        [-s] TIME       Set time to TIME" \
-     "\n        -u              Work in UTC (don't convert to local time)" \
-     "\n        -R              Output RFC-2822 compliant date string" \
-        ) IF_LONG_OPTS( \
-     "\n        [-s,--set] TIME Set time to TIME" \
-     "\n        -u,--utc        Work in UTC (don't convert to local time)" \
-     "\n        -R,--rfc-2822   Output RFC-2822 compliant date string" \
-        ) \
-        IF_FEATURE_DATE_ISOFMT( \
-     "\n        -I[SPEC]        Output ISO-8601 compliant date string" \
-     "\n                        SPEC='date' (default) for date only," \
-     "\n                        'hours', 'minutes', or 'seconds' for date and" \
-     "\n                        time to the indicated precision" \
-        ) IF_NOT_LONG_OPTS( \
-     "\n        -r FILE         Display last modification time of FILE" \
-     "\n        -d TIME         Display TIME, not 'now'" \
-        ) IF_LONG_OPTS( \
-     "\n        -r,--reference FILE     Display last modification time of FILE" \
-     "\n        -d,--date TIME  Display TIME, not 'now'" \
-        ) \
-        IF_FEATURE_DATE_ISOFMT( \
-     "\n        -D FMT          Use FMT for -d TIME conversion" \
-        ) \
-     "\n" \
-     "\nRecognized TIME formats:" \
-     "\n        hh:mm[:ss]" \
-     "\n        [YYYY.]MM.DD-hh:mm[:ss]" \
-     "\n        YYYY-MM-DD hh:mm[:ss]" \
-     "\n        [[[[[YY]YY]MM]DD]hh]mm[.ss]" \
-
-#define date_example_usage \
-       "$ date\n" \
-       "Wed Apr 12 18:52:41 MDT 2000\n"
-
 #define dd_trivial_usage \
        "[if=FILE] [of=FILE] " IF_FEATURE_DD_IBS_OBS("[ibs=N] [obs=N] ") "[bs=N] [count=N] [skip=N]\n" \
        "        [seek=N]" IF_FEATURE_DD_IBS_OBS(" [conv=notrunc|noerror|sync|fsync]")
@@ -785,9 +751,6 @@ INSERT
 #define deluser_full_usage "\n\n" \
        "Delete USER from the system"
 
-#define depmod_trivial_usage NOUSAGE_STR
-#define depmod_full_usage ""
-
 #define devmem_trivial_usage \
         "ADDRESS [WIDTH [VALUE]]"
 
@@ -910,7 +873,7 @@ INSERT
      "\n                        nameserver NORNAL_DNS_SERVER" \
 
 #define dos2unix_trivial_usage \
-       "[OPTIONS] [FILE]"
+       "[-ud] [FILE]"
 #define dos2unix_full_usage "\n\n" \
        "Convert FILE in-place from DOS to Unix format.\n" \
        "When no file is given, use stdin/stdout.\n" \
@@ -919,7 +882,7 @@ INSERT
      "\n        -d      unix2dos" \
 
 #define unix2dos_trivial_usage \
-       "[OPTIONS] [FILE]"
+       "[-ud] [FILE]"
 #define unix2dos_full_usage "\n\n" \
        "Convert FILE in-place from Unix to DOS format.\n" \
        "When no file is given, use stdin/stdout.\n" \
@@ -1295,7 +1258,7 @@ INSERT
      "\n        -w      Use WIDTH columns instead of 80" \
 
 #define free_trivial_usage \
-       ""
+       "" IF_DESKTOP("[-b/k/m/g]")
 #define free_full_usage "\n\n" \
        "Display the amount of free and used system memory"
 #define free_example_usage \
@@ -1400,8 +1363,7 @@ INSERT
        "Find processes which use FILEs or PORTs\n" \
      "\nOptions:" \
      "\n        -m      Find processes which use same fs as FILEs" \
-     "\n        -4      Search only IPv4 space" \
-     "\n        -6      Search only IPv6 space" \
+     "\n        -4,-6   Search only IPv4/IPv6 space" \
      "\n        -s      Don't display PIDs" \
      "\n        -k      Kill found processes" \
      "\n        -SIGNAL Signal to send (default: KILL)" \
@@ -1479,7 +1441,7 @@ INSERT
      "\n        -H HOST         Log HOST into the utmp file as the hostname" \
 
 #define gunzip_trivial_usage \
-       "[OPTIONS] [FILE]..."
+       "[-cft] [FILE]..."
 #define gunzip_full_usage "\n\n" \
        "Decompress FILEs (or stdin)\n" \
      "\nOptions:" \
@@ -1495,7 +1457,7 @@ INSERT
        "-rw-rw-r--    1 andersen andersen  1761280 Apr 14 17:47 /tmp/BusyBox-0.43.tar\n"
 
 #define gzip_trivial_usage \
-       "[OPTIONS] [FILE]..."
+       "[-cfd] [FILE]..."
 #define gzip_full_usage "\n\n" \
        "Compress FILEs (or stdin)\n" \
      "\nOptions:" \
@@ -1510,18 +1472,6 @@ INSERT
        "$ ls -la /tmp/busybox*\n" \
        "-rw-rw-r--    1 andersen andersen   554058 Apr 14 17:49 /tmp/busybox.tar.gz\n"
 
-#define halt_trivial_usage \
-       "[-d DELAY] [-n] [-f]" IF_FEATURE_WTMP(" [-w]")
-#define halt_full_usage "\n\n" \
-       "Halt the system\n" \
-     "\nOptions:" \
-     "\n        -d      Delay interval for halting" \
-     "\n        -n      No call to sync()" \
-     "\n        -f      Force halt (don't go through init)" \
-        IF_FEATURE_WTMP( \
-     "\n        -w      Only write a wtmp record" \
-        )
-
 #define hdparm_trivial_usage \
        "[OPTIONS] [DEVICE]"
 #define hdparm_full_usage "\n\n" \
@@ -1679,7 +1629,7 @@ INSERT
      "\n        -i              Inetd mode" \
      "\n        -f              Don't daemonize" \
      "\n        -v[v]           Verbose" \
-     "\n        -p [IP:]PORT    Bind to ip:port (default *:80)" \
+     "\n        -p [IP:]PORT    Bind to IP:PORT (default *:80)" \
         IF_FEATURE_HTTPD_SETUID( \
      "\n        -u USER[:GRP]   Set uid/gid after binding to port") \
         IF_FEATURE_HTTPD_BASIC_AUTH( \
@@ -1716,13 +1666,13 @@ INSERT
        "Print information about USER or the current user\n" \
      "\nOptions:" \
         IF_SELINUX( \
-     "\n        -Z      Print the security context" \
+     "\n        -Z      Security context" \
         ) \
-     "\n        -u      Print user ID" \
-     "\n        -g      Print group ID" \
-     "\n        -G      Print supplementary group IDs" \
-     "\n        -n      Print name instead of a number" \
-     "\n        -r      Print real user ID instead of effective ID" \
+     "\n        -u      User ID" \
+     "\n        -g      Group ID" \
+     "\n        -G      Supplementary group IDs" \
+     "\n        -n      Print names instead of numbers" \
+     "\n        -r      Print real ID instead of effective ID" \
 
 #define id_example_usage \
        "$ id\n" \
@@ -1754,10 +1704,10 @@ INSERT
 #define ifenslave_full_usage "\n\n" \
        "Configure network interfaces for parallel routing\n" \
      "\nOptions:" \
-     "\n        -c, --change-active     Change active slave" \
-     "\n        -d, --detach            Remove slave interface from bonding device" \
-     "\n        -f, --force             Force, even if interface is not Ethernet" \
-/*   "\n        -r, --receive-slave     Create a receive-only slave" */
+     "\n        -c,--change-active      Change active slave" \
+     "\n        -d,--detach             Remove slave interface from bonding device" \
+     "\n        -f,--force              Force, even if interface is not Ethernet" \
+/*   "\n        -r,--receive-slave      Create a receive-only slave" */
 
 #define ifenslave_example_usage \
        "To create a bond device, simply follow these three steps:\n" \
@@ -1802,7 +1752,7 @@ INSERT
      "\n        -k              Kill running daemon" \
 
 #define ifup_trivial_usage \
-       "[-ain"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] IFACE..."
+       "[-an"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] [-i FILE] IFACE..."
 #define ifup_full_usage "\n\n" \
        "Options:" \
      "\n        -a      De/configure all interfaces automatically" \
@@ -1816,7 +1766,7 @@ INSERT
      "\n        -f      Force de/configuration" \
 
 #define ifdown_trivial_usage \
-       "[-ain"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] ifaces..."
+       "[-an"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] [-i FILE] IFACE..."
 #define ifdown_full_usage "\n\n" \
        "Options:" \
      "\n        -a      De/configure all interfaces automatically" \
@@ -1840,138 +1790,6 @@ INSERT
      "\n        -R N    Pause services after N connects/min" \
      "\n                (default: 0 - disabled)" \
 
-#define init_trivial_usage \
-       ""
-#define init_full_usage "\n\n" \
-       "Init is the parent of all processes"
-
-#define init_notes_usage \
-"This version of init is designed to be run only by the kernel.\n" \
-"\n" \
-"BusyBox init doesn't support multiple runlevels. The runlevels field of\n" \
-"the /etc/inittab file is completely ignored by BusyBox init. If you want\n" \
-"runlevels, use sysvinit.\n" \
-"\n" \
-"BusyBox init works just fine without an inittab. If no inittab is found,\n" \
-"it has the following default behavior:\n" \
-"\n" \
-"       ::sysinit:/etc/init.d/rcS\n" \
-"       ::askfirst:/bin/sh\n" \
-"       ::ctrlaltdel:/sbin/reboot\n" \
-"       ::shutdown:/sbin/swapoff -a\n" \
-"       ::shutdown:/bin/umount -a -r\n" \
-"       ::restart:/sbin/init\n" \
-"\n" \
-"if it detects that /dev/console is _not_ a serial console, it will also run:\n" \
-"\n" \
-"       tty2::askfirst:/bin/sh\n" \
-"       tty3::askfirst:/bin/sh\n" \
-"       tty4::askfirst:/bin/sh\n" \
-"\n" \
-"If you choose to use an /etc/inittab file, the inittab entry format is as follows:\n" \
-"\n" \
-"       <id>:<runlevels>:<action>:<process>\n" \
-"\n" \
-"       <id>:\n" \
-"\n" \
-"               WARNING: This field has a non-traditional meaning for BusyBox init!\n" \
-"               The id field is used by BusyBox init to specify the controlling tty for\n" \
-"               the specified process to run on. The contents of this field are\n" \
-"               appended to \"/dev/\" and used as-is. There is no need for this field to\n" \
-"               be unique, although if it isn't you may have strange results. If this\n" \
-"               field is left blank, the controlling tty is set to the console. Also\n" \
-"               note that if BusyBox detects that a serial console is in use, then only\n" \
-"               entries whose controlling tty is either the serial console or /dev/null\n" \
-"               will be run. BusyBox init does nothing with utmp. We don't need no\n" \
-"               stinkin' utmp.\n" \
-"\n" \
-"       <runlevels>:\n" \
-"\n" \
-"               The runlevels field is completely ignored.\n" \
-"\n" \
-"       <action>:\n" \
-"\n" \
-"               Valid actions include: sysinit, respawn, askfirst, wait,\n" \
-"               once, restart, ctrlaltdel, and shutdown.\n" \
-"\n" \
-"               The available actions can be classified into two groups: actions\n" \
-"               that are run only once, and actions that are re-run when the specified\n" \
-"               process exits.\n" \
-"\n" \
-"               Run only-once actions:\n" \
-"\n" \
-"                       'sysinit' is the first item run on boot. init waits until all\n" \
-"                       sysinit actions are completed before continuing. Following the\n" \
-"                       completion of all sysinit actions, all 'wait' actions are run.\n" \
-"                       'wait' actions, like 'sysinit' actions, cause init to wait until\n" \
-"                       the specified task completes. 'once' actions are asynchronous,\n" \
-"                       therefore, init does not wait for them to complete. 'restart' is\n" \
-"                       the action taken to restart the init process. By default this should\n" \
-"                       simply run /sbin/init, but can be a script which runs pivot_root or it\n" \
-"                       can do all sorts of other interesting things. The 'ctrlaltdel' init\n" \
-"                       actions are run when the system detects that someone on the system\n" \
-"                       console has pressed the CTRL-ALT-DEL key combination. Typically one\n" \
-"                       wants to run 'reboot' at this point to cause the system to reboot.\n" \
-"                       Finally the 'shutdown' action specifies the actions to taken when\n" \
-"                       init is told to reboot. Unmounting filesystems and disabling swap\n" \
-"                       is a very good here.\n" \
-"\n" \
-"               Run repeatedly actions:\n" \
-"\n" \
-"                       'respawn' actions are run after the 'once' actions. When a process\n" \
-"                       started with a 'respawn' action exits, init automatically restarts\n" \
-"                       it. Unlike sysvinit, BusyBox init does not stop processes from\n" \
-"                       respawning out of control. The 'askfirst' actions acts just like\n" \
-"                       respawn, except that before running the specified process it\n" \
-"                       displays the line \"Please press Enter to activate this console.\"\n" \
-"                       and then waits for the user to press enter before starting the\n" \
-"                       specified process.\n" \
-"\n" \
-"               Unrecognized actions (like initdefault) will cause init to emit an\n" \
-"               error message, and then go along with its business. All actions are\n" \
-"               run in the order they appear in /etc/inittab.\n" \
-"\n" \
-"       <process>:\n" \
-"\n" \
-"               Specifies the process to be executed and its command line.\n" \
-"\n" \
-"Example /etc/inittab file:\n" \
-"\n" \
-"       # This is run first except when booting in single-user mode\n" \
-"       #\n" \
-"       ::sysinit:/etc/init.d/rcS\n" \
-"       \n" \
-"       # /bin/sh invocations on selected ttys\n" \
-"       #\n" \
-"       # Start an \"askfirst\" shell on the console (whatever that may be)\n" \
-"       ::askfirst:-/bin/sh\n" \
-"       # Start an \"askfirst\" shell on /dev/tty2-4\n" \
-"       tty2::askfirst:-/bin/sh\n" \
-"       tty3::askfirst:-/bin/sh\n" \
-"       tty4::askfirst:-/bin/sh\n" \
-"       \n" \
-"       # /sbin/getty invocations for selected ttys\n" \
-"       #\n" \
-"       tty4::respawn:/sbin/getty 38400 tty4\n" \
-"       tty5::respawn:/sbin/getty 38400 tty5\n" \
-"       \n" \
-"       \n" \
-"       # Example of how to put a getty on a serial line (for a terminal)\n" \
-"       #\n" \
-"       #::respawn:/sbin/getty -L ttyS0 9600 vt100\n" \
-"       #::respawn:/sbin/getty -L ttyS1 9600 vt100\n" \
-"       #\n" \
-"       # Example how to put a getty on a modem line\n" \
-"       #::respawn:/sbin/getty 57600 ttyS2\n" \
-"       \n" \
-"       # Stuff to do when restarting the init process\n" \
-"       ::restart:/sbin/init\n" \
-"       \n" \
-"       # Stuff to do before rebooting\n" \
-"       ::ctrlaltdel:/sbin/reboot\n" \
-"       ::shutdown:/bin/umount -a -r\n" \
-"       ::shutdown:/sbin/swapoff -a\n"
-
 #define inotifyd_trivial_usage \
         "PROG FILE1[:MASK]..."
 #define inotifyd_full_usage "\n\n" \
@@ -2303,7 +2121,7 @@ INSERT
        "root\n"
 
 #define logread_trivial_usage \
-       "[OPTIONS]"
+       "[-f]"
 #define logread_full_usage "\n\n" \
        "Show messages in syslogd's circular buffer\n" \
      "\nOptions:" \
@@ -2430,11 +2248,6 @@ INSERT
      "\n        -l      List long flag names" \
      "\n        -v      List the file's version/generation number" \
 
-#define lsmod_trivial_usage \
-       ""
-#define lsmod_full_usage "\n\n" \
-       "List the currently loaded kernel modules"
-
 #define lspci_trivial_usage \
        "[-mk]"
 #define lspci_full_usage "\n\n" \
@@ -2520,7 +2333,7 @@ INSERT
      "\nOther options are silently ignored" \
 
 #define man_trivial_usage \
-       "[OPTIONS] [MANPAGE]..."
+       "[-aw] [MANPAGE]..."
 #define man_full_usage "\n\n" \
        "Format and display manual page\n" \
      "\nOptions:" \
@@ -2537,8 +2350,8 @@ INSERT
      "\n        -V      Verify file context on disk matches defaults" \
 
 #define md5sum_trivial_usage \
-       "[OPTIONS] [FILE]..." \
-        IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: md5sum [OPTIONS] -c [FILE]")
+       "[FILE]..." \
+        IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: md5sum -c [-sw] [FILE]")
 #define md5sum_full_usage "\n\n" \
        "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " MD5 checksums" \
         IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n" \
@@ -2559,8 +2372,8 @@ INSERT
        "^D\n"
 
 #define sha1sum_trivial_usage \
-       "[OPTIONS] [FILE]..." \
-        IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: sha1sum [OPTIONS] -c [FILE]")
+       "[FILE]..." \
+        IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: sha1sum -c [-sw] [FILE]")
 #define sha1sum_full_usage "\n\n" \
        "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA1 checksums" \
         IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n" \
@@ -2571,8 +2384,8 @@ INSERT
         )
 
 #define sha256sum_trivial_usage \
-       "[OPTIONS] [FILE]..." \
-        IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: sha256sum [OPTIONS] -c [FILE]")
+       "[FILE]..." \
+        IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: sha256sum -c [-sw] [FILE]")
 #define sha256sum_full_usage "\n\n" \
        "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA256 checksums" \
         IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n" \
@@ -2583,8 +2396,8 @@ INSERT
         )
 
 #define sha512sum_trivial_usage \
-       "[OPTIONS] [FILE]..." \
-        IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: sha512sum [OPTIONS] -c [FILE]")
+       "[FILE]..." \
+        IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: sha512sum -c [-sw] [FILE]")
 #define sha512sum_full_usage "\n\n" \
        "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA512 checksums" \
         IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n" \
@@ -2628,13 +2441,6 @@ INSERT
        "the last line match .* to override this.)\n\n" \
         )
 
-#define mesg_trivial_usage \
-       "[y|n]"
-#define mesg_full_usage "\n\n" \
-       "Control write access to your terminal\n" \
-       "        y       Allow write access to your terminal\n" \
-       "        n       Disallow write access to your terminal"
-
 #define microcom_trivial_usage \
        "[-d DELAY] [-t TIMEOUT] [-s SPEED] [-X] TTY"
 #define microcom_full_usage "\n\n" \
@@ -2651,7 +2457,7 @@ INSERT
 #define mkdir_full_usage "\n\n" \
        "Create DIRECTORY\n" \
      "\nOptions:" \
-     "\n        -m      Mode" \
+     "\n        -m MODE Mode" \
      "\n        -p      No error if exists; make parent directories as needed" \
         IF_SELINUX( \
      "\n        -Z      Set security context" \
@@ -2666,9 +2472,9 @@ INSERT
        "$ mkdir -p /tmp/foo/bar/baz\n"
 
 #define mkfifo_trivial_usage \
-       "[OPTIONS] name"
+       "[-m MODE] " IF_SELINUX("[-Z] ") "NAME"
 #define mkfifo_full_usage "\n\n" \
-       "Create named pipe (identical to 'mknod name p')\n" \
+       "Create named pipe\n" \
      "\nOptions:" \
      "\n        -m MODE Mode (default a=rw)" \
         IF_SELINUX( \
@@ -2750,25 +2556,25 @@ INSERT
      "\n        -n LBL  Volume label" \
 
 #define mknod_trivial_usage \
-       "[OPTIONS] NAME TYPE MAJOR MINOR"
+       "[-m MODE] " IF_SELINUX("[-Z] ") "NAME TYPE MAJOR MINOR"
 #define mknod_full_usage "\n\n" \
        "Create a special file (block, character, or pipe)\n" \
      "\nOptions:" \
-     "\n        -m      Create the special file using the specified mode (default a=rw)" \
-     "\nTYPEs include:" \
-     "\n        b:      Make a block device" \
-     "\n        c or u: Make a character device" \
-     "\n        p:      Make a named pipe (MAJOR and MINOR are ignored)" \
+     "\n        -m MODE Creation mode (default a=rw)" \
         IF_SELINUX( \
      "\n        -Z      Set security context" \
-        )
+        ) \
+     "\nTYPE:" \
+     "\n        b       Block device" \
+     "\n        c or u  Character device" \
+     "\n        p       Named pipe (MAJOR and MINOR are ignored)" \
 
 #define mknod_example_usage \
        "$ mknod /dev/fd0 b 2 0\n" \
        "$ mknod -m 644 /tmp/pipe p\n"
 
 #define mkswap_trivial_usage \
-       "[OPTIONS] BLOCKDEV [KBYTES]"
+       "[-L LBL] BLOCKDEV [KBYTES]"
 #define mkswap_full_usage "\n\n" \
        "Prepare BLOCKDEV to be used as swap partition\n" \
      "\nOptions:" \
@@ -2890,8 +2696,8 @@ INSERT
        "setpart tell unload unlock weof wset" \
 
 #define mv_trivial_usage \
-       "[OPTIONS] SOURCE DEST\n" \
-       "or: mv [OPTIONS] SOURCE... DIRECTORY"
+       "[-fi] SOURCE DEST\n" \
+       "or: mv [-fi] SOURCE... DIRECTORY"
 #define mv_full_usage "\n\n" \
        "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY\n" \
      "\nOptions:" \
@@ -3026,7 +2832,7 @@ INSERT
        "Change USER's password. If no USER is specified,\n" \
        "changes the password for the current user.\n" \
      "\nOptions:" \
-     "\n        -a      Algorithm to use for password (des, md5)" /* ", sha1)" */ \
+     "\n        -a ALG  Algorithm to use for password (des, md5)" /* ", sha1)" */ \
      "\n        -d      Delete password for the account" \
      "\n        -l      Lock (disable) account" \
      "\n        -u      Unlock (re-enable) account" \
@@ -3093,10 +2899,12 @@ INSERT
        "List PIDs of all processes with names that match NAMEs" \
         USAGE_PIDOF \
         IF_FEATURE_PIDOF_SINGLE( \
-     "\n        -s      Show only one PID") \
+     "\n        -s      Show only one PID" \
+        ) \
         IF_FEATURE_PIDOF_OMIT( \
      "\n        -o PID  Omit given pid" \
-     "\n                Use %PPID to omit pid of pidof's parent") \
+     "\n                Use %PPID to omit pid of pidof's parent" \
+        ) \
 
 #define pidof_example_usage \
        "$ pidof init\n" \
@@ -3121,7 +2929,7 @@ INSERT
 #define ping_full_usage "\n\n" \
        "Send ICMP ECHO_REQUEST packets to network hosts\n" \
      "\nOptions:" \
-     "\n        -4, -6          Force IP or IPv6 name resolution" \
+     "\n        -4,-6           Force IP or IPv6 name resolution" \
      "\n        -c CNT          Send only CNT pings" \
      "\n        -s SIZE         Send SIZE data bytes in packets (default:56)" \
      "\n        -I IFACE/IP     Use interface or IP address as source" \
@@ -3216,15 +3024,6 @@ INSERT
        "$ popmaildir -k ~/Maildir -- nc pop.drvv.ru 110 [<password_file]\n" \
        "$ popmaildir ~/Maildir -- openssl s_client -quiet -connect pop.gmail.com:995 [<password_file]\n"
 
-#define poweroff_trivial_usage \
-       "[-d DELAY] [-n] [-f]"
-#define poweroff_full_usage "\n\n" \
-       "Halt and shut off power\n" \
-     "\nOptions:" \
-     "\n        -d      Delay interval for halting" \
-     "\n        -n      Do not sync" \
-     "\n        -f      Force power off (don't go through init)" \
-
 #define printenv_trivial_usage \
        "[VARIABLE]..."
 #define printenv_full_usage "\n\n" \
@@ -3367,15 +3166,6 @@ INSERT
 #define realpath_full_usage "\n\n" \
        "Return the absolute pathnames of given FILE"
 
-#define reboot_trivial_usage \
-       "[-d DELAY] [-n] [-f]"
-#define reboot_full_usage "\n\n" \
-       "Reboot the system\n" \
-     "\nOptions:" \
-     "\n        -d      Delay interval for rebooting" \
-     "\n        -n      No call to sync()" \
-     "\n        -f      Force reboot (don't go through init)" \
-
 #define reformime_trivial_usage \
        "[OPTIONS] [FILE]..."
 #define reformime_full_usage "\n\n" \
@@ -3431,7 +3221,7 @@ INSERT
      "\n                wimax, wwan, gps, fm" \
 
 #define rm_trivial_usage \
-       "[OPTIONS] FILE..."
+       "[-irf] FILE..."
 #define rm_full_usage "\n\n" \
        "Remove (unlink) FILEs\n" \
      "\nOptions:" \
@@ -3458,18 +3248,6 @@ INSERT
 #define rmdir_example_usage \
        "# rmdir /tmp/foo\n"
 
-#define rmmod_trivial_usage \
-       "[OPTIONS] [MODULE]..."
-#define rmmod_full_usage "\n\n" \
-       "Unload the specified kernel modules from the kernel\n" \
-     "\nOptions:" \
-     "\n        -w      Wait until the module is no longer used" \
-     "\n        -f      Force unloading" \
-     "\n        -a      Remove all unused modules (recursively)" \
-
-#define rmmod_example_usage \
-       "$ rmmod tulip\n"
-
 #define route_trivial_usage \
        "[{add|del|delete}]"
 #define route_full_usage "\n\n" \
@@ -3849,9 +3627,9 @@ INSERT
        "[OPTIONS] [INPUT [PREFIX]]"
 #define split_full_usage "\n\n" \
        "Options:" \
-     "\n        -b n[k|m]       Split by bytes" \
-     "\n        -l n            Split by lines" \
-     "\n        -a n            Use n letters as suffix" \
+     "\n        -b N[k|m]       Split by N (kilo|mega)bytes" \
+     "\n        -l N            Split by N lines" \
+     "\n        -a N            Use N letters as suffix" \
 
 #define split_example_usage \
        "$ split TODO foo\n" \
@@ -4080,7 +3858,7 @@ INSERT
        "Write all buffered blocks to disk"
 
 #define fsync_trivial_usage \
-       "[OPTIONS] FILE..."
+       "[-d] FILE..."
 #define fsync_full_usage "\n\n" \
        "Write files' buffered blocks to disk\n" \
      "\nOptions:" \
@@ -4156,7 +3934,7 @@ INSERT
        "pid 1's current affinity mask: 3\n"
 
 #define tee_trivial_usage \
-       "[OPTIONS] [FILE]..."
+       "[-ai] [FILE]..."
 #define tee_full_usage "\n\n" \
        "Copy stdin to each FILE, and also to stdout\n" \
      "\nOptions:" \
@@ -4261,7 +4039,7 @@ INSERT
      "\n        -u USER[:GRP]   Change to user/group after bind" \
      "\n        -c N            Handle up to N connections simultaneously" \
      "\n        -b N            Allow a backlog of approximately N TCP SYNs" \
-     "\n        -C N[:MSG]      Allow only up to N connections from the same IP" \
+     "\n        -C N[:MSG]      Allow only up to N connections from the same IP." \
      "\n                        New connections from this IP address are closed" \
      "\n                        immediately. MSG is written to the peer before close" \
      "\n        -h              Look up peer's hostname" \
@@ -4317,7 +4095,7 @@ INSERT
      "\n        -u      Access files as USER" \
 
 #define time_trivial_usage \
-       "[OPTIONS] PROG ARGS"
+       "[-v] PROG ARGS"
 #define time_full_usage "\n\n" \
        "Run PROG, display resource usage when it exits\n" \
      "\nOptions:" \
@@ -4338,12 +4116,13 @@ INSERT
 //TODO: add options and keyboard commands
 
 #define touch_trivial_usage \
-       "[-c] [-d DATE] FILE [FILE]..."
+       "[-c] [-d DATE] [-r FILE] FILE [FILE]..."
 #define touch_full_usage "\n\n" \
        "Update the last-modified date on the given FILE[s]\n" \
      "\nOptions:" \
      "\n        -c      Don't create files" \
      "\n        -d DT   Date/time to use" \
+     "\n        -r FILE Use FILE's date/time" \
 
 #define touch_example_usage \
        "$ ls -l /tmp/foo\n" \
@@ -4373,7 +4152,7 @@ INSERT
        "Trace the route to HOST\n" \
      "\nOptions:" \
         IF_TRACEROUTE6( \
-     "\n        -4, -6  Force IP or IPv6 name resolution" \
+     "\n        -4,-6   Force IP or IPv6 name resolution" \
         ) \
      "\n        -F      Set the don't fragment bit" \
      "\n        -I      Use ICMP ECHO instead of UDP datagrams" \
@@ -4453,18 +4232,6 @@ INSERT
        "# tunctl\n" \
        "# tunctl -d tun0\n"
 
-#define tune2fs_trivial_usage \
-/*     "[-c max-mounts-count] [-e errors-behavior] [-g group] " */ \
-/*     "[-i interval[d|m|w]] [-j] [-J journal-options] [-l] [-s sparse-flag] " */ \
-/*     "[-m reserved-blocks-percent] [-o [^]mount-options[,...]] " */ \
-/*     "[-r reserved-blocks-count] [-u user] [-C mount-count] " */ \
-       "[-L LABEL] " \
-/*     "[-M last-mounted-dir] [-O [^]feature[,...]] " */ \
-/*     "[-T last-check-time] [-U UUID] " */ \
-       "BLOCKDEV"
-#define tune2fs_full_usage "\n\n" \
-       "Adjust filesystem options on ext[23] filesystems"
-
 #if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
 # define IF_UDHCP_VERBOSE(...) __VA_ARGS__
 #else
@@ -4708,13 +4475,15 @@ INSERT
        "Edit FILE\n" \
      "\nOptions:" \
         IF_FEATURE_VI_COLON( \
-     "\n        -c      Initial command to run ($EXINIT also available)") \
+     "\n        -c      Initial command to run ($EXINIT also available)" \
+        ) \
         IF_FEATURE_VI_READONLY( \
-     "\n        -R      Read-only") \
+     "\n        -R      Read-only" \
+        ) \
      "\n        -H      Short help regarding available features" \
 
 #define vlock_trivial_usage \
-       "[OPTIONS]"
+       "[-a]"
 #define vlock_full_usage "\n\n" \
        "Lock a virtual terminal. A password is required to unlock.\n" \
      "\nOptions:" \
@@ -4758,21 +4527,6 @@ INSERT
      "\n" \
      "\nUse 500ms to specify period in milliseconds" \
 
-#define wc_trivial_usage \
-       "[OPTIONS] [FILE]..."
-#define wc_full_usage "\n\n" \
-       "Print line, word, and byte counts for each FILE (or stdin),\n" \
-       "and a total line if more than one FILE is specified\n" \
-     "\nOptions:" \
-     "\n        -c      Print the byte counts" \
-     "\n        -l      Print the newline counts" \
-     "\n        -L      Print the length of the longest line" \
-     "\n        -w      Print the word counts" \
-
-#define wc_example_usage \
-       "$ wc /etc/passwd\n" \
-       "     31      46    1365 /etc/passwd\n"
-
 #define wget_trivial_usage \
         IF_FEATURE_WGET_LONG_OPTIONS( \
        "[-c|--continue] [-s|--spider] [-q|--quiet] [-O|--output-document FILE]\n" \