Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/include

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

Location:

branches/3.2/mindi-busybox/include

Files:

• .gitignore (modified) (1 diff)
• applets.src.h (modified) (3 diffs)
• busybox.h (modified) (2 diffs)
• grp_.h (modified) (4 diffs)
• libbb.h (modified) (59 diffs)
• platform.h (modified) (18 diffs)
• pwd_.h (modified) (3 diffs)
• shadow_.h (modified) (2 diffs)
• unicode.h (modified) (4 diffs)
• usage.src.h (modified) (1 diff)
• volume_id.h (modified) (2 diffs)
• xatonum.h (modified) (1 diff)

branches/3.2/mindi-busybox/include/.gitignore

@@ -1 +1 @@
 /config
 
+/applets.h
 /applet_tables.h
 /autoconf.h
+/bbconfigopts_bz2.h
 /bbconfigopts.h
+/NUM_APPLETS.h
 /usage_compressed.h
+/usage.h

branches/3.2/mindi-busybox/include/applets.src.h

@@ -13 +13 @@
 l     - location to install link to: [/usr]/[s]bin
 s     - suid type:
-        _BB_SUID_REQUIRE: will complain if busybox isn't suid
+        BB_SUID_REQUIRE: will complain if busybox isn't suid
         and is run by non-root (applet_main() will not be called at all)
-        _BB_SUID_DROP: will drop suid prior to applet_main()
-        _BB_SUID_MAYBE: neither of the above
+        BB_SUID_DROP: will drop suid prior to applet_main()
+        BB_SUID_MAYBE: neither of the above
+        (every instance of BB_SUID_REQUIRE and BB_SUID_MAYBE
+        needs to be justified in comment)
+        NB: please update FEATURE_SUID help text whenever you add/remove
+        BB_SUID_REQUIRE or BB_SUID_MAYBE applet.
 */
 
@@ -58 +62 @@
 
 #if ENABLE_INSTALL_NO_USR
-# define _BB_DIR_USR_BIN _BB_DIR_BIN
-# define _BB_DIR_USR_SBIN _BB_DIR_SBIN
+# 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))
-IF_TEST(APPLET_NOFORK([[, test, _BB_DIR_USR_BIN, _BB_SUID_DROP, test))
-IF_ACPID(APPLET(acpid, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_ADDGROUP(APPLET(addgroup, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_ADDUSER(APPLET(adduser, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_ADJTIMEX(APPLET(adjtimex, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_AR(APPLET(ar, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_ARP(APPLET(arp, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_ARPING(APPLET(arping, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_AWK(APPLET_NOEXEC(awk, awk, _BB_DIR_USR_BIN, _BB_SUID_DROP, awk))
-IF_BASENAME(APPLET_NOFORK(basename, basename, _BB_DIR_USR_BIN, _BB_SUID_DROP, basename))
-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_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))
-IF_CAT(APPLET_NOFORK(cat, cat, _BB_DIR_BIN, _BB_SUID_DROP, cat))
-IF_CATV(APPLET(catv, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_CHAT(APPLET(chat, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_CHATTR(APPLET(chattr, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_CHCON(APPLET(chcon, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_CHGRP(APPLET_NOEXEC(chgrp, chgrp, _BB_DIR_BIN, _BB_SUID_DROP, chgrp))
-IF_CHMOD(APPLET_NOEXEC(chmod, chmod, _BB_DIR_BIN, _BB_SUID_DROP, chmod))
-IF_CHOWN(APPLET_NOEXEC(chown, chown, _BB_DIR_BIN, _BB_SUID_DROP, chown))
-IF_CHPASSWD(APPLET(chpasswd, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-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_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))
-IF_CP(APPLET_NOEXEC(cp, cp, _BB_DIR_BIN, _BB_SUID_DROP, cp))
-IF_CPIO(APPLET(cpio, _BB_DIR_BIN, _BB_SUID_DROP))
-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_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_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))
-IF_DHCPRELAY(APPLET(dhcprelay, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-IF_DIFF(APPLET(diff, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_DIRNAME(APPLET_NOFORK(dirname, dirname, _BB_DIR_USR_BIN, _BB_SUID_DROP, dirname))
-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_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))
-IF_DUMPKMAP(APPLET(dumpkmap, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_DUMPLEASES(APPLET(dumpleases, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-//IF_E2FSCK(APPLET(e2fsck, _BB_DIR_SBIN, _BB_SUID_DROP))
-//IF_E2LABEL(APPLET_ODDNAME(e2label, tune2fs, _BB_DIR_SBIN, _BB_SUID_DROP, e2label))
-IF_ECHO(APPLET_NOFORK(echo, echo, _BB_DIR_BIN, _BB_SUID_DROP, echo))
-IF_ED(APPLET(ed, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_EJECT(APPLET(eject, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_ENV(APPLET_NOEXEC(env, env, _BB_DIR_USR_BIN, _BB_SUID_DROP, env))
-IF_ENVDIR(APPLET_ODDNAME(envdir, chpst, _BB_DIR_USR_BIN, _BB_SUID_DROP, envdir))
-IF_ENVUIDGID(APPLET_ODDNAME(envuidgid, chpst, _BB_DIR_USR_BIN, _BB_SUID_DROP, envuidgid))
-IF_ETHER_WAKE(APPLET_ODDNAME(ether-wake, ether_wake, _BB_DIR_USR_BIN, _BB_SUID_DROP, ether_wake))
-IF_EXPAND(APPLET(expand, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_EXPR(APPLET(expr, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_FAKEIDENTD(APPLET(fakeidentd, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-IF_FALSE(APPLET_NOFORK(false, false, _BB_DIR_BIN, _BB_SUID_DROP, false))
-IF_FBSET(APPLET(fbset, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-IF_FBSPLASH(APPLET(fbsplash, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_FDFLUSH(APPLET_ODDNAME(fdflush, freeramdisk, _BB_DIR_BIN, _BB_SUID_DROP, fdflush))
-IF_FDFORMAT(APPLET(fdformat, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_FDISK(APPLET(fdisk, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_FGCONSOLE(APPLET(fgconsole, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_FINDFS(APPLET(findfs, _BB_DIR_SBIN, _BB_SUID_MAYBE))
-IF_FLASH_ERASEALL(APPLET(flash_eraseall, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-IF_FLASH_LOCK(APPLET_ODDNAME(flash_lock, flash_lock_unlock, _BB_DIR_USR_SBIN, _BB_SUID_DROP, flash_lock))
-IF_FLASH_UNLOCK(APPLET_ODDNAME(flash_unlock, flash_lock_unlock, _BB_DIR_USR_SBIN, _BB_SUID_DROP, flash_unlock))
-IF_FLASHCP(APPLET(flashcp, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-IF_FLOCK(APPLET(flock, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_FOLD(APPLET_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))
-//IF_E2FSCK(APPLET_ODDNAME(fsck.ext2, e2fsck, _BB_DIR_SBIN, _BB_SUID_DROP, fsck_ext2))
-//IF_E2FSCK(APPLET_ODDNAME(fsck.ext3, e2fsck, _BB_DIR_SBIN, _BB_SUID_DROP, fsck_ext3))
-IF_FSCK_MINIX(APPLET_ODDNAME(fsck.minix, fsck_minix, _BB_DIR_SBIN, _BB_SUID_DROP, fsck_minix))
-IF_FSYNC(APPLET_NOFORK(fsync, fsync, _BB_DIR_BIN, _BB_SUID_DROP, fsync))
-IF_FTPD(APPLET(ftpd, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-IF_FTPGET(APPLET_ODDNAME(ftpget, ftpgetput, _BB_DIR_USR_BIN, _BB_SUID_DROP, ftpget))
-IF_FTPPUT(APPLET_ODDNAME(ftpput, ftpgetput, _BB_DIR_USR_BIN, _BB_SUID_DROP, ftpput))
-IF_FUSER(APPLET(fuser, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_GETENFORCE(APPLET(getenforce, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-IF_GETOPT(APPLET(getopt, _BB_DIR_BIN, _BB_SUID_DROP))
-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_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_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_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_INOTIFYD(APPLET(inotifyd, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_INSTALL(APPLET(install, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_IONICE(APPLET(ionice, _BB_DIR_BIN, _BB_SUID_DROP))
+IF_TEST(APPLET_NOFORK([,  test, BB_DIR_USR_BIN, BB_SUID_DROP, test))
+IF_TEST(APPLET_NOFORK([[, test, BB_DIR_USR_BIN, BB_SUID_DROP, test))
+IF_ACPID(APPLET(acpid, BB_DIR_SBIN, BB_SUID_DROP))
+IF_ADDGROUP(APPLET(addgroup, BB_DIR_USR_SBIN, BB_SUID_DROP))
+IF_ADDUSER(APPLET(adduser, BB_DIR_USR_SBIN, BB_SUID_DROP))
+IF_ADJTIMEX(APPLET(adjtimex, BB_DIR_SBIN, BB_SUID_DROP))
+IF_AR(APPLET(ar, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_ARP(APPLET(arp, BB_DIR_SBIN, BB_SUID_DROP))
+IF_ARPING(APPLET(arping, BB_DIR_USR_SBIN, BB_SUID_DROP))
+IF_AWK(APPLET_NOEXEC(awk, awk, BB_DIR_USR_BIN, BB_SUID_DROP, awk))
+IF_BASENAME(APPLET_NOFORK(basename, basename, BB_DIR_USR_BIN, BB_SUID_DROP, basename))
+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_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))
+IF_CAT(APPLET_NOFORK(cat, cat, BB_DIR_BIN, BB_SUID_DROP, cat))
+IF_CATV(APPLET(catv, BB_DIR_BIN, BB_SUID_DROP))
+IF_CHAT(APPLET(chat, BB_DIR_USR_SBIN, BB_SUID_DROP))
+IF_CHATTR(APPLET(chattr, BB_DIR_BIN, BB_SUID_DROP))
+IF_CHCON(APPLET(chcon, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_CHGRP(APPLET_NOEXEC(chgrp, chgrp, BB_DIR_BIN, BB_SUID_DROP, chgrp))
+IF_CHMOD(APPLET_NOEXEC(chmod, chmod, BB_DIR_BIN, BB_SUID_DROP, chmod))
+IF_CHOWN(APPLET_NOEXEC(chown, chown, BB_DIR_BIN, BB_SUID_DROP, chown))
+IF_CHPASSWD(APPLET(chpasswd, BB_DIR_USR_SBIN, BB_SUID_DROP))
+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_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))
+IF_CP(APPLET_NOEXEC(cp, cp, BB_DIR_BIN, BB_SUID_DROP, cp))
+IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP))
+IF_CROND(APPLET(crond, BB_DIR_USR_SBIN, BB_SUID_DROP))
+/* Needs to be run by root or be suid root - needs to change /var/spool/cron* files: */
+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_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_USR_SBIN, BB_SUID_DROP, delgroup))
+IF_DELUSER(APPLET(deluser, BB_DIR_USR_SBIN, BB_SUID_DROP))
+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))
+IF_DHCPRELAY(APPLET(dhcprelay, BB_DIR_USR_SBIN, BB_SUID_DROP))
+IF_DIFF(APPLET(diff, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_DIRNAME(APPLET_NOFORK(dirname, dirname, BB_DIR_USR_BIN, BB_SUID_DROP, dirname))
+IF_DMESG(APPLET(dmesg, BB_DIR_BIN, BB_SUID_DROP))
+IF_DNSD(APPLET(dnsd, BB_DIR_USR_SBIN, BB_SUID_DROP))
+IF_HOSTNAME(APPLET_ODDNAME(dnsdomainname, hostname, BB_DIR_BIN, BB_SUID_DROP, dnsdomainname))
+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))
+IF_DUMPKMAP(APPLET(dumpkmap, BB_DIR_BIN, BB_SUID_DROP))
+IF_DUMPLEASES(APPLET(dumpleases, BB_DIR_USR_BIN, BB_SUID_DROP))
+//IF_E2FSCK(APPLET(e2fsck, BB_DIR_SBIN, BB_SUID_DROP))
+//IF_E2LABEL(APPLET_ODDNAME(e2label, tune2fs, BB_DIR_SBIN, BB_SUID_DROP, e2label))
+IF_ECHO(APPLET_NOFORK(echo, echo, BB_DIR_BIN, BB_SUID_DROP, echo))
+IF_ED(APPLET(ed, BB_DIR_BIN, BB_SUID_DROP))
+IF_EJECT(APPLET(eject, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_ENV(APPLET_NOEXEC(env, env, BB_DIR_USR_BIN, BB_SUID_DROP, env))
+IF_ENVDIR(APPLET_ODDNAME(envdir, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, envdir))
+IF_ENVUIDGID(APPLET_ODDNAME(envuidgid, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, envuidgid))
+IF_ETHER_WAKE(APPLET_ODDNAME(ether-wake, ether_wake, BB_DIR_USR_SBIN, BB_SUID_DROP, ether_wake))
+IF_EXPAND(APPLET(expand, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_EXPR(APPLET(expr, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_FAKEIDENTD(APPLET(fakeidentd, BB_DIR_USR_SBIN, BB_SUID_DROP))
+IF_FALSE(APPLET_NOFORK(false, false, BB_DIR_BIN, BB_SUID_DROP, false))
+IF_FBSET(APPLET(fbset, BB_DIR_USR_SBIN, BB_SUID_DROP))
+IF_FBSPLASH(APPLET(fbsplash, BB_DIR_SBIN, BB_SUID_DROP))
+IF_FDFLUSH(APPLET_ODDNAME(fdflush, freeramdisk, BB_DIR_BIN, BB_SUID_DROP, fdflush))
+IF_FDFORMAT(APPLET(fdformat, BB_DIR_USR_SBIN, BB_SUID_DROP))
+IF_FDISK(APPLET(fdisk, BB_DIR_SBIN, BB_SUID_DROP))
+IF_FGCONSOLE(APPLET(fgconsole, BB_DIR_USR_BIN, BB_SUID_DROP))
+/* Benefits from suid root: better access to /dev/BLOCKDEVs: */
+IF_FINDFS(APPLET(findfs, BB_DIR_SBIN, BB_SUID_MAYBE))
+IF_FLASH_ERASEALL(APPLET(flash_eraseall, BB_DIR_USR_SBIN, BB_SUID_DROP))
+IF_FLASH_LOCK(APPLET_ODDNAME(flash_lock, flash_lock_unlock, BB_DIR_USR_SBIN, BB_SUID_DROP, flash_lock))
+IF_FLASH_UNLOCK(APPLET_ODDNAME(flash_unlock, flash_lock_unlock, BB_DIR_USR_SBIN, BB_SUID_DROP, flash_unlock))
+IF_FLASHCP(APPLET(flashcp, BB_DIR_USR_SBIN, BB_SUID_DROP))
+IF_FLOCK(APPLET(flock, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_FOLD(APPLET_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))
+//IF_E2FSCK(APPLET_ODDNAME(fsck.ext2, e2fsck, BB_DIR_SBIN, BB_SUID_DROP, fsck_ext2))
+//IF_E2FSCK(APPLET_ODDNAME(fsck.ext3, e2fsck, BB_DIR_SBIN, BB_SUID_DROP, fsck_ext3))
+IF_FSCK_MINIX(APPLET_ODDNAME(fsck.minix, fsck_minix, BB_DIR_SBIN, BB_SUID_DROP, fsck_minix))
+IF_FSYNC(APPLET_NOFORK(fsync, fsync, BB_DIR_BIN, BB_SUID_DROP, fsync))
+IF_FTPD(APPLET(ftpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
+IF_FTPGET(APPLET_ODDNAME(ftpget, ftpgetput, BB_DIR_USR_BIN, BB_SUID_DROP, ftpget))
+IF_FTPPUT(APPLET_ODDNAME(ftpput, ftpgetput, BB_DIR_USR_BIN, BB_SUID_DROP, ftpput))
+IF_FUSER(APPLET(fuser, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_GETENFORCE(APPLET(getenforce, BB_DIR_USR_SBIN, BB_SUID_DROP))
+IF_GETOPT(APPLET(getopt, BB_DIR_BIN, BB_SUID_DROP))
+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_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_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_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_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_SBIN, 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_INOTIFYD(APPLET(inotifyd, BB_DIR_SBIN, BB_SUID_DROP))
+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 \
  || ENABLE_FEATURE_IP_ROUTE \
@@ -190 +194 @@
  || ENABLE_FEATURE_IP_TUNNEL \
  || ENABLE_FEATURE_IP_RULE
-IF_IP(APPLET(ip, _BB_DIR_BIN, _BB_SUID_DROP))
+IF_IP(APPLET(ip, BB_DIR_SBIN, BB_SUID_DROP))
 #endif
-IF_IPADDR(APPLET(ipaddr, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_IPCALC(APPLET(ipcalc, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_IPCRM(APPLET(ipcrm, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE))
-IF_IPCS(APPLET(ipcs, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE))
-IF_IPLINK(APPLET(iplink, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_IPROUTE(APPLET(iproute, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_IPRULE(APPLET(iprule, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_IPTUNNEL(APPLET(iptunnel, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_KBD_MODE(APPLET(kbd_mode, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_KILL(APPLET(kill, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_KILLALL(APPLET_ODDNAME(killall, kill, _BB_DIR_USR_BIN, _BB_SUID_DROP, killall))
-IF_KILLALL5(APPLET_ODDNAME(killall5, kill, _BB_DIR_USR_BIN, _BB_SUID_DROP, killall5))
-IF_KLOGD(APPLET(klogd, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_LAST(APPLET(last, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-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_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))
-IF_LOADKMAP(APPLET(loadkmap, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_LOGGER(APPLET(logger, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_LOGIN(APPLET(login, _BB_DIR_BIN, _BB_SUID_REQUIRE))
-IF_LOGNAME(APPLET_NOFORK(logname, logname, _BB_DIR_USR_BIN, _BB_SUID_DROP, logname))
-IF_LOGREAD(APPLET(logread, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_LOSETUP(APPLET(losetup, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_LPD(APPLET(lpd, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-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_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))
-IF_LZMA(APPLET_ODDNAME(lzma, unlzma, _BB_DIR_USR_BIN, _BB_SUID_DROP, lzma))
-IF_LZOP(APPLET(lzop, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_LZOP(APPLET_ODDNAME(lzopcat, lzop, _BB_DIR_USR_BIN, _BB_SUID_DROP, lzopcat))
-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_NOEXEC(md5sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_DROP, md5sum))
-IF_MDEV(APPLET(mdev, _BB_DIR_SBIN, _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_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_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_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))
-IF_MT(APPLET(mt, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_MV(APPLET(mv, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_NAMEIF(APPLET(nameif, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_NC(APPLET(nc, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_NETSTAT(APPLET(netstat, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_NICE(APPLET(nice, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_NMETER(APPLET(nmeter, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_NOHUP(APPLET(nohup, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_NSLOOKUP(APPLET(nslookup, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_NTPD(APPLET(ntpd, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-IF_OD(APPLET(od, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_OPENVT(APPLET(openvt, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-//IF_PARSE(APPLET(parse, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_PASSWD(APPLET(passwd, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE))
-IF_PGREP(APPLET(pgrep, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_PIDOF(APPLET(pidof, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_PING(APPLET(ping, _BB_DIR_BIN, _BB_SUID_MAYBE))
-IF_PING6(APPLET(ping6, _BB_DIR_BIN, _BB_SUID_MAYBE))
-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_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))
-IF_PWD(APPLET_NOFORK(pwd, pwd, _BB_DIR_BIN, _BB_SUID_DROP, pwd))
-IF_RAIDAUTORUN(APPLET(raidautorun, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_RDATE(APPLET(rdate, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-IF_RDEV(APPLET(rdev, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-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_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))
-IF_RESIZE(APPLET(resize, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_RESTORECON(APPLET_ODDNAME(restorecon, setfiles, _BB_DIR_SBIN, _BB_SUID_DROP, restorecon))
-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_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))
-IF_RTCWAKE(APPLET(rtcwake, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, _BB_DIR_BIN, _BB_SUID_DROP, run_parts))
-IF_RUNCON(APPLET(runcon, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_RUNLEVEL(APPLET(runlevel, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_RUNSV(APPLET(runsv, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_RUNSVDIR(APPLET(runsvdir, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_RX(APPLET(rx, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_SCRIPT(APPLET(script, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_SCRIPTREPLAY(APPLET(scriptreplay, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_SED(APPLET(sed, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_SELINUXENABLED(APPLET(selinuxenabled, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-IF_SENDMAIL(APPLET(sendmail, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-IF_SEQ(APPLET_NOFORK(seq, seq, _BB_DIR_USR_BIN, _BB_SUID_DROP, seq))
-IF_SESTATUS(APPLET(sestatus, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-IF_SETARCH(APPLET(setarch, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_SETCONSOLE(APPLET(setconsole, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_SETENFORCE(APPLET(setenforce, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-IF_SETFILES(APPLET(setfiles, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_SETFONT(APPLET(setfont, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-IF_SETKEYCODES(APPLET(setkeycodes, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-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_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))
-/* 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))
-IF_START_STOP_DAEMON(APPLET_ODDNAME(start-stop-daemon, start_stop_daemon, _BB_DIR_SBIN, _BB_SUID_DROP, start_stop_daemon))
-IF_STAT(APPLET(stat, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_STRINGS(APPLET(strings, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_STTY(APPLET(stty, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_SU(APPLET(su, _BB_DIR_BIN, _BB_SUID_REQUIRE))
-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(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))
-IF_BB_SYSCTL(APPLET(sysctl, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_SYSLOGD(APPLET(syslogd, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_TAC(APPLET_NOEXEC(tac, tac, _BB_DIR_USR_BIN, _BB_SUID_DROP, tac))
-IF_TAIL(APPLET(tail, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_TAR(APPLET(tar, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_TASKSET(APPLET(taskset, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-/* IF_TC(APPLET(tc, _BB_DIR_SBIN, _BB_SUID_DROP)) */
-IF_TCPSVD(APPLET_ODDNAME(tcpsvd, tcpudpsvd, _BB_DIR_USR_BIN, _BB_SUID_DROP, tcpsvd))
-IF_TEE(APPLET(tee, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_TELNET(APPLET(telnet, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_TELNETD(APPLET(telnetd, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-IF_TEST(APPLET_NOFORK(test, test, _BB_DIR_USR_BIN, _BB_SUID_DROP, test))
+IF_IPADDR(APPLET(ipaddr, BB_DIR_SBIN, BB_SUID_DROP))
+IF_IPCALC(APPLET(ipcalc, BB_DIR_BIN, BB_SUID_DROP))
+IF_IPCRM(APPLET(ipcrm, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_IPCS(APPLET(ipcs, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_IPLINK(APPLET(iplink, BB_DIR_SBIN, BB_SUID_DROP))
+IF_IPROUTE(APPLET(iproute, BB_DIR_SBIN, BB_SUID_DROP))
+IF_IPRULE(APPLET(iprule, BB_DIR_SBIN, BB_SUID_DROP))
+IF_IPTUNNEL(APPLET(iptunnel, BB_DIR_SBIN, BB_SUID_DROP))
+IF_KBD_MODE(APPLET(kbd_mode, BB_DIR_BIN, BB_SUID_DROP))
+IF_KILL(APPLET(kill, BB_DIR_BIN, BB_SUID_DROP))
+IF_KILLALL(APPLET_ODDNAME(killall, kill, BB_DIR_USR_BIN, BB_SUID_DROP, killall))
+IF_KILLALL5(APPLET_ODDNAME(killall5, kill, BB_DIR_USR_SBIN, BB_SUID_DROP, killall5))
+IF_KLOGD(APPLET(klogd, BB_DIR_SBIN, BB_SUID_DROP))
+IF_LAST(APPLET(last, BB_DIR_USR_BIN, BB_SUID_DROP))
+//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_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))
+IF_LOADKMAP(APPLET(loadkmap, BB_DIR_SBIN, BB_SUID_DROP))
+IF_LOGGER(APPLET(logger, BB_DIR_USR_BIN, BB_SUID_DROP))
+/* Needs to be run by root or be suid root - needs to change uid and gid: */
+IF_LOGIN(APPLET(login, BB_DIR_BIN, BB_SUID_REQUIRE))
+IF_LOGNAME(APPLET_NOFORK(logname, logname, BB_DIR_USR_BIN, BB_SUID_DROP, logname))
+IF_LOGREAD(APPLET(logread, BB_DIR_SBIN, BB_SUID_DROP))
+IF_LOSETUP(APPLET(losetup, BB_DIR_SBIN, BB_SUID_DROP))
+IF_LPD(APPLET(lpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
+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_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))
+IF_LZMA(APPLET_ODDNAME(lzma, unlzma, BB_DIR_USR_BIN, BB_SUID_DROP, lzma))
+IF_LZOP(APPLET(lzop, BB_DIR_BIN, BB_SUID_DROP))
+IF_LZOP(APPLET_ODDNAME(lzopcat, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, lzopcat))
+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_NOEXEC(md5sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, md5sum))
+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_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_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_MORE(APPLET(more, BB_DIR_BIN, BB_SUID_DROP))
+/* On full-blown systems, requires suid for user mounts.
+ * But it's not unthinkable to have it available in non-suid flavor on some systems,
+ * for viewing mount table.
+ * Therefore we use BB_SUID_MAYBE instead of BB_SUID_REQUIRE: */
+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))
+IF_MT(APPLET(mt, BB_DIR_BIN, BB_SUID_DROP))
+IF_MV(APPLET(mv, BB_DIR_BIN, BB_SUID_DROP))
+IF_NAMEIF(APPLET(nameif, BB_DIR_SBIN, BB_SUID_DROP))
+IF_NC(APPLET(nc, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_NETSTAT(APPLET(netstat, BB_DIR_BIN, BB_SUID_DROP))
+IF_NICE(APPLET(nice, BB_DIR_BIN, BB_SUID_DROP))
+IF_NOHUP(APPLET(nohup, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_NSLOOKUP(APPLET(nslookup, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_NTPD(APPLET(ntpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
+IF_OD(APPLET(od, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_OPENVT(APPLET(openvt, BB_DIR_USR_BIN, BB_SUID_DROP))
+//IF_PARSE(APPLET(parse, BB_DIR_USR_BIN, BB_SUID_DROP))
+/* Needs to be run by root or be suid root - needs to change /etc/{passwd,shadow}: */
+IF_PASSWD(APPLET(passwd, BB_DIR_USR_BIN, BB_SUID_REQUIRE))
+IF_PGREP(APPLET(pgrep, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_PIDOF(APPLET(pidof, BB_DIR_BIN, BB_SUID_DROP))
+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_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))
+IF_PWD(APPLET_NOFORK(pwd, pwd, BB_DIR_BIN, BB_SUID_DROP, pwd))
+IF_RAIDAUTORUN(APPLET(raidautorun, BB_DIR_SBIN, BB_SUID_DROP))
+IF_RDATE(APPLET(rdate, BB_DIR_USR_SBIN, BB_SUID_DROP))
+IF_RDEV(APPLET(rdev, BB_DIR_USR_SBIN, BB_SUID_DROP))
+IF_READAHEAD(APPLET(readahead, BB_DIR_USR_SBIN, 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_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))
+IF_RESIZE(APPLET(resize, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_RESTORECON(APPLET_ODDNAME(restorecon, setfiles, BB_DIR_SBIN, BB_SUID_DROP, restorecon))
+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_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))
+IF_RTCWAKE(APPLET(rtcwake, BB_DIR_USR_SBIN, BB_SUID_DROP))
+IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, BB_DIR_BIN, BB_SUID_DROP, run_parts))
+IF_RUNCON(APPLET(runcon, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_RUNLEVEL(APPLET(runlevel, BB_DIR_SBIN, BB_SUID_DROP))
+IF_RUNSV(APPLET(runsv, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_RUNSVDIR(APPLET(runsvdir, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_RX(APPLET(rx, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_SCRIPT(APPLET(script, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_SCRIPTREPLAY(APPLET(scriptreplay, BB_DIR_BIN, BB_SUID_DROP))
+IF_SED(APPLET(sed, BB_DIR_BIN, BB_SUID_DROP))
+IF_SELINUXENABLED(APPLET(selinuxenabled, BB_DIR_USR_SBIN, BB_SUID_DROP))
+IF_SENDMAIL(APPLET(sendmail, BB_DIR_USR_SBIN, BB_SUID_DROP))
+IF_SEQ(APPLET_NOFORK(seq, seq, BB_DIR_USR_BIN, BB_SUID_DROP, seq))
+IF_SESTATUS(APPLET(sestatus, BB_DIR_USR_SBIN, BB_SUID_DROP))
+IF_SETARCH(APPLET(setarch, BB_DIR_BIN, BB_SUID_DROP))
+IF_SETCONSOLE(APPLET(setconsole, BB_DIR_SBIN, BB_SUID_DROP))
+IF_SETENFORCE(APPLET(setenforce, BB_DIR_USR_SBIN, BB_SUID_DROP))
+IF_SETFILES(APPLET(setfiles, BB_DIR_SBIN, BB_SUID_DROP))
+IF_SETFONT(APPLET(setfont, BB_DIR_USR_SBIN, BB_SUID_DROP))
+IF_SETKEYCODES(APPLET(setkeycodes, BB_DIR_USR_BIN, BB_SUID_DROP))
+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_NOEXEC(sha1sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, sha1sum))
+IF_SHA3SUM(APPLET_NOEXEC(sha3sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, sha3sum))
+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))
+/* 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))
+IF_START_STOP_DAEMON(APPLET_ODDNAME(start-stop-daemon, start_stop_daemon, BB_DIR_SBIN, BB_SUID_DROP, start_stop_daemon))
+IF_STAT(APPLET(stat, BB_DIR_BIN, BB_SUID_DROP))
+IF_STRINGS(APPLET(strings, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_STTY(APPLET(stty, BB_DIR_BIN, BB_SUID_DROP))
+/* Needs to be run by root or be suid root - needs to change uid and gid: */
+IF_SU(APPLET(su, BB_DIR_BIN, BB_SUID_REQUIRE))
+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(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))
+IF_BB_SYSCTL(APPLET(sysctl, BB_DIR_SBIN, BB_SUID_DROP))
+IF_SYSLOGD(APPLET(syslogd, BB_DIR_SBIN, BB_SUID_DROP))
+IF_TAC(APPLET_NOEXEC(tac, tac, BB_DIR_USR_BIN, BB_SUID_DROP, tac))
+IF_TAIL(APPLET(tail, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_TAR(APPLET(tar, BB_DIR_BIN, BB_SUID_DROP))
+IF_TASKSET(APPLET(taskset, BB_DIR_USR_BIN, BB_SUID_DROP))
+/* IF_TC(APPLET(tc, BB_DIR_SBIN, BB_SUID_DROP)) */
+IF_TCPSVD(APPLET_ODDNAME(tcpsvd, tcpudpsvd, BB_DIR_USR_BIN, BB_SUID_DROP, tcpsvd))
+IF_TEE(APPLET(tee, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_TELNET(APPLET(telnet, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_TELNETD(APPLET(telnetd, BB_DIR_USR_SBIN, BB_SUID_DROP))
+IF_TEST(APPLET_NOFORK(test, test, BB_DIR_USR_BIN, BB_SUID_DROP, test))
 #if ENABLE_FEATURE_TFTP_GET || ENABLE_FEATURE_TFTP_PUT
-IF_TFTP(APPLET(tftp, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_TFTPD(APPLET(tftpd, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+IF_TFTP(APPLET(tftp, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_TFTPD(APPLET(tftpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
 #endif
-IF_TIME(APPLET(time, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_TIMEOUT(APPLET(timeout, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_TOP(APPLET(top, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_TOUCH(APPLET_NOFORK(touch, touch, _BB_DIR_BIN, _BB_SUID_DROP, touch))
-IF_TR(APPLET(tr, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_TRACEROUTE(APPLET(traceroute, _BB_DIR_USR_BIN, _BB_SUID_MAYBE))
-IF_TRACEROUTE6(APPLET(traceroute6, _BB_DIR_USR_BIN, _BB_SUID_MAYBE))
-IF_TRUE(APPLET_NOFORK(true, true, _BB_DIR_BIN, _BB_SUID_DROP, true))
-IF_TTY(APPLET(tty, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_TTYSIZE(APPLET(ttysize, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_TUNCTL(APPLET(tunctl, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_TUNE2FS(APPLET(tune2fs, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_UDHCPC(APPLET(udhcpc, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_UDHCPD(APPLET(udhcpd, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
-IF_UDPSVD(APPLET_ODDNAME(udpsvd, tcpudpsvd, _BB_DIR_USR_BIN, _BB_SUID_DROP, udpsvd))
-IF_UMOUNT(APPLET(umount, _BB_DIR_BIN, _BB_SUID_DROP))
-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_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))
-IF_UNZIP(APPLET(unzip, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_UPTIME(APPLET(uptime, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_USLEEP(APPLET_NOFORK(usleep, usleep, _BB_DIR_BIN, _BB_SUID_DROP, usleep))
-IF_UUDECODE(APPLET(uudecode, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_UUENCODE(APPLET(uuencode, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_VCONFIG(APPLET(vconfig, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_VI(APPLET(vi, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_VLOCK(APPLET(vlock, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE))
-IF_VOLNAME(APPLET(volname, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_WALL(APPLET(wall, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE))
-IF_WATCH(APPLET(watch, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_WATCHDOG(APPLET(watchdog, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_WC(APPLET(wc, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_WGET(APPLET(wget, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_WHICH(APPLET(which, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_WHO(APPLET(who, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_WHOAMI(APPLET_NOFORK(whoami, whoami, _BB_DIR_USR_BIN, _BB_SUID_DROP, whoami))
-IF_UNXZ(APPLET_ODDNAME(xzcat, unxz, _BB_DIR_USR_BIN, _BB_SUID_DROP, xzcat))
-IF_XZ(APPLET_ODDNAME(xz, unxz, _BB_DIR_USR_BIN, _BB_SUID_DROP, xz))
-IF_YES(APPLET_NOFORK(yes, yes, _BB_DIR_USR_BIN, _BB_SUID_DROP, yes))
-IF_GUNZIP(APPLET_ODDNAME(zcat, gunzip, _BB_DIR_BIN, _BB_SUID_DROP, zcat))
-IF_ZCIP(APPLET(zcip, _BB_DIR_SBIN, _BB_SUID_DROP))
+IF_TIME(APPLET(time, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_TIMEOUT(APPLET(timeout, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_TOP(APPLET(top, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_TR(APPLET(tr, BB_DIR_USR_BIN, BB_SUID_DROP))
+/* Needs socket(AF_INET, SOCK_RAW, IPPROTO_ICMP), therefore BB_SUID_MAYBE: */
+IF_TRACEROUTE(APPLET(traceroute, BB_DIR_USR_BIN, BB_SUID_MAYBE))
+IF_TRACEROUTE6(APPLET(traceroute6, BB_DIR_USR_BIN, BB_SUID_MAYBE))
+IF_TRUE(APPLET_NOFORK(true, true, BB_DIR_BIN, BB_SUID_DROP, true))
+IF_TTY(APPLET(tty, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_TTYSIZE(APPLET(ttysize, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_TUNCTL(APPLET(tunctl, BB_DIR_SBIN, BB_SUID_DROP))
+IF_TUNE2FS(APPLET(tune2fs, BB_DIR_SBIN, BB_SUID_DROP))
+IF_UDHCPC(APPLET(udhcpc, BB_DIR_SBIN, BB_SUID_DROP))
+IF_UDHCPD(APPLET(udhcpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
+IF_UDPSVD(APPLET_ODDNAME(udpsvd, tcpudpsvd, BB_DIR_USR_BIN, BB_SUID_DROP, udpsvd))
+IF_UMOUNT(APPLET(umount, BB_DIR_BIN, BB_SUID_DROP))
+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_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))
+IF_UNZIP(APPLET(unzip, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_UPTIME(APPLET(uptime, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_USLEEP(APPLET_NOFORK(usleep, usleep, BB_DIR_BIN, BB_SUID_DROP, usleep))
+IF_UUDECODE(APPLET(uudecode, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_UUENCODE(APPLET(uuencode, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_VCONFIG(APPLET(vconfig, BB_DIR_SBIN, BB_SUID_DROP))
+/* Needs to be run by root or be suid root - needs to change uid and gid: */
+IF_VLOCK(APPLET(vlock, BB_DIR_USR_BIN, BB_SUID_REQUIRE))
+IF_VOLNAME(APPLET(volname, BB_DIR_USR_BIN, BB_SUID_DROP))
+/* Needs to be run by root or be suid root - needs to write to /dev/TTY: */
+IF_WALL(APPLET(wall, BB_DIR_USR_BIN, BB_SUID_REQUIRE))
+IF_WATCH(APPLET(watch, BB_DIR_BIN, BB_SUID_DROP))
+IF_WATCHDOG(APPLET(watchdog, BB_DIR_SBIN, BB_SUID_DROP))
+IF_WC(APPLET(wc, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_WGET(APPLET(wget, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_WHICH(APPLET(which, BB_DIR_USR_BIN, BB_SUID_DROP))
+IF_WHOAMI(APPLET_NOFORK(whoami, whoami, BB_DIR_USR_BIN, BB_SUID_DROP, whoami))
+IF_UNXZ(APPLET_ODDNAME(xzcat, unxz, BB_DIR_USR_BIN, BB_SUID_DROP, xzcat))
+IF_XZ(APPLET_ODDNAME(xz, unxz, BB_DIR_USR_BIN, BB_SUID_DROP, xz))
+IF_YES(APPLET_NOFORK(yes, yes, BB_DIR_USR_BIN, BB_SUID_DROP, yes))
+IF_GUNZIP(APPLET_ODDNAME(zcat, gunzip, BB_DIR_BIN, BB_SUID_DROP, zcat))
+IF_ZCIP(APPLET(zcip, BB_DIR_SBIN, BB_SUID_DROP))
 
 #if !defined(PROTOTYPES) && !defined(NAME_MAIN_CNAME) && !defined(MAKE_USAGE)

branches/3.2/mindi-busybox/include/busybox.h

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Busybox main internal header file
- *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
@@ -9 +7 @@
 
 #include "libbb.h"
+/* BB_DIR_foo and BB_SUID_bar constants: */
+#include "applet_metadata.h"
 
 PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
-/* order matters: used as index into "install_dir[]" in appletlib.c */
-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,
-#endif
-} bb_install_loc_t;
-
-typedef enum bb_suid_t {
-    _BB_SUID_DROP = 0,
-    _BB_SUID_MAYBE,
-    _BB_SUID_REQUIRE
-} bb_suid_t;
-
-
 /* Defined in appletlib.c (by including generated applet_tables.h) */
 /* Keep in sync with applets/applet_tables.c! */
-extern const char applet_names[];
+extern const char applet_names[] ALIGN1;
 extern int (*const applet_main[])(int argc, char **argv);
 extern const uint16_t applet_nameofs[];
-extern const uint8_t applet_install_loc[];
+extern const uint8_t applet_install_loc[] ALIGN1;
 
 #if ENABLE_FEATURE_SUID || ENABLE_FEATURE_PREFER_APPLETS

branches/3.2/mindi-busybox/include/grp_.h

@@ -30 +30 @@
  * so that function calls are directed to bb_internal_XXX replacements
  */
-
+#undef endgrent
 #define setgrent     bb_internal_setgrent
 #define endgrent     bb_internal_endgrent
@@ -65 +65 @@
 /* Write the given entry onto the given stream.  */
 extern int putgrent(const struct group *__restrict __p,
-             FILE *__restrict __f);
+        FILE *__restrict __f);
 #endif
 
@@ -83 +83 @@
 
 extern int getgrent_r(struct group *__restrict __resultbuf,
-               char *__restrict __buffer, size_t __buflen,
-               struct group **__restrict __result);
+        char *__restrict __buffer, size_t __buflen,
+        struct group **__restrict __result);
 
 /* Search for an entry with a matching group ID.  */
 extern int getgrgid_r(gid_t __gid, struct group *__restrict __resultbuf,
-               char *__restrict __buffer, size_t __buflen,
-               struct group **__restrict __result);
+        char *__restrict __buffer, size_t __buflen,
+        struct group **__restrict __result);
 
 /* Search for an entry with a matching group name.  */
 extern int getgrnam_r(const char *__restrict __name,
-               struct group *__restrict __resultbuf,
-               char *__restrict __buffer, size_t __buflen,
-               struct group **__restrict __result);
+        struct group *__restrict __resultbuf,
+        char *__restrict __buffer, size_t __buflen,
+        struct group **__restrict __result);
 
 /* Read a group entry from STREAM.  This function is not standardized
    an probably never will.  */
 extern int fgetgrent_r(FILE *__restrict __stream,
-            struct group *__restrict __resultbuf,
-            char *__restrict __buffer, size_t __buflen,
-            struct group **__restrict __result);
+        struct group *__restrict __resultbuf,
+        char *__restrict __buffer, size_t __buflen,
+        struct group **__restrict __result);
 
 /* Store at most *NGROUPS members of the group set for USER into
@@ -108 +108 @@
    returned in *NGROUPS.  Return -1 if the if *NGROUPS is too small.  */
 extern int getgrouplist(const char *__user, gid_t __group,
-             gid_t *__groups, int *__ngroups);
+        gid_t *__groups, int *__ngroups);
 
 /* Initialize the group set for the current user

branches/3.2/mindi-busybox/include/libbb.h

@@ -21 +21 @@
 #include <setjmp.h>
 #include <signal.h>
+#if defined __UCLIBC__ /* TODO: and glibc? */
+/* use inlined versions of these: */
+# define sigfillset(s)    __sigfillset(s)
+# define sigemptyset(s)   __sigemptyset(s)
+# define sigisemptyset(s) __sigisemptyset(s)
+#endif
 #include <stdint.h>
 #include <stdio.h>
@@ -27 +33 @@
 #include <stddef.h>
 #include <string.h>
+/* There are two incompatible basename's, let not use them! */
+/* See the dirname/basename man page for details */
+#include <libgen.h> /* dirname,basename */
+#undef basename
+#define basename dont_use_basename
 #include <sys/poll.h>
 #include <sys/ioctl.h>
@@ -34 +45 @@
 #include <sys/time.h>
 #include <sys/types.h>
+#ifndef major
+# include <sys/sysmacros.h>
+#endif
 #include <sys/wait.h>
 #include <termios.h>
 #include <time.h>
-#include <unistd.h>
 #include <sys/param.h>
-#ifdef HAVE_MNTENT_H
-# include <mntent.h>
-#endif
-#ifdef HAVE_SYS_STATFS_H
-# include <sys/statfs.h>
-#endif
-#if ENABLE_SELINUX
-# include <selinux/selinux.h>
-# include <selinux/context.h>
-# include <selinux/flask.h>
-# include <selinux/av_permissions.h>
-#endif
-#if ENABLE_LOCALE_SUPPORT
-# include <locale.h>
-#else
-# define setlocale(x,y) ((void)0)
-#endif
-#ifdef DMALLOC
-# include <dmalloc.h>
-#endif
 #include <pwd.h>
 #include <grp.h>
@@ -68 +61 @@
 #  include <shadow.h>
 # endif
+#endif
+#if defined(ANDROID) || defined(__ANDROID__)
+# define endpwent() ((void)0)
+# define endgrent() ((void)0)
+#endif
+#ifdef HAVE_MNTENT_H
+# include <mntent.h>
+#endif
+#ifdef HAVE_SYS_STATFS_H
+# include <sys/statfs.h>
+#endif
+/* Don't do this here:
+ * #include <sys/sysinfo.h>
+ * Some linux/ includes pull in conflicting definition
+ * of struct sysinfo (only in some toolchanins), which breaks build.
+ * Include sys/sysinfo.h only in those files which need it.
+ */
+#if ENABLE_SELINUX
+# include <selinux/selinux.h>
+# include <selinux/context.h>
+# include <selinux/flask.h>
+# include <selinux/av_permissions.h>
+#endif
+#if ENABLE_FEATURE_UTMP
+# include <utmp.h>
+#endif
+#if ENABLE_LOCALE_SUPPORT
+# include <locale.h>
+#else
+# define setlocale(x,y) ((void)0)
+#endif
+#ifdef DMALLOC
+# include <dmalloc.h>
+#endif
+/* Just in case libc doesn't define some of these... */
+#ifndef _PATH_PASSWD
+#define _PATH_PASSWD  "/etc/passwd"
+#endif
+#ifndef _PATH_GROUP
+#define _PATH_GROUP   "/etc/group"
+#endif
+#ifndef _PATH_SHADOW
+#define _PATH_SHADOW  "/etc/shadow"
+#endif
+#ifndef _PATH_GSHADOW
+#define _PATH_GSHADOW "/etc/gshadow"
 #endif
 #if defined __FreeBSD__ || defined __OpenBSD__
@@ -85 +124 @@
 # endif
 #endif
+#ifndef HAVE_CLEARENV
+# define clearenv() do { if (environ) environ[0] = NULL; } while (0)
+#endif
+#ifndef HAVE_FDATASYNC
+# define fdatasync fsync
+#endif
+#ifndef HAVE_XTABS
+# define XTABS TAB3
+#endif
 
 
@@ -95 +143 @@
 /* klogctl is in libc's klog.h, but we cheat and not #include that */
 int klogctl(int type, char *b, int len);
-/* This is declared here rather than #including <libgen.h> in order to avoid
- * confusing the two versions of basename.  See the dirname/basename man page
- * for details. */
-#if !defined __FreeBSD__
-char *dirname(char *path);
-#endif
-/* Include our own copy of struct sysinfo to avoid binary compatibility
- * problems with Linux 2.4, which changed things.  Grumble, grumble. */
-struct sysinfo {
-    long uptime;            /* Seconds since boot */
-    unsigned long loads[3];     /* 1, 5, and 15 minute load averages */
-    unsigned long totalram;     /* Total usable main memory size */
-    unsigned long freeram;      /* Available memory size */
-    unsigned long sharedram;    /* Amount of shared memory */
-    unsigned long bufferram;    /* Memory used by buffers */
-    unsigned long totalswap;    /* Total swap space size */
-    unsigned long freeswap;     /* swap space still available */
-    unsigned short procs;       /* Number of current processes */
-    unsigned short pad;         /* Padding needed for m68k */
-    unsigned long totalhigh;    /* Total high memory size */
-    unsigned long freehigh;     /* Available high memory size */
-    unsigned int mem_unit;      /* Memory unit size in bytes */
-    char _f[20 - 2 * sizeof(long) - sizeof(int)]; /* Padding: libc5 uses this.. */
-};
-int sysinfo(struct sysinfo* info);
 #ifndef PATH_MAX
 # define PATH_MAX 256
@@ -125 +148 @@
 #ifndef BUFSIZ
 # define BUFSIZ 4096
+#endif
+
+
+/* Busybox does not use threads, we can speed up stdio. */
+#ifdef HAVE_UNLOCKED_STDIO
+# undef  getc
+# define getc(stream) getc_unlocked(stream)
+# undef  getchar
+# define getchar() getchar_unlocked()
+# undef  putc
+# define putc(c, stream) putc_unlocked(c, stream)
+# undef  putchar
+# define putchar(c) putchar_unlocked(c)
+# undef  fgetc
+# define fgetc(stream) getc_unlocked(stream)
+# undef  fputc
+# define fputc(c, stream) putc_unlocked(c, stream)
+#endif
+/* Above functions are required by POSIX.1-2008, below ones are extensions */
+#ifdef HAVE_UNLOCKED_LINE_OPS
+# undef  fgets
+# define fgets(s, n, stream) fgets_unlocked(s, n, stream)
+# undef  fputs
+# define fputs(s, stream) fputs_unlocked(s, stream)
 #endif
 
@@ -169 +216 @@
 /* "long" is long enough on this system */
 typedef unsigned long uoff_t;
-#  define XATOOFF(a) xatoul_range(a, 0, LONG_MAX)
+#  define XATOOFF(a) xatoul_range((a), 0, LONG_MAX)
 /* usage: sz = BB_STRTOOFF(s, NULL, 10); if (errno || sz < 0) die(); */
 #  define BB_STRTOOFF bb_strtoul
@@ -178 +225 @@
 /* "long" is too short, need "long long" */
 typedef unsigned long long uoff_t;
-#  define XATOOFF(a) xatoull_range(a, 0, LLONG_MAX)
+#  define XATOOFF(a) xatoull_range((a), 0, LLONG_MAX)
 #  define BB_STRTOOFF bb_strtoull
 #  define STRTOOFF strtoull
@@ -195 +242 @@
 # else
 typedef unsigned long uoff_t;
-#  define XATOOFF(a) xatoul_range(a, 0, LONG_MAX)
+#  define XATOOFF(a) xatoul_range((a), 0, LONG_MAX)
 #  define BB_STRTOOFF bb_strtoul
 #  define STRTOOFF strtol
@@ -203 +250 @@
 /* scary. better ideas? (but do *test* them first!) */
 #define OFF_T_MAX  ((off_t)~((off_t)1 << (sizeof(off_t)*8-1)))
+/* Users report bionic to use 32-bit off_t even if LARGEFILE support is requested.
+ * We misdetected that. Don't let it build:
+ */
+struct BUG_off_t_size_is_misdetected {
+    char BUG_off_t_size_is_misdetected[sizeof(off_t) == sizeof(uoff_t) ? 1 : -1];
+};
 
 /* Some useful definitions */
@@ -211 +264 @@
 #undef SKIP
 #define SKIP    ((int) 2)
-
-/* for mtab.c */
-#define MTAB_GETMOUNTPT '1'
-#define MTAB_GETDEVICE  '2'
-
-#define BUF_SIZE        8192
-#define EXPAND_ALLOC    1024
 
 /* Macros for min/max.  */
@@ -273 +319 @@
 //TODO: supply a pointer to char[11] buffer (avoid statics)?
 extern const char *bb_mode_string(mode_t mode) FAST_FUNC;
-extern int is_directory(const char *name, int followLinks, struct stat *statBuf) FAST_FUNC;
+extern int is_directory(const char *name, int followLinks) FAST_FUNC;
 enum {  /* DO NOT CHANGE THESE VALUES!  cp.c, mv.c, install.c depend on them. */
     FILEUTILS_PRESERVE_STATUS = 1 << 0, /* -p */
@@ -288 +334 @@
     FILEUTILS_SET_SECURITY_CONTEXT = 1 << 10,
 #endif
+    FILEUTILS_IGNORE_CHMOD_ERR = 1 << 11,
 };
 #define FILEUTILS_CP_OPTSTR "pdRfilsLH" IF_SELINUX("c")
@@ -324 +371 @@
 /* this helper yells "short read!" if param is not -1 */
 extern void complain_copyfd_and_die(off_t sz) NORETURN FAST_FUNC;
+
 extern char bb_process_escape_sequence(const char **ptr) FAST_FUNC;
 char* strcpy_and_process_escape_sequences(char *dst, const char *src) FAST_FUNC;
@@ -332 +380 @@
  * "abc/def/" -> "def" !!
  */
-extern char *bb_get_last_path_component_strip(char *path) FAST_FUNC;
+char *bb_get_last_path_component_strip(char *path) FAST_FUNC;
 /* "abc/def/" -> "" and it never modifies 'path' */
-extern char *bb_get_last_path_component_nostrip(const char *path) FAST_FUNC;
-
-int ndelay_on(int fd) FAST_FUNC;
-int ndelay_off(int fd) FAST_FUNC;
-int close_on_exec_on(int fd) FAST_FUNC;
+char *bb_get_last_path_component_nostrip(const char *path) FAST_FUNC;
+/* Simpler version: does not special case "/" string */
+const char *bb_basename(const char *name) FAST_FUNC;
+/* NB: can violate const-ness (similarly to strchr) */
+char *last_char_is(const char *s, int c) FAST_FUNC;
+
+void ndelay_on(int fd) FAST_FUNC;
+void ndelay_off(int fd) FAST_FUNC;
+void close_on_exec_on(int fd) FAST_FUNC;
 void xdup2(int, int) FAST_FUNC;
 void xmove_fd(int, int) FAST_FUNC;
@@ -518 +570 @@
  * This is useful if you plan to bind to resulting local lsa.
  */
-#if ENABLE_FEATURE_IPV6
 int xsocket_type(len_and_sockaddr **lsap, int af, int sock_type) FAST_FUNC;
-#else
-int xsocket_type(len_and_sockaddr **lsap, int sock_type) FAST_FUNC;
-#define xsocket_type(lsap, af, sock_type) xsocket_type((lsap), (sock_type))
-#endif
 int xsocket_stream(len_and_sockaddr **lsap) FAST_FUNC;
 /* Create server socket bound to bindaddr:port. bindaddr can be NULL,
@@ -563 +610 @@
  * otherwise no-op. Useful for ftp.
  * NB: does NOT do htons() internally, just direct assignment. */
-void set_nport(len_and_sockaddr *lsa, unsigned port) FAST_FUNC;
+void set_nport(struct sockaddr *sa, unsigned port) FAST_FUNC;
 /* Retrieve sin[6]_port or return -1 for non-INET[6] lsa's */
 int get_nport(const struct sockaddr *sa) FAST_FUNC;
@@ -592 +639 @@
         socklen_t sa_size) FAST_FUNC;
 
+uint16_t inet_cksum(uint16_t *addr, int len) FAST_FUNC;
 
 char *xstrdup(const char *s) FAST_FUNC RETURNS_MALLOC;
@@ -636 +684 @@
 void *xzalloc(size_t size) FAST_FUNC RETURNS_MALLOC;
 void *xrealloc(void *old, size_t size) FAST_FUNC;
-/* After xrealloc_vector(v, 4, idx) it's ok to use
+/* After v = xrealloc_vector(v, SHIFT, idx) it's ok to use
  * at least v[idx] and v[idx+1], for all idx values.
- * shift specifies how many new elements are added (1: 2, 2: 4... 8: 256...)
- * when all elements are used up. New elements are zeroed out. */
+ * SHIFT specifies how many new elements are added (1:2, 2:4, ..., 8:256...)
+ * when all elements are used up. New elements are zeroed out.
+ * xrealloc_vector(v, SHIFT, idx) *MUST* be called with consecutive IDXs -
+ * skipping an index is a bad bug - it may miss a realloc!
+ */
 #define xrealloc_vector(vector, shift, idx) \
     xrealloc_vector_helper((vector), (sizeof((vector)[0]) << 8) + (shift), (idx))
@@ -646 +697 @@
 
 extern ssize_t safe_read(int fd, void *buf, size_t count) FAST_FUNC;
-extern ssize_t nonblock_safe_read(int fd, void *buf, size_t count) FAST_FUNC;
+extern ssize_t nonblock_immune_read(int fd, void *buf, size_t count, int loop_on_EINTR) FAST_FUNC;
 // NB: will return short read on error, not -1,
 // if some data was read before error occurred
@@ -657 +708 @@
 // Reads byte-by-byte. Useful when it is important to not read ahead.
 // Bytes are appended to pfx (which must be malloced, or NULL).
-extern char *xmalloc_reads(int fd, char *pfx, size_t *maxsz_p) FAST_FUNC;
+extern char *xmalloc_reads(int fd, size_t *maxsz_p) FAST_FUNC;
 /* Reads block up to *maxsz_p (default: INT_MAX - 4095) */
 extern void *xmalloc_read(int fd, size_t *maxsz_p) FAST_FUNC RETURNS_MALLOC;
 /* Returns NULL if file can't be opened (default max size: INT_MAX - 4095) */
 extern void *xmalloc_open_read_close(const char *filename, size_t *maxsz_p) FAST_FUNC RETURNS_MALLOC;
-/* Autodetects gzip/bzip2 formats. fd may be in the middle of the file! */
-#if ENABLE_FEATURE_SEAMLESS_LZMA \
+/* Never returns NULL */
+extern void *xmalloc_xopen_read_close(const char *filename, size_t *maxsz_p) FAST_FUNC RETURNS_MALLOC;
+
+#define SEAMLESS_COMPRESSION (0 \
+ || ENABLE_FEATURE_SEAMLESS_XZ \
+ || ENABLE_FEATURE_SEAMLESS_LZMA \
  || ENABLE_FEATURE_SEAMLESS_BZ2 \
  || ENABLE_FEATURE_SEAMLESS_GZ \
- /* || ENABLE_FEATURE_SEAMLESS_Z */
-extern void setup_unzip_on_fd(int fd /*, int fail_if_not_detected*/) FAST_FUNC;
-#else
-# define setup_unzip_on_fd(...) ((void)0)
-#endif
+ || ENABLE_FEATURE_SEAMLESS_Z)
+
+#if SEAMLESS_COMPRESSION
+/* Autodetects gzip/bzip2 formats. fd may be in the middle of the file! */
+extern int setup_unzip_on_fd(int fd, int fail_if_not_detected) FAST_FUNC;
 /* Autodetects .gz etc */
 extern int open_zipped(const char *fname) FAST_FUNC;
+#else
+# define setup_unzip_on_fd(...) (0)
+# define open_zipped(fname)     open((fname), O_RDONLY);
+#endif
 extern void *xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_p) FAST_FUNC RETURNS_MALLOC;
-/* Never returns NULL */
-extern void *xmalloc_xopen_read_close(const char *filename, size_t *maxsz_p) FAST_FUNC RETURNS_MALLOC;
 
 extern ssize_t safe_write(int fd, const void *buf, size_t count) FAST_FUNC;
@@ -693 +750 @@
 extern void xprint_and_close_file(FILE *file) FAST_FUNC;
 
+/* Reads a line from a text file, up to a newline or NUL byte, inclusive.
+ * Returns malloc'ed char*. If end is NULL '\n' isn't considered
+ * end of line. If end isn't NULL, length of the chunk is stored in it.
+ * Returns NULL if EOF/error.
+ */
 extern char *bb_get_chunk_from_file(FILE *file, int *end) FAST_FUNC;
-extern char *bb_get_chunk_with_continuation(FILE *file, int *end, int *lineno) FAST_FUNC;
 /* Reads up to (and including) TERMINATING_STRING: */
 extern char *xmalloc_fgets_str(FILE *file, const char *terminating_string) FAST_FUNC RETURNS_MALLOC;
@@ -736 +797 @@
 
 char *safe_gethostname(void) FAST_FUNC;
-char *safe_getdomainname(void) FAST_FUNC;
 
 /* Convert each alpha char in str to lower-case */
@@ -759 +819 @@
         unsigned long block_size, unsigned long display_unit) FAST_FUNC;
 /* Put a string of hex bytes ("1b2e66fe"...), return advanced pointer */
-char *bin2hex(char *buf, const char *cp, int count) FAST_FUNC;
+char *bin2hex(char *dst, const char *src, int count) FAST_FUNC;
 /* Reverse */
-char* hex2bin(char *dst, const char *str, int count) FAST_FUNC;
+char* hex2bin(char *dst, const char *src, int count) FAST_FUNC;
 
 /* Generate a UUID */
@@ -813 +873 @@
 char* uid2uname(uid_t uid) FAST_FUNC;
 char* gid2group(gid_t gid) FAST_FUNC;
-char* uid2uname_utoa(long uid) FAST_FUNC;
-char* gid2group_utoa(long gid) FAST_FUNC;
+char* uid2uname_utoa(uid_t uid) FAST_FUNC;
+char* gid2group_utoa(gid_t gid) FAST_FUNC;
 /* versions which cache results (useful for ps, ls etc) */
 const char* get_cached_username(uid_t uid) FAST_FUNC;
@@ -820 +880 @@
 void clear_username_cache(void) FAST_FUNC;
 /* internally usernames are saved in fixed-sized char[] buffers */
-enum { USERNAME_MAX_SIZE = 16 - sizeof(int) };
+enum { USERNAME_MAX_SIZE = 32 - sizeof(uid_t) };
 #if ENABLE_FEATURE_CHECK_NAMES
 void die_if_bad_username(const char* name) FAST_FUNC;
@@ -835 +895 @@
 #endif
 
+
 int execable_file(const char *name) FAST_FUNC;
 char *find_execable(const char *filename, char **PATHp) FAST_FUNC;
@@ -843 +904 @@
  */
 #if ENABLE_FEATURE_PREFER_APPLETS
-int bb_execvp(const char *file, char *const argv[]) FAST_FUNC;
-#define BB_EXECVP(prog,cmd) bb_execvp(prog,cmd)
+int BB_EXECVP(const char *file, char *const argv[]) FAST_FUNC;
 #define BB_EXECLP(prog,cmd,...) \
-    execlp((find_applet_by_name(prog) >= 0) ? CONFIG_BUSYBOX_EXEC_PATH : prog, \
-        cmd, __VA_ARGS__)
+    do { \
+        if (find_applet_by_name(prog) >= 0) \
+            execlp(bb_busybox_exec_path, cmd, __VA_ARGS__); \
+        execlp(prog, cmd, __VA_ARGS__); \
+    } while (0)
 #else
 #define BB_EXECVP(prog,cmd)     execvp(prog,cmd)
-#define BB_EXECLP(prog,cmd,...) execlp(prog,cmd, __VA_ARGS__)
+#define BB_EXECLP(prog,cmd,...) execlp(prog,cmd,__VA_ARGS__)
 #endif
 int BB_EXECVP_or_die(char **argv) NORETURN FAST_FUNC;
@@ -884 +947 @@
 /* Same as wait4pid(spawn(argv)), but with NOFORK/NOEXEC if configured: */
 int spawn_and_wait(char **argv) FAST_FUNC;
-struct nofork_save_area {
-    jmp_buf die_jmp;
-    const char *applet_name;
-    uint32_t option_mask32;
-    int die_sleep;
-    uint8_t xfunc_error_retval;
-    smallint saved;
-};
-void save_nofork_data(struct nofork_save_area *save) FAST_FUNC;
-void restore_nofork_data(struct nofork_save_area *save) FAST_FUNC;
 /* Does NOT check that applet is NOFORK, just blindly runs it */
 int run_nofork_applet(int applet_no, char **argv) FAST_FUNC;
-int run_nofork_applet_prime(struct nofork_save_area *old, int applet_no, char **argv) FAST_FUNC;
 
 /* Helpers for daemonization.
@@ -926 +978 @@
     DAEMON_CLOSE_EXTRA_FDS = 4,
     DAEMON_ONLY_SANITIZE = 8, /* internal use */
+    DAEMON_DOUBLE_FORK = 16, /* double fork to avoid controlling tty */
 };
 #if BB_MMU
@@ -934 +987 @@
 #else
   extern bool re_execed;
+  /* Note: re_exec() and fork_or_rexec() do argv[0][0] |= 0x80 on NOMMU!
+   * _Parent_ needs to undo it if it doesn't want to have argv[0] mangled.
+   */
   void re_exec(char **argv) NORETURN FAST_FUNC;
   pid_t fork_or_rexec(char **argv) FAST_FUNC;
@@ -963 +1019 @@
 
 
+/* Having next pointer as a first member allows easy creation
+ * of "llist-compatible" structs, and using llist_FOO functions
+ * on them.
+ */
 typedef struct llist_t {
+    struct llist_t *link;
     char *data;
-    struct llist_t *link;
 } llist_t;
 void llist_add_to(llist_t **old_head, void *data) FAST_FUNC;
@@ -1116 +1176 @@
  * malloc and return it in *devname.
  * return value: 1: read-only loopdev was setup, 0: rw, < 0: error */
-extern int set_loop(char **devname, const char *file, unsigned long long offset) FAST_FUNC;
+extern int set_loop(char **devname, const char *file, unsigned long long offset, int ro) FAST_FUNC;
 
 /* Like bb_ask below, but asks on stdin with no timeout.  */
@@ -1137 +1197 @@
     // keep a copy of current line
     PARSE_KEEP_COPY = 0x00200000 * ENABLE_FEATURE_CROND_D,
-//  PARSE_ESCAPE    = 0x00400000, // process escape sequences in tokens
+    PARSE_EOL_COMMENTS = 0x00400000, // comments are recognized even if they aren't the first char
     // NORMAL is:
     // * remove leading and trailing delimiters and collapse
@@ -1143 +1203 @@
     // * warn and continue if less than mintokens delimiters found
     // * grab everything into last token
-    PARSE_NORMAL    = PARSE_COLLAPSE | PARSE_TRIM | PARSE_GREEDY,
+    // * comments are recognized even if they aren't the first char
+    PARSE_NORMAL    = PARSE_COLLAPSE | PARSE_TRIM | PARSE_GREEDY | PARSE_EOL_COMMENTS,
 };
 typedef struct parser_t {
     FILE *fp;
-    char *line;
     char *data;
+    char *line, *nline;
+    size_t line_alloc, nline_alloc;
     int lineno;
 } parser_t;
@@ -1164 +1226 @@
  * filename should not be NULL. */
 char *concat_path_file(const char *path, const char *filename) FAST_FUNC;
+/* Returns NULL on . and .. */
 char *concat_subpath_file(const char *path, const char *filename) FAST_FUNC;
-const char *bb_basename(const char *name) FAST_FUNC;
-/* NB: can violate const-ness (similarly to strchr) */
-char *last_char_is(const char *s, int c) FAST_FUNC;
 
 
@@ -1180 +1240 @@
 char *bb_simplify_abs_path_inplace(char *path) FAST_FUNC;
 
-#define FAIL_DELAY 3
+#define LOGIN_FAIL_DELAY 3
 extern void bb_do_delay(int seconds) FAST_FUNC;
 extern void change_identity(const struct passwd *pw) FAST_FUNC;
 extern void run_shell(const char *shell, int loginshell, const char *command, const char **additional_args) NORETURN FAST_FUNC;
+
+/* Returns $SHELL, getpwuid(getuid())->pw_shell, or DEFAULT_SHELL.
+ * Note that getpwuid result might need xstrdup'ing
+ * if there is a possibility of intervening getpwxxx() calls.
+ */
+const char *get_shell_name(void) FAST_FUNC;
+
 #if ENABLE_SELINUX
 extern void renew_current_security_context(void) FAST_FUNC;
@@ -1195 +1262 @@
 #endif
 extern void selinux_or_die(void) FAST_FUNC;
+
+
+/* systemd support */
+#define SD_LISTEN_FDS_START 3
+int sd_listen_fds(void);
+
 
 /* setup_environment:
@@ -1214 +1287 @@
 #define SETUP_ENV_CLEARENV  (1 << 1)
 #define SETUP_ENV_TO_TMP    (1 << 2)
+#define SETUP_ENV_NO_CHDIR  (1 << 4)
 extern void setup_environment(const char *shell, int flags, const struct passwd *pw) FAST_FUNC;
 extern int correct_password(const struct passwd *pw) FAST_FUNC;
@@ -1222 +1296 @@
 extern char *pw_encrypt(const char *clear, const char *salt, int cleanup) FAST_FUNC;
 extern int obscure(const char *old, const char *newval, const struct passwd *pwdp) FAST_FUNC;
-/* rnd is additional random input. New one is returned.
+/*
+ * rnd is additional random input. New one is returned.
  * Useful if you call crypt_make_salt many times in a row:
  * rnd = crypt_make_salt(buf1, 4, 0);
@@ -1229 +1304 @@
  * (otherwise we risk having same salt generated)
  */
-extern int crypt_make_salt(char *p, int cnt, int rnd) FAST_FUNC;
+extern int crypt_make_salt(char *p, int cnt /*, int rnd*/) FAST_FUNC;
+/* "$N$" + sha_salt_16_bytes + NUL */
+#define MAX_PW_SALT_LEN (3 + 16 + 1)
+extern char* crypt_make_pw_salt(char p[MAX_PW_SALT_LEN], const char *algo) FAST_FUNC;
+
 
 /* Returns number of lines changed, or -1 on error */
@@ -1276 +1355 @@
 #ifdef __GLIBC__
 /* At least glibc has horrendously large inline for this, so wrap it */
-unsigned long long bb_makedev(unsigned int major, unsigned int minor) FAST_FUNC;
+unsigned long long bb_makedev(unsigned major, unsigned minor) FAST_FUNC;
 #undef makedev
 #define makedev(a,b) bb_makedev(a,b)
@@ -1297 +1376 @@
     KEYCODE_PAGEUP   = -10,
     KEYCODE_PAGEDOWN = -11,
-
-    KEYCODE_CTRL_UP    = KEYCODE_UP    & ~0x40,
-    KEYCODE_CTRL_DOWN  = KEYCODE_DOWN  & ~0x40,
+    // -12 is reserved for Alt/Ctrl/Shift-TAB
+#if 0
+    KEYCODE_FUN1     = -13,
+    KEYCODE_FUN2     = -14,
+    KEYCODE_FUN3     = -15,
+    KEYCODE_FUN4     = -16,
+    KEYCODE_FUN5     = -17,
+    KEYCODE_FUN6     = -18,
+    KEYCODE_FUN7     = -19,
+    KEYCODE_FUN8     = -20,
+    KEYCODE_FUN9     = -21,
+    KEYCODE_FUN10    = -22,
+    KEYCODE_FUN11    = -23,
+    KEYCODE_FUN12    = -24,
+#endif
+    /* Be sure that last defined value is small enough
+     * to not interfere with Alt/Ctrl/Shift bits.
+     * So far we do not exceed -31 (0xfff..fffe1),
+     * which gives us three upper bits in LSB to play with.
+     */
+    //KEYCODE_SHIFT_TAB  = (-12)         & ~0x80,
+    //KEYCODE_SHIFT_...  = KEYCODE_...   & ~0x80,
+    //KEYCODE_CTRL_UP    = KEYCODE_UP    & ~0x40,
+    //KEYCODE_CTRL_DOWN  = KEYCODE_DOWN  & ~0x40,
     KEYCODE_CTRL_RIGHT = KEYCODE_RIGHT & ~0x40,
     KEYCODE_CTRL_LEFT  = KEYCODE_LEFT  & ~0x40,
-#if 0
-    KEYCODE_FUN1     = -12,
-    KEYCODE_FUN2     = -13,
-    KEYCODE_FUN3     = -14,
-    KEYCODE_FUN4     = -15,
-    KEYCODE_FUN5     = -16,
-    KEYCODE_FUN6     = -17,
-    KEYCODE_FUN7     = -18,
-    KEYCODE_FUN8     = -19,
-    KEYCODE_FUN9     = -20,
-    KEYCODE_FUN10    = -21,
-    KEYCODE_FUN11    = -22,
-    KEYCODE_FUN12    = -23,
-#endif
+    //KEYCODE_ALT_UP     = KEYCODE_UP    & ~0x20,
+    //KEYCODE_ALT_DOWN   = KEYCODE_DOWN  & ~0x20,
+    KEYCODE_ALT_RIGHT  = KEYCODE_RIGHT & ~0x20,
+    KEYCODE_ALT_LEFT   = KEYCODE_LEFT  & ~0x20,
+
     KEYCODE_CURSOR_POS = -0x100, /* 0xfff..fff00 */
     /* How long is the longest ESC sequence we know?
@@ -1342 +1433 @@
 #if ENABLE_FEATURE_EDITING
 /* It's NOT just ENABLEd or disabled. It's a number: */
-# ifdef CONFIG_FEATURE_EDITING_HISTORY
+# if defined CONFIG_FEATURE_EDITING_HISTORY && CONFIG_FEATURE_EDITING_HISTORY > 0
 #  define MAX_HISTORY (CONFIG_FEATURE_EDITING_HISTORY + 0)
+unsigned size_from_HISTFILESIZE(const char *hp);
 # else
 #  define MAX_HISTORY 0
@@ -1353 +1445 @@
     int cnt_history;
     int cur_history;
+    int max_history; /* must never be <= 0 */
 #  if ENABLE_FEATURE_EDITING_SAVEHISTORY
+    /* meaning of this field depends on FEATURE_EDITING_SAVE_ON_EXIT:
+     * if !FEATURE_EDITING_SAVE_ON_EXIT: "how many lines are
+     * in on-disk history"
+     * if FEATURE_EDITING_SAVE_ON_EXIT: "how many in-memory lines are
+     * also in on-disk history (and thus need to be skipped on save)"
+     */
     unsigned cnt_history_in_file;
     const char *hist_file;
@@ -1361 +1460 @@
 } line_input_t;
 enum {
-    DO_HISTORY = 1 * (MAX_HISTORY > 0),
-    SAVE_HISTORY = 2 * (MAX_HISTORY > 0) * ENABLE_FEATURE_EDITING_SAVEHISTORY,
-    TAB_COMPLETION = 4 * ENABLE_FEATURE_TAB_COMPLETION,
-    USERNAME_COMPLETION = 8 * ENABLE_FEATURE_USERNAME_COMPLETION,
-    VI_MODE = 0x10 * ENABLE_FEATURE_EDITING_VI,
-    WITH_PATH_LOOKUP = 0x20,
-    FOR_SHELL = DO_HISTORY | SAVE_HISTORY | TAB_COMPLETION | USERNAME_COMPLETION,
+    DO_HISTORY       = 1 * (MAX_HISTORY > 0),
+    TAB_COMPLETION   = 2 * ENABLE_FEATURE_TAB_COMPLETION,
+    USERNAME_COMPLETION = 4 * ENABLE_FEATURE_USERNAME_COMPLETION,
+    VI_MODE          = 8 * ENABLE_FEATURE_EDITING_VI,
+    WITH_PATH_LOOKUP = 0x10,
+    FOR_SHELL        = DO_HISTORY | TAB_COMPLETION | USERNAME_COMPLETION,
 };
 line_input_t *new_line_input_t(int flags) FAST_FUNC;
 /* So far static: void free_line_input_t(line_input_t *n) FAST_FUNC; */
-/* maxsize must be >= 2.
+/*
+ * maxsize must be >= 2.
  * Returns:
  * -1 on read errors or EOF, or on bare Ctrl-D,
@@ -1377 +1476 @@
  * >0 length of input string, including terminating '\n'
  */
-int read_line_input(const char* prompt, char* command, int maxsize, line_input_t *state) FAST_FUNC;
+int read_line_input(line_input_t *st, const char *prompt, char *command, int maxsize, int timeout) FAST_FUNC;
+# if ENABLE_FEATURE_EDITING_SAVE_ON_EXIT
+void save_history(line_input_t *st);
+# endif
 #else
 #define MAX_HISTORY 0
 int read_line_input(const char* prompt, char* command, int maxsize) FAST_FUNC;
-#define read_line_input(prompt, command, maxsize, state) \
+#define read_line_input(state, prompt, command, maxsize, timeout) \
     read_line_input(prompt, command, maxsize)
 #endif
@@ -1415 +1517 @@
 #endif
 int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total,
-              void (*cb)(struct smaprec *, void *), void *data);
+        void (*cb)(struct smaprec *, void *), void *data);
 
 typedef struct procps_status_t {
@@ -1427 +1529 @@
     char *exe;
     IF_SELINUX(char *context;)
+    IF_FEATURE_SHOW_THREADS(unsigned main_thread_pid;)
     /* Everything below must contain no ptrs to malloc'ed data:
      * it is memset(0) for each process in procps_scan() */
@@ -1488 +1591 @@
     PSSCAN_RUIDGID  = (1 << 21) * ENABLE_FEATURE_PS_ADDITIONAL_COLUMNS,
     PSSCAN_TASKS    = (1 << 22) * ENABLE_FEATURE_SHOW_THREADS,
-    /* These are all retrieved from proc/NN/stat in one go: */
-    PSSCAN_STAT     = PSSCAN_PPID | PSSCAN_PGID | PSSCAN_SID
-    /**/            | PSSCAN_COMM | PSSCAN_STATE
-    /**/            | PSSCAN_VSZ | PSSCAN_RSS
-    /**/            | PSSCAN_STIME | PSSCAN_UTIME | PSSCAN_START_TIME
-    /**/            | PSSCAN_TTY | PSSCAN_NICE
-    /**/            | PSSCAN_CPU
 };
 //procps_status_t* alloc_procps_scan(void) FAST_FUNC;
@@ -1508 +1604 @@
 
 
-extern const char bb_uuenc_tbl_base64[];
-extern const char bb_uuenc_tbl_std[];
+/* Use strict=1 if you process input from untrusted source:
+ * it will return NULL on invalid %xx (bad hex chars)
+ * and str + 1 if decoded char is / or NUL.
+ * In non-strict mode, it always succeeds (returns str),
+ * and also it additionally decoded '+' to space.
+ */
+char *percent_decode_in_place(char *str, int strict) FAST_FUNC;
+
+
+extern const char bb_uuenc_tbl_base64[] ALIGN1;
+extern const char bb_uuenc_tbl_std[] ALIGN1;
 void bb_uuencode(char *store, const void *s, int length, const char *tbl) FAST_FUNC;
 enum {
@@ -1516 +1621 @@
     BASE64_FLAG_NO_STOP_CHAR = 0x80,
 };
-void FAST_FUNC read_base64(FILE *src_stream, FILE *dst_stream, int flags);
+const char *decode_base64(char **pp_dst, const char *src) FAST_FUNC;
+void read_base64(FILE *src_stream, FILE *dst_stream, int flags) FAST_FUNC;
 
 typedef struct md5_ctx_t {
@@ -1531 +1637 @@
     uint8_t wbuffer[128]; /* always correctly aligned for uint64_t */
 } sha512_ctx_t;
+typedef struct sha3_ctx_t {
+    uint64_t state[25];
+    unsigned bytes_queued;
+} sha3_ctx_t;
 void md5_begin(md5_ctx_t *ctx) FAST_FUNC;
-void md5_hash(md5_ctx_t *ctx, const void *data, size_t length) FAST_FUNC;
+void md5_hash(md5_ctx_t *ctx, const void *buffer, size_t len) FAST_FUNC;
 void md5_end(md5_ctx_t *ctx, void *resbuf) FAST_FUNC;
 void sha1_begin(sha1_ctx_t *ctx) FAST_FUNC;
@@ -1543 +1653 @@
 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;
+void sha3_begin(sha3_ctx_t *ctx) FAST_FUNC;
+void sha3_hash(sha3_ctx_t *ctx, const void *buffer, size_t len) FAST_FUNC;
+void sha3_end(sha3_ctx_t *ctx, void *resbuf) FAST_FUNC;
 
 extern uint32_t *global_crc32_table;
@@ -1558 +1671 @@
 
 typedef struct bb_progress_t {
-    off_t lastsize;
-    unsigned lastupdate_sec;
+    unsigned last_size;
+    unsigned last_update_sec;
+    unsigned last_change_sec;
     unsigned start_sec;
-    smallint inited;
+    const char *curfile;
 } bb_progress_t;
 
-void bb_progress_init(bb_progress_t *p) FAST_FUNC;
-void bb_progress_update(bb_progress_t *p, const char *curfile,
-            off_t beg_range, off_t transferred,
-            off_t totalsize) FAST_FUNC;
+#define is_bb_progress_inited(p) ((p)->curfile != NULL)
+#define bb_progress_free(p) do { \
+    if (ENABLE_UNICODE_SUPPORT) free((char*)((p)->curfile)); \
+    (p)->curfile = NULL; \
+} while (0)
+void bb_progress_init(bb_progress_t *p, const char *curfile) FAST_FUNC;
+void bb_progress_update(bb_progress_t *p,
+            uoff_t beg_range,
+            uoff_t transferred,
+            uoff_t totalsize) FAST_FUNC;
+
 
 extern const char *applet_name;
@@ -1581 +1702 @@
  */
 /* "BusyBox vN.N.N (timestamp or extra_version)" */
-extern const char bb_banner[];
-extern const char bb_msg_memory_exhausted[];
-extern const char bb_msg_invalid_date[];
+extern const char bb_banner[] ALIGN1;
+extern const char bb_msg_memory_exhausted[] ALIGN1;
+extern const char bb_msg_invalid_date[] ALIGN1;
 #define bb_msg_read_error "read error"
 #define bb_msg_write_error "write error"
-extern const char bb_msg_unknown[];
-extern const char bb_msg_can_not_create_raw_socket[];
-extern const char bb_msg_perm_denied_are_you_root[];
-extern const char bb_msg_you_must_be_root[];
-extern const char bb_msg_requires_arg[];
-extern const char bb_msg_invalid_arg[];
-extern const char bb_msg_standard_input[];
-extern const char bb_msg_standard_output[];
+extern const char bb_msg_unknown[] ALIGN1;
+extern const char bb_msg_can_not_create_raw_socket[] ALIGN1;
+extern const char bb_msg_perm_denied_are_you_root[] ALIGN1;
+extern const char bb_msg_you_must_be_root[] ALIGN1;
+extern const char bb_msg_requires_arg[] ALIGN1;
+extern const char bb_msg_invalid_arg[] ALIGN1;
+extern const char bb_msg_standard_input[] ALIGN1;
+extern const char bb_msg_standard_output[] ALIGN1;
 
 /* NB: (bb_hexdigits_upcase[i] | 0x20) -> lowercase hex digit */
-extern const char bb_hexdigits_upcase[];
-
-extern const char bb_path_wtmp_file[];
+extern const char bb_hexdigits_upcase[] ALIGN1;
+
+extern const char bb_path_wtmp_file[] ALIGN1;
 
 /* Busybox mount uses either /proc/mounts or /etc/mtab to
@@ -1604 +1725 @@
 #define bb_path_mtab_file IF_FEATURE_MTAB_SUPPORT("/etc/mtab")IF_NOT_FEATURE_MTAB_SUPPORT("/proc/mounts")
 
-#define bb_path_passwd_file "/etc/passwd"
-#define bb_path_shadow_file "/etc/shadow"
-#define bb_path_gshadow_file "/etc/gshadow"
-#define bb_path_group_file "/etc/group"
+#define bb_path_passwd_file  _PATH_PASSWD
+#define bb_path_group_file   _PATH_GROUP
+#define bb_path_shadow_file  _PATH_SHADOW
+#define bb_path_gshadow_file _PATH_GSHADOW
 
 #define bb_path_motd_file "/etc/motd"
 
 #define bb_dev_null "/dev/null"
-extern const char bb_busybox_exec_path[];
+extern const char bb_busybox_exec_path[] ALIGN1;
 /* util-linux manpage says /sbin:/bin:/usr/sbin:/usr/bin,
  * but I want to save a few bytes here */
-extern const char bb_PATH_root_path[]; /* "PATH=/sbin:/usr/sbin:/bin:/usr/bin" */
+extern const char bb_PATH_root_path[] ALIGN1; /* "PATH=/sbin:/usr/sbin:/bin:/usr/bin" */
 #define bb_default_root_path (bb_PATH_root_path + sizeof("PATH"))
 #define bb_default_path      (bb_PATH_root_path + sizeof("PATH=/sbin:/usr/sbin"))
@@ -1645 +1766 @@
  * don't forget to change increment constant. */
 #define LIBBB_DEFAULT_LOGIN_SHELL  "-/bin/sh"
-extern const char bb_default_login_shell[];
+extern const char bb_default_login_shell[] ALIGN1;
 /* "/bin/sh" */
 #define DEFAULT_SHELL              (bb_default_login_shell+1)

branches/3.2/mindi-busybox/include/platform.h

@@ -8 +8 @@
 #define BB_PLATFORM_H 1
 
-/* Assume all these functions exist by default.  Platforms where it is not
- * true will #undef them below.
- */
-#define HAVE_FDPRINTF 1
-#define HAVE_MEMRCHR 1
-#define HAVE_MKDTEMP 1
-#define HAVE_SETBIT 1
-#define HAVE_STRCASESTR 1
-#define HAVE_STRCHRNUL 1
-#define HAVE_STRSEP 1
-#define HAVE_STRSIGNAL 1
-#define HAVE_VASPRINTF 1
 
 /* Convenience macros to test the version of gcc. */
@@ -36 +24 @@
 # endif
 #endif
-
-/* Define macros for some gcc attributes.  This permits us to use the
-   macros freely, and know that they will come into play for the
-   version of gcc in which they are supported.  */
 
 #if !__GNUC_PREREQ(2,7)
@@ -94 +78 @@
 
 /* -fwhole-program makes all symbols local. The attribute externally_visible
-   forces a symbol global.  */
+ * forces a symbol global.  */
 #if __GNUC_PREREQ(4,1)
 # define EXTERNALLY_VISIBLE __attribute__(( visibility("default") ))
@@ -110 +94 @@
 
 /* We use __extension__ in some places to suppress -pedantic warnings
-   about GCC extensions.  This feature didn't work properly before
-   gcc 2.8.  */
+ * about GCC extensions.  This feature didn't work properly before
+ * gcc 2.8.  */
 #if !__GNUC_PREREQ(2,8)
 # ifndef __extension__
 #  define __extension__
-# endif
-#endif
-
-/* gcc-2.95 had no va_copy but only __va_copy. */
-#if !__GNUC_PREREQ(3,0)
-# include <stdarg.h>
-# if !defined va_copy && defined __va_copy
-#  define va_copy(d,s) __va_copy((d),(s))
 # endif
 #endif
@@ -141 +117 @@
 /* Make all declarations hidden (-fvisibility flag only affects definitions) */
 /* (don't include system headers after this until corresponding pop!) */
-#if __GNUC_PREREQ(4,1)
+#if __GNUC_PREREQ(4,1) && !defined(__CYGWIN__)
 # define PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN _Pragma("GCC visibility push(hidden)")
 # define POP_SAVED_FUNCTION_VISIBILITY              _Pragma("GCC visibility pop")
@@ -148 +124 @@
 # define POP_SAVED_FUNCTION_VISIBILITY
 #endif
+
+/* gcc-2.95 had no va_copy but only __va_copy. */
+#if !__GNUC_PREREQ(3,0)
+# include <stdarg.h>
+# if !defined va_copy && defined __va_copy
+#  define va_copy(d,s) __va_copy((d),(s))
+# endif
+#endif
+
 
 /* ---- Endian Detection ------------------------------------ */
@@ -216 +201 @@
 #endif
 
+
 /* ---- Unaligned access ------------------------------------ */
+
+#include <stdint.h>
+typedef int      bb__aliased_int      FIX_ALIASING;
+typedef long     bb__aliased_long     FIX_ALIASING;
+typedef uint16_t bb__aliased_uint16_t FIX_ALIASING;
+typedef uint32_t bb__aliased_uint32_t FIX_ALIASING;
 
 /* NB: unaligned parameter should be a pointer, aligned one -
@@ -222 +214 @@
  */
 #if defined(i386) || defined(__x86_64__) || defined(__powerpc__)
-# include <stdint.h>
-typedef int      bb__aliased_int      FIX_ALIASING;
-typedef uint16_t bb__aliased_uint16_t FIX_ALIASING;
-typedef uint32_t bb__aliased_uint32_t FIX_ALIASING;
-# define move_from_unaligned_int(v, intp) ((v) = *(bb__aliased_int*)(intp))
+# define move_from_unaligned_int(v, intp)  ((v) = *(bb__aliased_int*)(intp))
+# define move_from_unaligned_long(v, longp) ((v) = *(bb__aliased_long*)(longp))
 # define move_from_unaligned16(v, u16p) ((v) = *(bb__aliased_uint16_t*)(u16p))
 # define move_from_unaligned32(v, u32p) ((v) = *(bb__aliased_uint32_t*)(u32p))
@@ -235 +224 @@
 /* performs reasonably well (gcc usually inlines memcpy here) */
 # define move_from_unaligned_int(v, intp) (memcpy(&(v), (intp), sizeof(int)))
+# define move_from_unaligned_long(v, longp) (memcpy(&(v), (longp), sizeof(long)))
 # define move_from_unaligned16(v, u16p) (memcpy(&(v), (u16p), 2))
 # define move_from_unaligned32(v, u32p) (memcpy(&(v), (u32p), 4))
 # define move_to_unaligned16(u16p, v) do { \
     uint16_t __t = (v); \
-    memcpy((u16p), &__t, 4); \
+    memcpy((u16p), &__t, 2); \
 } while (0)
 # define move_to_unaligned32(u32p, v) do { \
@@ -247 +237 @@
 #endif
 
-/* ---- Compiler dependent settings ------------------------- */
-
-#if (defined __digital__ && defined __unix__) \
- || defined __APPLE__ \
- || defined __FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__
-# undef HAVE_MNTENT_H
-# undef HAVE_SYS_STATFS_H
-#else
-# define HAVE_MNTENT_H 1
-/*  Patch bco to compile this busybox on rhel3  */
-#include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-# define HAVE_SYS_STATFS_H 1
-#endif
-#endif
-
-/*----- Kernel versioning ------------------------------------*/
-
-#ifndef KERNEL_VERSION
-#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-#endif
-
-/* ---- Miscellaneous --------------------------------------- */
-
-#if defined __GLIBC__ || defined __UCLIBC__ \
- || defined __dietlibc__ || defined _NEWLIB_VERSION
-# include <features.h>
-#endif
-
-/* Size-saving "small" ints (arch-dependent) */
+
+/* ---- Size-saving "small" ints (arch-dependent) ----------- */
+
 #if defined(i386) || defined(__x86_64__) || defined(__mips__) || defined(__cris__)
 /* add other arches which benefit from this... */
@@ -296 +259 @@
 #endif
 
-/* Try to defeat gcc's alignment of "char message[]"-like data */
-#if 1 /* if needed: !defined(arch1) && !defined(arch2) */
+
+/*----- Kernel versioning ------------------------------------*/
+
+#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
+
+
+/* ---- Miscellaneous --------------------------------------- */
+
+#if defined __GLIBC__ \
+ || defined __UCLIBC__ \
+ || defined __dietlibc__ \
+ || defined __BIONIC__ \
+ || defined _NEWLIB_VERSION
+# include <features.h>
+#endif
+
+/* Define bb_setpgrp */
+#if defined(__digital__) && defined(__unix__)
+/* use legacy setpgrp(pid_t, pid_t) for now.  move to platform.c */
+# define bb_setpgrp() do { pid_t __me = getpid(); setpgrp(__me, __me); } while (0)
+#else
+# define bb_setpgrp() setpgrp()
+#endif
+
+/* fdprintf is more readable, we used it before dprintf was standardized */
+#include <unistd.h>
+#define fdprintf dprintf
+
+/* Useful for defeating gcc's alignment of "char message[]"-like data */
+#if !defined(__s390__)
+    /* on s390[x], non-word-aligned data accesses require larger code */
 # define ALIGN1 __attribute__((aligned(1)))
 # define ALIGN2 __attribute__((aligned(2)))
@@ -308 +300 @@
 #endif
 
-
-/* uclibc does not implement daemon() for no-mmu systems.
+/*
  * For 0.9.29 and svn, __ARCH_USE_MMU__ indicates no-mmu reliably.
  * For earlier versions there is no reliable way to check if we are building
@@ -326 +317 @@
 #endif
 
-/* Don't use lchown with glibc older than 2.1.x */
-#if defined(__GLIBC__) && __GLIBC__ <= 2 && __GLIBC_MINOR__ < 1
-# define lchown chown
-#endif
-
 #if defined(__digital__) && defined(__unix__)
-
 # include <standards.h>
 # include <inttypes.h>
 # define PRIu32 "u"
-/* use legacy setpgrp(pid_t,pid_t) for now.  move to platform.c */
-# define bb_setpgrp() do { pid_t __me = getpid(); setpgrp(__me, __me); } while (0)
 # if !defined ADJ_OFFSET_SINGLESHOT && defined MOD_CLKA && defined MOD_OFFSET
 #  define ADJ_OFFSET_SINGLESHOT (MOD_CLKA | MOD_OFFSET)
@@ -350 +333 @@
 #  define ADJ_TICK MOD_CLKB
 # endif
-
-#else
-
-# define bb_setpgrp() setpgrp()
-
-#endif
-
-#if defined(__GLIBC__)
-# define fdprintf dprintf
+#endif
+
+#if defined(__CYGWIN__)
+# define MAXSYMLINKS SYMLOOP_MAX
+#endif
+
+#if defined(ANDROID) || defined(__ANDROID__)
+# define BB_ADDITIONAL_PATH ":/system/sbin:/system/bin:/system/xbin"
+# define SYS_ioprio_set __NR_ioprio_set
+# define SYS_ioprio_get __NR_ioprio_get
+#endif
+
+
+/* ---- Who misses what? ------------------------------------ */
+
+/* Assume all these functions and header files exist by default.
+ * Platforms where it is not true will #undef them below.
+ */
+#define HAVE_CLEARENV 1
+#define HAVE_FDATASYNC 1
+#define HAVE_DPRINTF 1
+#define HAVE_MEMRCHR 1
+#define HAVE_MKDTEMP 1
+#define HAVE_PTSNAME_R 1
+#define HAVE_SETBIT 1
+#define HAVE_SIGHANDLER_T 1
+#define HAVE_STPCPY 1
+#define HAVE_STRCASESTR 1
+#define HAVE_STRCHRNUL 1
+#define HAVE_STRSEP 1
+#define HAVE_STRSIGNAL 1
+#define HAVE_STRVERSCMP 1
+#define HAVE_VASPRINTF 1
+#define HAVE_UNLOCKED_STDIO 1
+#define HAVE_UNLOCKED_LINE_OPS 1
+#define HAVE_GETLINE 1
+#define HAVE_XTABS 1
+#define HAVE_MNTENT_H 1
+#define HAVE_NET_ETHERNET_H 1
+#define HAVE_SYS_STATFS_H 1
+
+#if defined(__UCLIBC_MAJOR__)
+# if __UCLIBC_MAJOR__ == 0 \
+  && (   __UCLIBC_MINOR__ < 9 \
+     || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ < 32) \
+     )
+#  undef HAVE_STRVERSCMP
+# endif
 #endif
 
@@ -366 +388 @@
 
 #if defined(__WATCOMC__)
-# undef HAVE_FDPRINTF
+# undef HAVE_DPRINTF
+# undef HAVE_GETLINE
 # undef HAVE_MEMRCHR
 # undef HAVE_MKDTEMP
 # undef HAVE_SETBIT
+# undef HAVE_STPCPY
 # undef HAVE_STRCASESTR
 # undef HAVE_STRCHRNUL
 # undef HAVE_STRSEP
 # undef HAVE_STRSIGNAL
+# undef HAVE_STRVERSCMP
 # undef HAVE_VASPRINTF
+# undef HAVE_UNLOCKED_STDIO
+# undef HAVE_UNLOCKED_LINE_OPS
+# undef HAVE_NET_ETHERNET_H
+#endif
+
+#if defined(__CYGWIN__)
+# undef HAVE_CLEARENV
+# undef HAVE_FDPRINTF
+# undef HAVE_MEMRCHR
+# undef HAVE_PTSNAME_R
+# undef HAVE_STRVERSCMP
+# undef HAVE_UNLOCKED_LINE_OPS
+#endif
+
+/* These BSD-derived OSes share many similarities */
+#if (defined __digital__ && defined __unix__) \
+ || defined __APPLE__ \
+ || defined __FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__
+# undef HAVE_CLEARENV
+# undef HAVE_FDATASYNC
+# undef HAVE_GETLINE
+# undef HAVE_MNTENT_H
+# undef HAVE_PTSNAME_R
+# undef HAVE_SYS_STATFS_H
+# undef HAVE_SIGHANDLER_T
+# undef HAVE_STRVERSCMP
+# undef HAVE_XTABS
+# undef HAVE_DPRINTF
+# undef HAVE_UNLOCKED_STDIO
+# undef HAVE_UNLOCKED_LINE_OPS
 #endif
 
 #if defined(__FreeBSD__)
 # undef HAVE_STRCHRNUL
+#endif
+
+#if defined(__NetBSD__)
+# define HAVE_GETLINE 1  /* Recent NetBSD versions have getline() */
+#endif
+
+#if defined(__digital__) && defined(__unix__)
+# undef HAVE_STPCPY
+#endif
+
+#if defined(ANDROID) || defined(__ANDROID__)
+# undef HAVE_DPRINTF
+# undef HAVE_GETLINE
+# undef HAVE_STPCPY
+# undef HAVE_STRCHRNUL
+# undef HAVE_STRVERSCMP
+# undef HAVE_UNLOCKED_LINE_OPS
+# undef HAVE_NET_ETHERNET_H
 #endif
 
@@ -386 +459 @@
  */
 
-#ifndef HAVE_FDPRINTF
-extern int fdprintf(int fd, const char *format, ...);
+#ifndef HAVE_DPRINTF
+extern int dprintf(int fd, const char *format, ...);
 #endif
 
@@ -403 +476 @@
 #endif
 
+#ifndef HAVE_SIGHANDLER_T
+typedef void (*sighandler_t)(int);
+#endif
+
+#ifndef HAVE_STPCPY
+extern char *stpcpy(char *p, const char *to_add) FAST_FUNC;
+#endif
+
 #ifndef HAVE_STRCASESTR
 extern char *strcasestr(const char *s, const char *pattern) FAST_FUNC;
@@ -424 +505 @@
 #endif
 
-#endif
+#ifndef HAVE_GETLINE
+# include <stdio.h> /* for FILE */
+# include <sys/types.h> /* size_t */
+extern ssize_t getline(char **lineptr, size_t *n, FILE *stream) FAST_FUNC;
+#endif
+
+#endif

branches/3.2/mindi-busybox/include/pwd_.h

@@ -31 +31 @@
  * so that function calls are directed to bb_internal_XXX replacements
  */
-
+#undef endpwent
 #define setpwent    bb_internal_setpwent
 #define endpwent    bb_internal_endpwent
@@ -64 +64 @@
 /* Write the given entry onto the given stream.  */
 extern int putpwent(const struct passwd *__restrict __p,
-             FILE *__restrict __f);
+        FILE *__restrict __f);
 #endif
 
@@ -82 +82 @@
 
 extern int getpwent_r(struct passwd *__restrict __resultbuf,
-               char *__restrict __buffer, size_t __buflen,
-               struct passwd **__restrict __result);
+        char *__restrict __buffer, size_t __buflen,
+        struct passwd **__restrict __result);
 
 extern int getpwuid_r(uid_t __uid,
-               struct passwd *__restrict __resultbuf,
-               char *__restrict __buffer, size_t __buflen,
-               struct passwd **__restrict __result);
+        struct passwd *__restrict __resultbuf,
+        char *__restrict __buffer, size_t __buflen,
+        struct passwd **__restrict __result);
 
 extern int getpwnam_r(const char *__restrict __name,
-               struct passwd *__restrict __resultbuf,
-               char *__restrict __buffer, size_t __buflen,
-               struct passwd **__restrict __result);
+        struct passwd *__restrict __resultbuf,
+        char *__restrict __buffer, size_t __buflen,
+        struct passwd **__restrict __result);
 
 /* Read an entry from STREAM.  This function is not standardized and
    probably never will.  */
 extern int fgetpwent_r(FILE *__restrict __stream,
-            struct passwd *__restrict __resultbuf,
-            char *__restrict __buffer, size_t __buflen,
-            struct passwd **__restrict __result);
+        struct passwd *__restrict __resultbuf,
+        char *__restrict __buffer, size_t __buflen,
+        struct passwd **__restrict __result);
 
 POP_SAVED_FUNCTION_VISIBILITY

branches/3.2/mindi-busybox/include/shadow_.h

@@ -37 +37 @@
     unsigned long sp_flag;  /* Reserved */
 };
-
-/* Paths to the user database files */
-#ifndef _PATH_SHADOW
-#define _PATH_SHADOW "/etc/shadow"
-#endif
 
 #define setspent    bb_internal_setspent
@@ -85 +80 @@
 /* Reentrant versions of some of the functions above */
 extern int getspent_r(struct spwd *__result_buf, char *__buffer,
-               size_t __buflen, struct spwd **__result);
+        size_t __buflen, struct spwd **__result);
 #endif
 
 extern int getspnam_r(const char *__name, struct spwd *__result_buf,
-               char *__buffer, size_t __buflen,
-               struct spwd **__result);
+        char *__buffer, size_t __buflen,
+        struct spwd **__result);
 
 #ifdef UNUSED_FOR_NOW
 extern int sgetspent_r(const char *__string, struct spwd *__result_buf,
-            char *__buffer, size_t __buflen,
-            struct spwd **__result);
+        char *__buffer, size_t __buflen,
+        struct spwd **__result);
 
 extern int fgetspent_r(FILE *__stream, struct spwd *__result_buf,
-            char *__buffer, size_t __buflen,
-            struct spwd **__result);
+        char *__buffer, size_t __buflen,
+        struct spwd **__result);
 /* Protect password file against multi writers */
 extern int lckpwdf(void);

branches/3.2/mindi-busybox/include/unicode.h

@@ -28 +28 @@
 # define unicode_status UNICODE_OFF
 # define init_unicode() ((void)0)
+# define reinit_unicode(LANG) ((void)0)
 
 #else
@@ -61 +62 @@
 //UNUSED: char* FAST_FUNC unicode_conv_to_printable2(uni_stat_t *stats, const char *src, unsigned width, int flags);
 char* FAST_FUNC unicode_conv_to_printable(uni_stat_t *stats, const char *src);
-char* FAST_FUNC unicode_conv_to_printable_maxwidth(uni_stat_t *stats, const char *src, unsigned maxwidth);
-char* FAST_FUNC unicode_conv_to_printable_fixedwidth(uni_stat_t *stats, const char *src, unsigned width);
+//UNUSED: char* FAST_FUNC unicode_conv_to_printable_maxwidth(uni_stat_t *stats, const char *src, unsigned maxwidth);
+char* FAST_FUNC unicode_conv_to_printable_fixedwidth(/*uni_stat_t *stats,*/ const char *src, unsigned width);
 
 # if ENABLE_UNICODE_USING_LOCALE
@@ -68 +69 @@
 extern uint8_t unicode_status;
 void init_unicode(void) FAST_FUNC;
+void reinit_unicode(const char *LANG) FAST_FUNC;
 
 # else
@@ -76 +78 @@
 #   define unicode_status UNICODE_ON
 #   define init_unicode() ((void)0)
+#   define reinit_unicode(LANG) ((void)0)
 #  else
 extern uint8_t unicode_status;
 void init_unicode(void) FAST_FUNC;
+void reinit_unicode(const char *LANG) FAST_FUNC;
 #  endif
 

branches/3.2/mindi-busybox/include/usage.src.h

@@ -13 +13 @@
 #define BB_USAGE_H 1
 
-
 #define NOUSAGE_STR "\b"
 
 INSERT
 
-#define acpid_trivial_usage \
-       "[-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    -c DIR  Config directory [/etc/acpi]" \
-     "\n    -d  Don't daemonize, (implies -f)" \
-     "\n    -e FILE /proc event file [/proc/acpi/event]" \
-     "\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 -e /proc/acpi/event\n"
-
-#define addgroup_trivial_usage \
-       "[-g GID] " IF_FEATURE_ADDUSER_TO_GROUP("[USER] ") "GROUP"
-#define addgroup_full_usage "\n\n" \
-       "Add a group " IF_FEATURE_ADDUSER_TO_GROUP("or add a user to a group") "\n" \
-     "\nOptions:" \
-     "\n    -g GID  Group id" \
-     "\n    -S  Create a system group" \
-
-#define adduser_trivial_usage \
-       "[OPTIONS] USER"
-#define adduser_full_usage "\n\n" \
-       "Add a user\n" \
-     "\nOptions:" \
-     "\n    -h DIR      Home directory" \
-     "\n    -g GECOS    GECOS field" \
-     "\n    -s SHELL    Login shell" \
-     "\n    -G GRP      Add user to existing group" \
-     "\n    -S      Create a system user" \
-     "\n    -D      Don't assign a password" \
-     "\n    -H      Don't create home directory" \
-     "\n    -u UID      User id" \
-
-#define adjtimex_trivial_usage \
-       "[-q] [-o OFF] [-f FREQ] [-p TCONST] [-t TICK]"
-#define adjtimex_full_usage "\n\n" \
-       "Read and optionally set system timebase parameters. See adjtimex(2)\n" \
-     "\nOptions:" \
-     "\n    -q  Quiet" \
-     "\n    -o OFF  Time offset, microseconds" \
-     "\n    -f FREQ Frequency adjust, integer kernel units (65536 is 1ppm)" \
-     "\n        (positive values make clock run faster)" \
-     "\n    -t TICK Microseconds per tick, usually 10000" \
-     "\n    -p TCONST" \
-
-#define ar_trivial_usage \
-       "[-o] [-v] [-p] [-t] [-x] ARCHIVE FILES"
-#define ar_full_usage "\n\n" \
-       "Extract or list FILES from an ar archive\n" \
-     "\nOptions:" \
-     "\n    -o  Preserve original dates" \
-     "\n    -p  Extract to stdout" \
-     "\n    -t  List" \
-     "\n    -x  Extract" \
-     "\n    -v  Verbose" \
-
-#define arp_trivial_usage \
-     "\n[-vn]   [-H HWTYPE] [-i IF] -a [HOSTNAME]" \
-     "\n[-v]            [-i IF] -d HOSTNAME [pub]" \
-     "\n[-v]    [-H HWTYPE] [-i IF] -s HOSTNAME HWADDR [temp]" \
-     "\n[-v]    [-H HWTYPE] [-i IF] -s HOSTNAME HWADDR [netmask MASK] pub" \
-     "\n[-v]    [-H HWTYPE] [-i IF] -Ds HOSTNAME IFACE [netmask MASK] pub"
-#define arp_full_usage "\n\n" \
-       "Manipulate ARP cache\n" \
-     "\nOptions:" \
-       "\n  -a      Display (all) hosts" \
-       "\n  -s      Set new ARP entry" \
-       "\n  -d      Delete a specified entry" \
-       "\n  -v      Verbose" \
-       "\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  -H HWTYPE   Hardware address type" \
-
-#define arping_trivial_usage \
-       "[-fqbDUA] [-c CNT] [-w TIMEOUT] [-I IFACE] [-s SRC_IP] DST_IP"
-#define arping_full_usage "\n\n" \
-       "Send ARP requests/replies\n" \
-     "\nOptions:" \
-     "\n    -f      Quit on first ARP reply" \
-     "\n    -q      Quiet" \
-     "\n    -b      Keep broadcasting, don't go unicast" \
-     "\n    -D      Duplicated address detection mode" \
-     "\n    -U      Unsolicited ARP mode, update your neighbors" \
-     "\n    -A      ARP answer mode, update your neighbors" \
-     "\n    -c N        Stop after sending N ARP requests" \
-     "\n    -w TIMEOUT  Time to wait for ARP reply, seconds" \
-     "\n    -I IFACE    Interface to use (default eth0)" \
-     "\n    -s SRC_IP   Sender IP address" \
-     "\n    DST_IP      Target IP address" \
-
-#define awk_trivial_usage \
-       "[OPTIONS] [AWK_PROGRAM] [FILE]..."
-#define awk_full_usage "\n\n" \
-       "Options:" \
-     "\n    -v VAR=VAL  Set variable" \
-     "\n    -F SEP      Use SEP as field separator" \
-     "\n    -f FILE     Read program from FILE" \
-
-#define basename_trivial_usage \
-       "FILE [SUFFIX]"
-#define basename_full_usage "\n\n" \
-       "Strip directory path and .SUFFIX from FILE\n"
-#define basename_example_usage \
-       "$ basename /usr/local/bin/foo\n" \
-       "foo\n" \
-       "$ basename /usr/local/bin/\n" \
-       "bin\n" \
-       "$ basename /foo/bar.txt .txt\n" \
-       "bar"
-
-#define beep_trivial_usage \
-       "-f FREQ -l LEN -d DELAY -r COUNT -n"
-#define beep_full_usage "\n\n" \
-       "Options:" \
-     "\n    -f  Frequency in Hz" \
-     "\n    -l  Length in ms" \
-     "\n    -d  Delay in ms" \
-     "\n    -r  Repetitions" \
-     "\n    -n  Start new tone" \
-
-#define blkid_trivial_usage \
-       ""
-#define blkid_full_usage "\n\n" \
-       "Print UUIDs of all filesystems"
-
-#define brctl_trivial_usage \
-       "COMMAND [BRIDGE [INTERFACE]]"
-#define brctl_full_usage "\n\n" \
-       "Manage ethernet bridges\n" \
-     "\nCommands:" \
-    IF_FEATURE_BRCTL_SHOW( \
-     "\n    show            Show a list of bridges" \
-    ) \
-     "\n    addbr BRIDGE        Create BRIDGE" \
-     "\n    delbr BRIDGE        Delete BRIDGE" \
-     "\n    addif BRIDGE IFACE  Add IFACE to BRIDGE" \
-     "\n    delif BRIDGE IFACE  Delete IFACE from BRIDGE" \
-    IF_FEATURE_BRCTL_FANCY( \
-     "\n    setageing BRIDGE TIME       Set ageing time" \
-     "\n    setfd BRIDGE TIME       Set bridge forward delay" \
-     "\n    sethello BRIDGE TIME        Set hello time" \
-     "\n    setmaxage BRIDGE TIME       Set max message age" \
-     "\n    setpathcost BRIDGE COST     Set path cost" \
-     "\n    setportprio BRIDGE PRIO     Set port priority" \
-     "\n    setbridgeprio BRIDGE PRIO   Set bridge priority" \
-     "\n    stp BRIDGE [1/yes/on|0/no/off]  STP on/off" \
-    ) \
-
-#define bzip2_trivial_usage \
-       "[OPTIONS] [FILE]..."
-#define bzip2_full_usage "\n\n" \
-       "Compress FILEs (or stdin) with bzip2 algorithm\n" \
-     "\nOptions:" \
-     "\n    -1..9   Compression level" \
-     "\n    -d  Decompress" \
-     "\n    -c  Write to stdout" \
-     "\n    -f  Force" \
-
 #define busybox_notes_usage \
        "Hello world!\n"
 
-#define lzop_trivial_usage \
-       "[-cfvd123456789CF] [FILE]..."
-#define lzop_full_usage "\n\n" \
-       "Options:" \
-     "\n    -1..9   Compression level" \
-     "\n    -d  Decompress" \
-     "\n    -c  Write to stdout" \
-     "\n    -f  Force" \
-     "\n    -v  Verbose" \
-     "\n    -F  Don't store or verify checksum" \
-     "\n    -C  Also write checksum of compressed block" \
-
-#define lzopcat_trivial_usage \
-       "[-vCF] [FILE]..."
-#define lzopcat_full_usage "\n\n" \
-       "    -v  Verbose" \
-     "\n    -F  Don't store or verify checksum" \
-
-#define unlzop_trivial_usage \
-       "[-cfvCF] [FILE]..."
-#define unlzop_full_usage "\n\n" \
-       "Options:" \
-     "\n    -c  Write to stdout" \
-     "\n    -f  Force" \
-     "\n    -v  Verbose" \
-     "\n    -F  Don't store or verify checksum" \
-
-#define unlzma_trivial_usage \
-       "[-cf] [FILE]..."
-#define unlzma_full_usage "\n\n" \
-       "Decompress FILE (or stdin)\n" \
-     "\nOptions:" \
-     "\n    -c  Write to stdout" \
-     "\n    -f  Force" \
-
-#define lzma_trivial_usage \
-       "-d [-cf] [FILE]..."
-#define lzma_full_usage "\n\n" \
-       "Decompress FILE (or stdin)\n" \
-     "\nOptions:" \
-     "\n    -d  Decompress" \
-     "\n    -c  Write to stdout" \
-     "\n    -f  Force" \
-
-#define lzcat_trivial_usage \
-       "FILE"
-#define lzcat_full_usage "\n\n" \
-       "Decompress to stdout"
-
-#define unxz_trivial_usage \
-       "[-cf] [FILE]..."
-#define unxz_full_usage "\n\n" \
-       "Decompress FILE (or stdin)\n" \
-     "\nOptions:" \
-     "\n    -c  Write to stdout" \
-     "\n    -f  Force" \
-
-#define xz_trivial_usage \
-       "-d [-cf] [FILE]..."
-#define xz_full_usage "\n\n" \
-       "Decompress FILE (or stdin)\n" \
-     "\nOptions:" \
-     "\n    -d  Decompress" \
-     "\n    -c  Write to stdout" \
-     "\n    -f  Force" \
-
-#define xzcat_trivial_usage \
-       "FILE"
-#define xzcat_full_usage "\n\n" \
-       "Decompress to stdout"
-
-#define cal_trivial_usage \
-       "[-jy] [[MONTH] YEAR]"
-#define cal_full_usage "\n\n" \
-       "Display a calendar\n" \
-     "\nOptions:" \
-     "\n    -j  Use julian dates" \
-     "\n    -y  Display the entire year" \
-
-#define cat_trivial_usage \
-       "[FILE]..."
-#define cat_full_usage "\n\n" \
-       "Concatenate FILEs and print them to stdout" \
-
-#define cat_example_usage \
-       "$ cat /proc/uptime\n" \
-       "110716.72 17.67"
-
-#define catv_trivial_usage \
-       "[-etv] [FILE]..."
-#define catv_full_usage "\n\n" \
-       "Display nonprinting characters as ^x or M-x\n" \
-     "\nOptions:" \
-     "\n    -e  End each line with $" \
-     "\n    -t  Show tabs as ^I" \
-     "\n    -v  Don't use ^x or M-x escapes" \
-
-#define chat_trivial_usage \
-       "EXPECT [SEND [EXPECT [SEND...]]]"
-#define chat_full_usage "\n\n" \
-       "Useful for interacting with a modem connected to stdin/stdout.\n" \
-       "A script consists of one or more \"expect-send\" pairs of strings,\n" \
-       "each pair is a pair of arguments. Example:\n" \
-       "chat '' ATZ OK ATD123456 CONNECT '' ogin: pppuser word: ppppass '~'" \
-
-#define chattr_trivial_usage \
-       "[-R] [-+=AacDdijsStTu] [-v VERSION] [FILE]..."
-#define chattr_full_usage "\n\n" \
-       "Change file attributes on an ext2 fs\n" \
-     "\nModifiers:" \
-     "\n    -   Remove attributes" \
-     "\n    +   Add attributes" \
-     "\n    =   Set attributes" \
-     "\nAttributes:" \
-     "\n    A   Don't track atime" \
-     "\n    a   Append mode only" \
-     "\n    c   Enable compress" \
-     "\n    D   Write dir contents synchronously" \
-     "\n    d   Don't backup with dump" \
-     "\n    i   Cannot be modified (immutable)" \
-     "\n    j   Write all data to journal first" \
-     "\n    s   Zero disk storage when deleted" \
-     "\n    S   Write file contents synchronously" \
-     "\n    t   Disable tail-merging of partial blocks with other files" \
-     "\n    u   Allow file to be undeleted" \
-     "\nOptions:" \
-     "\n    -R  Recurse" \
-     "\n    -v  Set the file's version/generation number" \
-
-#define chcon_trivial_usage \
-       "[OPTIONS] CONTEXT FILE..." \
-       "\n  chcon [OPTIONS] [-u USER] [-r ROLE] [-l RANGE] [-t TYPE] FILE..." \
-    IF_FEATURE_CHCON_LONG_OPTIONS( \
-       "\n  chcon [OPTIONS] --reference=RFILE FILE..." \
-    )
-#define chcon_full_usage "\n\n" \
-       "Change the security context of each FILE to CONTEXT\n" \
-    IF_FEATURE_CHCON_LONG_OPTIONS( \
-     "\n    -v,--verbose        Verbose" \
-     "\n    -c,--changes        Report changes made" \
-     "\n    -h,--no-dereference Affect symlinks instead of their targets" \
-     "\n    -f,--silent,--quiet Suppress most error messages" \
-     "\n    --reference=RFILE   Use RFILE's group instead of using a CONTEXT value" \
-     "\n    -u,--user=USER      Set user/role/type/range in the target" \
-     "\n    -r,--role=ROLE      security context" \
-     "\n    -t,--type=TYPE" \
-     "\n    -l,--range=RANGE" \
-     "\n    -R,--recursive      Recurse" \
-    ) \
-    IF_NOT_FEATURE_CHCON_LONG_OPTIONS( \
-     "\n    -v  Verbose" \
-     "\n    -c  Report changes made" \
-     "\n    -h  Affect symlinks instead of their targets" \
-     "\n    -f  Suppress most error messages" \
-     "\n    -u USER Set user/role/type/range in the target security context" \
-     "\n    -r ROLE" \
-     "\n    -t TYPE" \
-     "\n    -l RNG" \
-     "\n    -R  Recurse" \
-    )
-
-#define chmod_trivial_usage \
-       "[-R"IF_DESKTOP("cvf")"] MODE[,MODE]... FILE..."
-#define chmod_full_usage "\n\n" \
-       "Each MODE is one or more of the letters ugoa, one of the\n" \
-       "symbols +-= and one or more of the letters rwxst\n" \
-     "\nOptions:" \
-     "\n    -R  Recurse" \
-    IF_DESKTOP( \
-     "\n    -c  List changed files" \
-     "\n    -v  List all files" \
-     "\n    -f  Hide errors" \
-    )
-#define chmod_example_usage \
-       "$ ls -l /tmp/foo\n" \
-       "-rw-rw-r--    1 root     root            0 Apr 12 18:25 /tmp/foo\n" \
-       "$ chmod u+x /tmp/foo\n" \
-       "$ ls -l /tmp/foo\n" \
-       "-rwxrw-r--    1 root     root            0 Apr 12 18:25 /tmp/foo*\n" \
-       "$ chmod 444 /tmp/foo\n" \
-       "$ ls -l /tmp/foo\n" \
-       "-r--r--r--    1 root     root            0 Apr 12 18:25 /tmp/foo\n"
-
-#define chgrp_trivial_usage \
-       "[-RhLHP"IF_DESKTOP("cvf")"]... GROUP FILE..."
-#define chgrp_full_usage "\n\n" \
-       "Change the group membership of each FILE to GROUP\n" \
-     "\nOptions:" \
-     "\n    -R  Recurse" \
-     "\n    -h  Affect symlinks instead of symlink targets" \
-     "\n    -L  Traverse all symlinks to directories" \
-     "\n    -H  Traverse symlinks on command line only" \
-     "\n    -P  Don't traverse symlinks (default)" \
-    IF_DESKTOP( \
-     "\n    -c  List changed files" \
-     "\n    -v  Verbose" \
-     "\n    -f  Hide errors" \
-    )
-#define chgrp_example_usage \
-       "$ ls -l /tmp/foo\n" \
-       "-r--r--r--    1 andersen andersen        0 Apr 12 18:25 /tmp/foo\n" \
-       "$ chgrp root /tmp/foo\n" \
-       "$ ls -l /tmp/foo\n" \
-       "-r--r--r--    1 andersen root            0 Apr 12 18:25 /tmp/foo\n"
-
-#define chown_trivial_usage \
-       "[-RhLHP"IF_DESKTOP("cvf")"]... OWNER[<.|:>[GROUP]] FILE..."
-#define chown_full_usage "\n\n" \
-       "Change the owner and/or group of each FILE to OWNER and/or GROUP\n" \
-     "\nOptions:" \
-     "\n    -R  Recurse" \
-     "\n    -h  Affect symlinks instead of symlink targets" \
-     "\n    -L  Traverse all symlinks to directories" \
-     "\n    -H  Traverse symlinks on command line only" \
-     "\n    -P  Don't traverse symlinks (default)" \
-    IF_DESKTOP( \
-     "\n    -c  List changed files" \
-     "\n    -v  List all files" \
-     "\n    -f  Hide errors" \
-    )
-#define chown_example_usage \
-       "$ ls -l /tmp/foo\n" \
-       "-r--r--r--    1 andersen andersen        0 Apr 12 18:25 /tmp/foo\n" \
-       "$ chown root /tmp/foo\n" \
-       "$ ls -l /tmp/foo\n" \
-       "-r--r--r--    1 root     andersen        0 Apr 12 18:25 /tmp/foo\n" \
-       "$ chown root.root /tmp/foo\n" \
-       "ls -l /tmp/foo\n" \
-       "-r--r--r--    1 root     root            0 Apr 12 18:25 /tmp/foo\n"
-
-#define chpst_trivial_usage \
-       "[-vP012] [-u USER[:GRP]] [-U USER[:GRP]] [-e DIR]\n" \
-       "    [-/ DIR] [-n NICE] [-m BYTES] [-d BYTES] [-o N]\n" \
-       "    [-p N] [-f BYTES] [-c BYTES] PROG ARGS"
-#define chpst_full_usage "\n\n" \
-       "Change the process state, run PROG\n" \
-     "\nOptions:" \
-     "\n    -u USER[:GRP]   Set uid and gid" \
-     "\n    -U USER[:GRP]   Set $UID and $GID in environment" \
-     "\n    -e DIR      Set environment variables as specified by files" \
-     "\n            in DIR: file=1st_line_of_file" \
-     "\n    -/ DIR      Chroot to DIR" \
-     "\n    -n NICE     Add NICE to nice value" \
-     "\n    -m BYTES    Same as -d BYTES -s BYTES -l BYTES" \
-     "\n    -d BYTES    Limit data segment" \
-     "\n    -o N        Limit number of open files per process" \
-     "\n    -p N        Limit number of processes per uid" \
-     "\n    -f BYTES    Limit output file sizes" \
-     "\n    -c BYTES    Limit core file size" \
-     "\n    -v      Verbose" \
-     "\n    -P      Create new process group" \
-     "\n    -0      Close stdin" \
-     "\n    -1      Close stdout" \
-     "\n    -2      Close stderr" \
-
-#define setuidgid_trivial_usage \
-       "USER PROG ARGS"
-#define setuidgid_full_usage "\n\n" \
-       "Set uid and gid to USER's uid and gid, drop supplementary group ids,\n" \
-       "run PROG"
-#define envuidgid_trivial_usage \
-       "USER PROG ARGS"
-#define envuidgid_full_usage "\n\n" \
-       "Set $UID to USER's uid and $GID to USER's gid, run PROG"
-#define envdir_trivial_usage \
-       "DIR PROG ARGS"
-#define envdir_full_usage "\n\n" \
-       "Set various environment variables as specified by files\n" \
-       "in the directory DIR, run PROG"
-#define softlimit_trivial_usage \
-       "[-a BYTES] [-m BYTES] [-d BYTES] [-s BYTES] [-l BYTES]\n" \
-       "    [-f BYTES] [-c BYTES] [-r BYTES] [-o N] [-p N] [-t N]\n" \
-       "    PROG ARGS"
-#define softlimit_full_usage "\n\n" \
-       "Set soft resource limits, then run PROG\n" \
-     "\nOptions:" \
-     "\n    -a BYTES    Limit total size of all segments" \
-     "\n    -m BYTES    Same as -d BYTES -s BYTES -l BYTES -a BYTES" \
-     "\n    -d BYTES    Limit data segment" \
-     "\n    -s BYTES    Limit stack segment" \
-     "\n    -l BYTES    Limit locked memory size" \
-     "\n    -o N        Limit number of open files per process" \
-     "\n    -p N        Limit number of processes per uid" \
-     "\nOptions controlling file sizes:" \
-     "\n    -f BYTES    Limit output file sizes" \
-     "\n    -c BYTES    Limit core file size" \
-     "\nEfficiency opts:" \
-     "\n    -r BYTES    Limit resident set size" \
-     "\n    -t N        Limit CPU time, process receives" \
-     "\n            a SIGXCPU after N seconds" \
-
-#define chroot_trivial_usage \
-       "NEWROOT [PROG ARGS]"
-#define chroot_full_usage "\n\n" \
-       "Run PROG with root directory set to NEWROOT"
-#define chroot_example_usage \
-       "$ ls -l /bin/ls\n" \
-       "lrwxrwxrwx    1 root     root          12 Apr 13 00:46 /bin/ls -> /BusyBox\n" \
-       "# mount /dev/hdc1 /mnt -t minix\n" \
-       "# chroot /mnt\n" \
-       "# ls -l /bin/ls\n" \
-       "-rwxr-xr-x    1 root     root        40816 Feb  5 07:45 /bin/ls*\n"
-
-#define chvt_trivial_usage \
-       "N"
-#define chvt_full_usage "\n\n" \
-       "Change the foreground virtual terminal to /dev/ttyN"
-
-#define cksum_trivial_usage \
-       "FILES..."
-#define cksum_full_usage "\n\n" \
-       "Calculate the CRC32 checksums of FILES"
-
-#define clear_trivial_usage \
-       ""
-#define clear_full_usage "\n\n" \
-       "Clear screen"
-
-#define cmp_trivial_usage \
-       "[-l] [-s] FILE1 [FILE2" IF_DESKTOP(" [SKIP1 [SKIP2]]") "]"
-#define cmp_full_usage "\n\n" \
-       "Compare FILE1 with FILE2 (or stdin)\n" \
-     "\nOptions:" \
-     "\n    -l  Write the byte numbers (decimal) and values (octal)" \
-     "\n        for all differing bytes" \
-     "\n    -s  Quiet" \
-
-#define comm_trivial_usage \
-       "[-123] FILE1 FILE2"
-#define comm_full_usage "\n\n" \
-       "Compare FILE1 with FILE2\n" \
-     "\nOptions:" \
-     "\n    -1  Suppress lines unique to FILE1" \
-     "\n    -2  Suppress lines unique to FILE2" \
-     "\n    -3  Suppress lines common to both files" \
-
-#define bbconfig_trivial_usage \
-       ""
-#define bbconfig_full_usage "\n\n" \
-       "Print the config file used by busybox build"
-
-#define chrt_trivial_usage \
-       "[-prfom] [PRIO] [PID | PROG ARGS]"
-#define chrt_full_usage "\n\n" \
-       "Change scheduling priority and class for a process\n" \
-     "\nOptions:" \
-     "\n    -p  Operate on PID" \
-     "\n    -r  Set SCHED_RR class" \
-     "\n    -f  Set SCHED_FIFO class" \
-     "\n    -o  Set SCHED_OTHER class" \
-     "\n    -m  Show min/max priorities" \
-
-#define chrt_example_usage \
-       "$ chrt -r 4 sleep 900; x=$!\n" \
-       "$ chrt -f -p 3 $x\n" \
-       "You need CAP_SYS_NICE privileges to set scheduling attributes of a process"
-
-#define nice_trivial_usage \
-       "[-n ADJUST] [PROG ARGS]"
-#define nice_full_usage "\n\n" \
-       "Change scheduling priority, run PROG\n" \
-     "\nOptions:" \
-     "\n    -n ADJUST   Adjust priority by ADJUST" \
-
-#define renice_trivial_usage \
-       "{{-n INCREMENT} | PRIORITY} [[-p | -g | -u] ID...]"
-#define renice_full_usage "\n\n" \
-       "Change scheduling priority for a running process\n" \
-     "\nOptions:" \
-     "\n    -n  Adjust current nice value (smaller is faster)" \
-     "\n    -p  Process id(s) (default)" \
-     "\n    -g  Process group id(s)" \
-     "\n    -u  Process user name(s) and/or id(s)" \
-
-#define ionice_trivial_usage \
-    "[-c 1-3] [-n 0-7] [-p PID] [PROG]"
-#define ionice_full_usage "\n\n" \
-       "Change I/O priority and class\n" \
-     "\nOptions:" \
-     "\n    -c  Class. 1:realtime 2:best-effort 3:idle" \
-     "\n    -n  Priority" \
-
-#define cp_trivial_usage \
-       "[OPTIONS] SOURCE DEST"
-#define cp_full_usage "\n\n" \
-       "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY\n" \
-     "\nOptions:" \
-     "\n    -a  Same as -dpR" \
-    IF_SELINUX( \
-     "\n    -c  Preserve security context" \
-    ) \
-     "\n    -R,-r   Recurse" \
-     "\n    -d,-P   Preserve symlinks (default if -R)" \
-     "\n    -L  Follow all symlinks" \
-     "\n    -H  Follow symlinks on command line" \
-     "\n    -p  Preserve file attributes if possible" \
-     "\n    -f  Overwrite" \
-     "\n    -i  Prompt before overwrite" \
-     "\n    -l,-s   Create (sym)links" \
-
-#define cpio_trivial_usage \
-       "[-dmvu] [-F FILE]" IF_FEATURE_CPIO_O(" [-H newc]") \
-       " [-ti"IF_FEATURE_CPIO_O("o")"]" IF_FEATURE_CPIO_P(" [-p DIR]")
-#define cpio_full_usage "\n\n" \
-       "Extract or list files from a cpio archive" \
-    IF_FEATURE_CPIO_O(", or" \
-     "\ncreate an archive" IF_FEATURE_CPIO_P(" (-o) or copy files (-p)") \
-        " using file list on stdin" \
-    ) \
-     "\n" \
-     "\nMain operation mode:" \
-     "\n    -t  List" \
-     "\n    -i  Extract" \
-    IF_FEATURE_CPIO_O( \
-     "\n    -o  Create (requires -H newc)" \
-    ) \
-    IF_FEATURE_CPIO_P( \
-     "\n    -p DIR  Copy files to DIR" \
-    ) \
-     "\nOptions:" \
-     "\n    -d  Make leading directories" \
-     "\n    -m  Preserve mtime" \
-     "\n    -v  Verbose" \
-     "\n    -u  Overwrite" \
-     "\n    -F FILE Input (-t,-i,-p) or output (-o) file" \
-    IF_FEATURE_CPIO_O( \
-     "\n    -H newc Archive format" \
-    ) \
-
-#define crond_trivial_usage \
-       "-fbS -l N " IF_FEATURE_CROND_D("-d N ") "-L LOGFILE -c DIR"
-#define crond_full_usage "\n\n" \
-       "    -f  Foreground" \
-     "\n    -b  Background (default)" \
-     "\n    -S  Log to syslog (default)" \
-     "\n    -l  Set log level. 0 is the most verbose, default 8" \
-    IF_FEATURE_CROND_D( \
-     "\n    -d  Set log level, log to stderr" \
-    ) \
-     "\n    -L  Log to file" \
-     "\n    -c  Working dir" \
-
-#define crontab_trivial_usage \
-       "[-c DIR] [-u USER] [-ler]|[FILE]"
-#define crontab_full_usage "\n\n" \
-       "    -c  Crontab directory" \
-     "\n    -u  User" \
-     "\n    -l  List crontab" \
-     "\n    -e  Edit crontab" \
-     "\n    -r  Delete crontab" \
-     "\n    FILE    Replace crontab by FILE ('-': stdin)" \
-
-#define cryptpw_trivial_usage \
-       "[OPTIONS] [PASSWORD] [SALT]"
-/* We do support -s, we just don't mention it */
-#define cryptpw_full_usage "\n\n" \
-       "Crypt the PASSWORD using crypt(3)\n" \
-     "\nOptions:" \
-    IF_LONG_OPTS( \
-     "\n    -P,--password-fd=N  Read password from fd N" \
-/*   "\n    -s,--stdin      Use stdin; like -P0" */ \
-     "\n    -m,--method=TYPE    Encryption method TYPE" \
-     "\n    -S,--salt=SALT" \
-    ) \
-    IF_NOT_LONG_OPTS( \
-     "\n    -P N    Read password from fd N" \
-/*   "\n    -s  Use stdin; like -P0" */ \
-     "\n    -m TYPE Encryption method TYPE" \
-     "\n    -S SALT" \
-    ) \
-
-/* mkpasswd is an alias to cryptpw */
-
-#define mkpasswd_trivial_usage \
-       "[OPTIONS] [PASSWORD] [SALT]"
-/* We do support -s, we just don't mention it */
-#define mkpasswd_full_usage "\n\n" \
-       "Crypt the PASSWORD using crypt(3)\n" \
-     "\nOptions:" \
-    IF_LONG_OPTS( \
-     "\n    -P,--password-fd=N  Read password from fd N" \
-/*   "\n    -s,--stdin      Use stdin; like -P0" */ \
-     "\n    -m,--method=TYPE    Encryption method TYPE" \
-     "\n    -S,--salt=SALT" \
-    ) \
-    IF_NOT_LONG_OPTS( \
-     "\n    -P N    Read password from fd N" \
-/*   "\n    -s  Use stdin; like -P0" */ \
-     "\n    -m TYPE Encryption method TYPE" \
-     "\n    -S SALT" \
-    ) \
-
-#define cut_trivial_usage \
-       "[OPTIONS] [FILE]..."
-#define cut_full_usage "\n\n" \
-       "Print selected fields from each input FILE to stdout\n" \
-     "\nOptions:" \
-     "\n    -b LIST Output only bytes from LIST" \
-     "\n    -c LIST Output only characters from LIST" \
-     "\n    -d CHAR Use CHAR instead of tab as the field delimiter" \
-     "\n    -s  Output only the lines containing delimiter" \
-     "\n    -f N    Print only these fields" \
-     "\n    -n  Ignored" \
-
-#define cut_example_usage \
-       "$ echo \"Hello world\" | cut -f 1 -d ' '\n" \
-       "Hello\n" \
-       "$ echo \"Hello world\" | cut -f 2 -d ' '\n" \
-       "world\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]")
-#define dd_full_usage "\n\n" \
-       "Copy a file with converting and formatting\n" \
-     "\nOptions:" \
-     "\n    if=FILE     Read from FILE instead of stdin" \
-     "\n    of=FILE     Write to FILE instead of stdout" \
-     "\n    bs=N        Read and write N bytes at a time" \
-    IF_FEATURE_DD_IBS_OBS( \
-     "\n    ibs=N       Read N bytes at a time" \
-    ) \
-    IF_FEATURE_DD_IBS_OBS( \
-     "\n    obs=N       Write N bytes at a time" \
-    ) \
-     "\n    count=N     Copy only N input blocks" \
-     "\n    skip=N      Skip N input blocks" \
-     "\n    seek=N      Skip N output blocks" \
-    IF_FEATURE_DD_IBS_OBS( \
-     "\n    conv=notrunc    Don't truncate output file" \
-     "\n    conv=noerror    Continue after read errors" \
-     "\n    conv=sync   Pad blocks with zeros" \
-     "\n    conv=fsync  Physically write data out before finishing" \
-    ) \
-     "\n" \
-     "\nNumbers may be suffixed by c (x1), w (x2), b (x512), kD (x1000), k (x1024)," \
-     "\nMD (x1000000), M (x1048576), GD (x1000000000) or G (x1073741824)" \
-
-#define dd_example_usage \
-       "$ dd if=/dev/zero of=/dev/ram1 bs=1M count=4\n" \
-       "4+0 records in\n" \
-       "4+0 records out\n"
-
-#define deallocvt_trivial_usage \
-       "[N]"
-#define deallocvt_full_usage "\n\n" \
-       "Deallocate unused virtual terminal /dev/ttyN"
-
-#define delgroup_trivial_usage \
-    IF_FEATURE_DEL_USER_FROM_GROUP("[USER] ")"GROUP"
-#define delgroup_full_usage "\n\n" \
-       "Delete group GROUP from the system" \
-    IF_FEATURE_DEL_USER_FROM_GROUP(" or user USER from group GROUP")
-
-#define deluser_trivial_usage \
-       "USER"
-#define deluser_full_usage "\n\n" \
-       "Delete USER from the system"
-
-#define devmem_trivial_usage \
-    "ADDRESS [WIDTH [VALUE]]"
-
-#define devmem_full_usage "\n\n" \
-       "Read/write from physical address\n" \
-     "\n    ADDRESS Address to act upon" \
-     "\n    WIDTH   Width (8/16/...)" \
-     "\n    VALUE   Data to be written" \
-
-#define devfsd_trivial_usage \
-       "mntpnt [-v]" IF_DEVFSD_FG_NP("[-fg][-np]")
-#define devfsd_full_usage "\n\n" \
-       "Manage devfs permissions and old device name symlinks\n" \
-     "\nOptions:" \
-     "\n    mntpnt  The mount point where devfs is mounted" \
-     "\n    -v  Print the protocol version numbers for devfsd" \
-     "\n        and the kernel-side protocol version and exit" \
-    IF_DEVFSD_FG_NP( \
-     "\n    -fg Run in foreground" \
-     "\n    -np Exit after parsing the configuration file" \
-     "\n        and processing synthetic REGISTER events," \
-     "\n        don't poll for events" \
-    )
-
-#define df_trivial_usage \
-    "[-Pk" \
-    IF_FEATURE_HUMAN_READABLE("mh") \
-    IF_FEATURE_DF_FANCY("ai] [-B SIZE") \
-    "] [FILESYSTEM]..."
-#define df_full_usage "\n\n" \
-       "Print filesystem usage statistics\n" \
-     "\nOptions:" \
-     "\n    -P  POSIX output format" \
-     "\n    -k  1024-byte blocks (default)" \
-    IF_FEATURE_HUMAN_READABLE( \
-     "\n    -m  1M-byte blocks" \
-     "\n    -h  Human readable (e.g. 1K 243M 2G)" \
-    ) \
-    IF_FEATURE_DF_FANCY( \
-     "\n    -a  Show all filesystems" \
-     "\n    -i  Inodes" \
-     "\n    -B SIZE Blocksize" \
-    ) \
-
-#define df_example_usage \
-       "$ df\n" \
-       "Filesystem           1K-blocks      Used Available Use% Mounted on\n" \
-       "/dev/sda3              8690864   8553540    137324  98% /\n" \
-       "/dev/sda1                64216     36364     27852  57% /boot\n" \
-       "$ df /dev/sda3\n" \
-       "Filesystem           1K-blocks      Used Available Use% Mounted on\n" \
-       "/dev/sda3              8690864   8553540    137324  98% /\n" \
-       "$ POSIXLY_CORRECT=sure df /dev/sda3\n" \
-       "Filesystem         512B-blocks      Used Available Use% Mounted on\n" \
-       "/dev/sda3             17381728  17107080    274648  98% /\n" \
-       "$ POSIXLY_CORRECT=yep df -P /dev/sda3\n" \
-       "Filesystem          512-blocks      Used Available Capacity Mounted on\n" \
-       "/dev/sda3             17381728  17107080    274648      98% /\n"
-
-#define dhcprelay_trivial_usage \
-       "CLIENT_IFACE[,CLIENT_IFACE2]... SERVER_IFACE [SERVER_IP]"
-#define dhcprelay_full_usage "\n\n" \
-       "Relay DHCP requests between clients and server" \
-
-#define diff_trivial_usage \
-       "[-abBdiNqrTstw] [-L LABEL] [-S FILE] [-U LINES] FILE1 FILE2"
-#define diff_full_usage "\n\n" \
-       "Compare files line by line and output the differences between them.\n" \
-       "This implementation supports unified diffs only.\n" \
-     "\nOptions:" \
-     "\n    -a  Treat all files as text" \
-     "\n    -b  Ignore changes in the amount of whitespace" \
-     "\n    -B  Ignore changes whose lines are all blank" \
-     "\n    -d  Try hard to find a smaller set of changes" \
-     "\n    -i  Ignore case differences" \
-     "\n    -L  Use LABEL instead of the filename in the unified header" \
-     "\n    -N  Treat absent files as empty" \
-     "\n    -q  Output only whether files differ" \
-     "\n    -r  Recurse" \
-     "\n    -S  Start with FILE when comparing directories" \
-     "\n    -T  Make tabs line up by prefixing a tab when necessary" \
-     "\n    -s  Report when two files are the same" \
-     "\n    -t  Expand tabs to spaces in output" \
-     "\n    -U  Output LINES lines of context" \
-     "\n    -w  Ignore all whitespace" \
-
-#define dirname_trivial_usage \
-       "FILENAME"
-#define dirname_full_usage "\n\n" \
-       "Strip non-directory suffix from FILENAME"
-#define dirname_example_usage \
-       "$ dirname /tmp/foo\n" \
-       "/tmp\n" \
-       "$ dirname /tmp/foo/\n" \
-       "/tmp\n"
-
-#define dmesg_trivial_usage \
-       "[-c] [-n LEVEL] [-s SIZE]"
-#define dmesg_full_usage "\n\n" \
-       "Print or control the kernel ring buffer\n" \
-     "\nOptions:" \
-     "\n    -c      Clear ring buffer after printing" \
-     "\n    -n LEVEL    Set console logging level" \
-     "\n    -s SIZE     Buffer size" \
-
-#define dnsd_trivial_usage \
-       "[-dvs] [-c CONFFILE] [-t TTL_SEC] [-p PORT] [-i ADDR]"
-#define dnsd_full_usage "\n\n" \
-       "Small static DNS server daemon\n" \
-     "\nOptions:" \
-     "\n    -c FILE Config file" \
-     "\n    -t SEC  TTL" \
-     "\n    -p PORT Listen on PORT" \
-     "\n    -i ADDR Listen on ADDR" \
-     "\n    -d  Daemonize" \
-     "\n    -v  Verbose" \
-     "\n    -s  Send successful replies only. Use this if you want" \
-     "\n        to use /etc/resolv.conf with two nameserver lines:" \
-     "\n            nameserver DNSD_SERVER" \
-     "\n            nameserver NORNAL_DNS_SERVER" \
-
-#define dos2unix_trivial_usage \
-       "[-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" \
-     "\nOptions:" \
-     "\n    -u  dos2unix" \
-     "\n    -d  unix2dos" \
-
-#define unix2dos_trivial_usage \
-       "[-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" \
-     "\nOptions:" \
-     "\n    -u  dos2unix" \
-     "\n    -d  unix2dos" \
-
-#define dpkg_trivial_usage \
-       "[-ilCPru] [-F OPT] PACKAGE"
-#define dpkg_full_usage "\n\n" \
-       "Install, remove and manage Debian packages\n" \
-     "\nOptions:" \
-    IF_LONG_OPTS( \
-     "\n    -i,--install    Install the package" \
-     "\n    -l,--list   List of installed packages" \
-     "\n    --configure Configure an unpackaged package" \
-     "\n    -P,--purge  Purge all files of a package" \
-     "\n    -r,--remove Remove all but the configuration files for a package" \
-     "\n    --unpack    Unpack a package, but don't configure it" \
-     "\n    --force-depends Ignore dependency problems" \
-     "\n    --force-confnew Overwrite existing config files when installing" \
-     "\n    --force-confold Keep old config files when installing" \
-    ) \
-    IF_NOT_LONG_OPTS( \
-     "\n    -i      Install the package" \
-     "\n    -l      List of installed packages" \
-     "\n    -C      Configure an unpackaged package" \
-     "\n    -P      Purge all files of a package" \
-     "\n    -r      Remove all but the configuration files for a package" \
-     "\n    -u      Unpack a package, but don't configure it" \
-     "\n    -F depends  Ignore dependency problems" \
-     "\n    -F confnew  Overwrite existing config files when installing" \
-     "\n    -F confold  Keep old config files when installing" \
-    )
-
-#define dpkg_deb_trivial_usage \
-       "[-cefxX] FILE [argument]"
-#define dpkg_deb_full_usage "\n\n" \
-       "Perform actions on Debian packages (.debs)\n" \
-     "\nOptions:" \
-     "\n    -c  List contents of filesystem tree" \
-     "\n    -e  Extract control files to [argument] directory" \
-     "\n    -f  Display control field name starting with [argument]" \
-     "\n    -x  Extract packages filesystem tree to directory" \
-     "\n    -X  Verbose extract" \
-
-#define dpkg_deb_example_usage \
-       "$ dpkg-deb -X ./busybox_0.48-1_i386.deb /tmp\n"
-
-#define du_trivial_usage \
-       "[-aHLdclsx" IF_FEATURE_HUMAN_READABLE("hm") "k] [FILE]..."
-#define du_full_usage "\n\n" \
-       "Summarize disk space used for each FILE and/or directory.\n" \
-       "Disk space is printed in units of " \
-    IF_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("1024") \
-    IF_NOT_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("512") \
-       " bytes.\n" \
-     "\nOptions:" \
-     "\n    -a  Show file sizes too" \
-     "\n    -L  Follow all symlinks" \
-     "\n    -H  Follow symlinks on command line" \
-     "\n    -d N    Limit output to directories (and files with -a) of depth < N" \
-     "\n    -c  Show grand total" \
-     "\n    -l  Count sizes many times if hard linked" \
-     "\n    -s  Display only a total for each argument" \
-     "\n    -x  Skip directories on different filesystems" \
-    IF_FEATURE_HUMAN_READABLE( \
-     "\n    -h  Sizes in human readable format (e.g., 1K 243M 2G )" \
-     "\n    -m  Sizes in megabytes" \
-    ) \
-     "\n    -k  Sizes in kilobytes" \
-            IF_FEATURE_DU_DEFAULT_BLOCKSIZE_1K(" (default)") \
-
-#define du_example_usage \
-       "$ du\n" \
-       "16      ./CVS\n" \
-       "12      ./kernel-patches/CVS\n" \
-       "80      ./kernel-patches\n" \
-       "12      ./tests/CVS\n" \
-       "36      ./tests\n" \
-       "12      ./scripts/CVS\n" \
-       "16      ./scripts\n" \
-       "12      ./docs/CVS\n" \
-       "104     ./docs\n" \
-       "2417    .\n"
-
-#define dumpkmap_trivial_usage \
-       "> keymap"
-#define dumpkmap_full_usage "\n\n" \
-       "Print a binary keyboard translation table to stdout"
-#define dumpkmap_example_usage \
-       "$ dumpkmap > keymap\n"
-
-#define dumpleases_trivial_usage \
-       "[-r|-a] [-f LEASEFILE]"
-#define dumpleases_full_usage "\n\n" \
-       "Display DHCP leases granted by udhcpd\n" \
-     "\nOptions:" \
-    IF_LONG_OPTS( \
-     "\n    -f,--file=FILE  Lease file" \
-     "\n    -r,--remaining  Show remaining time" \
-     "\n    -a,--absolute   Show expiration time" \
-    ) \
-    IF_NOT_LONG_OPTS( \
-     "\n    -f FILE Lease file" \
-     "\n    -r  Show remaining time" \
-     "\n    -a  Show expiration time" \
-    )
-
-/*
-#define e2fsck_trivial_usage \
-       "[-panyrcdfvstDFSV] [-b superblock] [-B blocksize] " \
-       "[-I inode_buffer_blocks] [-P process_inode_size] " \
-       "[-l|-L bad_blocks_file] [-C fd] [-j external_journal] " \
-       "[-E extended-options] device"
-#define e2fsck_full_usage "\n\n" \
-       "Check ext2/ext3 file system\n" \
-     "\nOptions:" \
-     "\n    -p      Automatic repair (no questions)" \
-     "\n    -n      Make no changes to the filesystem" \
-     "\n    -y      Assume 'yes' to all questions" \
-     "\n    -c      Check for bad blocks and add them to the badblock list" \
-     "\n    -f      Force checking even if filesystem is marked clean" \
-     "\n    -v      Verbose" \
-     "\n    -b superblock   Use alternative superblock" \
-     "\n    -B blocksize    Force blocksize when looking for superblock" \
-     "\n    -j journal  Set location of the external journal" \
-     "\n    -l file     Add to badblocks list" \
-     "\n    -L file     Set badblocks list" \
-*/
-
-#define echo_trivial_usage \
-    IF_FEATURE_FANCY_ECHO("[-neE] ") "[ARG]..."
-#define echo_full_usage "\n\n" \
-       "Print the specified ARGs to stdout" \
-    IF_FEATURE_FANCY_ECHO( "\n" \
-     "\nOptions:" \
-     "\n    -n  Suppress trailing newline" \
-     "\n    -e  Interpret backslash escapes (i.e., \\t=tab)" \
-     "\n    -E  Don't interpret backslash escapes (default)" \
-    )
-#define echo_example_usage \
-       "$ echo \"Erik is cool\"\n" \
-       "Erik is cool\n" \
-    IF_FEATURE_FANCY_ECHO("$ echo -e \"Erik\\nis\\ncool\"\n" \
-       "Erik\n" \
-       "is\n" \
-       "cool\n" \
-       "$ echo \"Erik\\nis\\ncool\"\n" \
-       "Erik\\nis\\ncool\n")
-
-#define eject_trivial_usage \
-       "[-t] [-T] [DEVICE]"
-#define eject_full_usage "\n\n" \
-       "Eject DEVICE or default /dev/cdrom\n" \
-     "\nOptions:" \
-    IF_FEATURE_EJECT_SCSI( \
-     "\n    -s  SCSI device" \
-    ) \
-     "\n    -t  Close tray" \
-     "\n    -T  Open/close tray (toggle)" \
-
-#define ed_trivial_usage ""
-#define ed_full_usage ""
-
-#define env_trivial_usage \
-       "[-iu] [-] [name=value]... [PROG ARGS]"
-#define env_full_usage "\n\n" \
-       "Print the current environment or run PROG after setting up\n" \
-       "the specified environment\n" \
-     "\nOptions:" \
-     "\n    -, -i   Start with an empty environment" \
-     "\n    -u  Remove variable from the environment" \
-
-#define ether_wake_trivial_usage \
-       "[-b] [-i iface] [-p aa:bb:cc:dd[:ee:ff]] MAC"
-#define ether_wake_full_usage "\n\n" \
-       "Send a magic packet to wake up sleeping machines.\n" \
-       "MAC must be a station address (00:11:22:33:44:55) or\n" \
-       "a hostname with a known 'ethers' entry.\n" \
-     "\nOptions:" \
-     "\n    -b      Send wake-up packet to the broadcast address" \
-     "\n    -i iface    Interface to use (default eth0)" \
-     "\n    -p pass     Append four or six byte password PW to the packet" \
-
-#define expand_trivial_usage \
-       "[-i] [-t N] [FILE]..."
-#define expand_full_usage "\n\n" \
-       "Convert tabs to spaces, writing to stdout\n" \
-     "\nOptions:" \
-    IF_FEATURE_EXPAND_LONG_OPTIONS( \
-     "\n    -i,--initial    Don't convert tabs after non blanks" \
-     "\n    -t,--tabs=N Tabstops every N chars" \
-    ) \
-    IF_NOT_FEATURE_EXPAND_LONG_OPTIONS( \
-     "\n    -i  Don't convert tabs after non blanks" \
-     "\n    -t  Tabstops every N chars" \
-    )
-
-#define expr_trivial_usage \
-       "EXPRESSION"
-#define expr_full_usage "\n\n" \
-       "Print the value of EXPRESSION to stdout\n" \
-    "\n" \
-       "EXPRESSION may be:\n" \
-       "    ARG1 | ARG2 ARG1 if it is neither null nor 0, otherwise ARG2\n" \
-       "    ARG1 & ARG2 ARG1 if neither argument is null or 0, otherwise 0\n" \
-       "    ARG1 < ARG2 1 if ARG1 is less than ARG2, else 0. Similarly:\n" \
-       "    ARG1 <= ARG2\n" \
-       "    ARG1 = ARG2\n" \
-       "    ARG1 != ARG2\n" \
-       "    ARG1 >= ARG2\n" \
-       "    ARG1 > ARG2\n" \
-       "    ARG1 + ARG2 Sum of ARG1 and ARG2. Similarly:\n" \
-       "    ARG1 - ARG2\n" \
-       "    ARG1 * ARG2\n" \
-       "    ARG1 / ARG2\n" \
-       "    ARG1 % ARG2\n" \
-       "    STRING : REGEXP     Anchored pattern match of REGEXP in STRING\n" \
-       "    match STRING REGEXP Same as STRING : REGEXP\n" \
-       "    substr STRING POS LENGTH Substring of STRING, POS counted from 1\n" \
-       "    index STRING CHARS  Index in STRING where any CHARS is found, or 0\n" \
-       "    length STRING       Length of STRING\n" \
-       "    quote TOKEN     Interpret TOKEN as a string, even if\n" \
-       "                it is a keyword like 'match' or an\n" \
-       "                operator like '/'\n" \
-       "    (EXPRESSION)        Value of EXPRESSION\n" \
-       "\n" \
-       "Beware that many operators need to be escaped or quoted for shells.\n" \
-       "Comparisons are arithmetic if both ARGs are numbers, else\n" \
-       "lexicographical. Pattern matches return the string matched between\n" \
-       "\\( and \\) or null; if \\( and \\) are not used, they return the number\n" \
-       "of characters matched or 0."
-
-#define fakeidentd_trivial_usage \
-       "[-fiw] [-b ADDR] [STRING]"
-#define fakeidentd_full_usage "\n\n" \
-       "Provide fake ident (auth) service\n" \
-     "\nOptions:" \
-     "\n    -f  Run in foreground" \
-     "\n    -i  Inetd mode" \
-     "\n    -w  Inetd 'wait' mode" \
-     "\n    -b ADDR Bind to specified address" \
-     "\n    STRING  Ident answer string (default: nobody)" \
-
-#define false_trivial_usage \
-       ""
-#define false_full_usage "\n\n" \
-       "Return an exit code of FALSE (1)"
-
-#define false_example_usage \
-       "$ false\n" \
-       "$ echo $?\n" \
-       "1\n"
-
-#define fbsplash_trivial_usage \
-       "-s IMGFILE [-c] [-d DEV] [-i INIFILE] [-f CMD]"
-#define fbsplash_full_usage "\n\n" \
-       "Options:" \
-     "\n    -s  Image" \
-     "\n    -c  Hide cursor" \
-     "\n    -d  Framebuffer device (default /dev/fb0)" \
-     "\n    -i  Config file (var=value):" \
-     "\n            BAR_LEFT,BAR_TOP,BAR_WIDTH,BAR_HEIGHT" \
-     "\n            BAR_R,BAR_G,BAR_B" \
-     "\n    -f  Control pipe (else exit after drawing image)" \
-     "\n            commands: 'NN' (% for progress bar) or 'exit'" \
-
-#define fbset_trivial_usage \
-       "[OPTIONS] [MODE]"
-#define fbset_full_usage "\n\n" \
-       "Show and modify frame buffer settings"
-
-#define fbset_example_usage \
-       "$ fbset\n" \
-       "mode \"1024x768-76\"\n" \
-       "    # D: 78.653 MHz, H: 59.949 kHz, V: 75.694 Hz\n" \
-       "    geometry 1024 768 1024 768 16\n" \
-       "    timings 12714 128 32 16 4 128 4\n" \
-       "    accel false\n" \
-       "    rgba 5/11,6/5,5/0,0/0\n" \
-       "endmode\n"
-
-#define fdflush_trivial_usage \
-       "DEVICE"
-#define fdflush_full_usage "\n\n" \
-       "Force floppy disk drive to detect disk change"
-
-#define fdformat_trivial_usage \
-       "[-n] DEVICE"
-#define fdformat_full_usage "\n\n" \
-       "Format floppy disk\n" \
-     "\nOptions:" \
-     "\n    -n  Don't verify after format" \
-
-/* Looks like someone forgot to add this to config system */
-#ifndef ENABLE_FEATURE_FDISK_BLKSIZE
-# define ENABLE_FEATURE_FDISK_BLKSIZE 0
-# define IF_FEATURE_FDISK_BLKSIZE(a)
 #endif
-
-#define fdisk_trivial_usage \
-       "[-ul" IF_FEATURE_FDISK_BLKSIZE("s") "] " \
-       "[-C CYLINDERS] [-H HEADS] [-S SECTORS] [-b SSZ] DISK"
-#define fdisk_full_usage "\n\n" \
-       "Change partition table\n" \
-     "\nOptions:" \
-     "\n    -u      Start and End are in sectors (instead of cylinders)" \
-     "\n    -l      Show partition table for each DISK, then exit" \
-    IF_FEATURE_FDISK_BLKSIZE( \
-     "\n    -s      Show partition sizes in kb for each DISK, then exit" \
-    ) \
-     "\n    -b 2048     (for certain MO disks) use 2048-byte sectors" \
-     "\n    -C CYLINDERS    Set number of cylinders/heads/sectors" \
-     "\n    -H HEADS" \
-     "\n    -S SECTORS" \
-
-#define fgconsole_trivial_usage \
-    ""
-#define fgconsole_full_usage "\n\n" \
-    "Get active console"
-
-#define findfs_trivial_usage \
-       "LABEL=label or UUID=uuid"
-#define findfs_full_usage "\n\n" \
-       "Find a filesystem device based on a label or UUID"
-#define findfs_example_usage \
-       "$ findfs LABEL=MyDevice"
-
-#define flash_lock_trivial_usage \
-       "MTD_DEVICE OFFSET SECTORS"
-#define flash_lock_full_usage "\n\n" \
-       "Lock part or all of an MTD device. If SECTORS is -1, then all sectors\n" \
-       "will be locked, regardless of the value of OFFSET"
-
-#define flash_unlock_trivial_usage \
-       "MTD_DEVICE"
-#define flash_unlock_full_usage "\n\n" \
-       "Unlock an MTD device"
-
-#define flash_eraseall_trivial_usage \
-       "[-jq] MTD_DEVICE"
-#define flash_eraseall_full_usage "\n\n" \
-       "Erase an MTD device\n" \
-     "\nOptions:" \
-     "\n    -j  Format the device for jffs2" \
-     "\n    -q  Don't display progress messages" \
-
-#define flashcp_trivial_usage \
-       "-v FILE MTD_DEVICE"
-#define flashcp_full_usage "\n\n" \
-       "Copy an image to MTD device\n" \
-     "\nOptions:" \
-     "\n    -v  Verbose" \
-
-#define flock_trivial_usage \
-       "[-sxun] FD|{FILE [-c] PROG ARGS}"
-#define flock_full_usage "\n\n" \
-       "[Un]lock file descriptor, or lock FILE, run PROG\n" \
-     "\nOptions:" \
-     "\n    -s  Shared lock" \
-     "\n    -x  Exclusive lock (default)" \
-     "\n    -u  Unlock FD" \
-     "\n    -n  Fail rather than wait" \
-
-#define fold_trivial_usage \
-       "[-bs] [-w WIDTH] [FILE]..."
-#define fold_full_usage "\n\n" \
-       "Wrap input lines in each FILE (or stdin), writing to stdout\n" \
-     "\nOptions:" \
-     "\n    -b  Count bytes rather than columns" \
-     "\n    -s  Break at spaces" \
-     "\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 \
-       "$ free\n" \
-       "              total         used         free       shared      buffers\n" \
-       "  Mem:       257628       248724         8904        59644        93124\n" \
-       " Swap:       128516         8404       120112\n" \
-       "Total:       386144       257128       129016\n" \
-
-#define freeramdisk_trivial_usage \
-       "DEVICE"
-#define freeramdisk_full_usage "\n\n" \
-       "Free all memory used by the specified ramdisk"
-#define freeramdisk_example_usage \
-       "$ freeramdisk /dev/ram2\n"
-
-#define fsck_trivial_usage \
-       "[-ANPRTV] [-C FD] [-t FSTYPE] [FS_OPTS] [BLOCKDEV]..."
-#define fsck_full_usage "\n\n" \
-       "Check and repair filesystems\n" \
-     "\nOptions:" \
-     "\n    -A  Walk /etc/fstab and check all filesystems" \
-     "\n    -N  Don't execute, just show what would be done" \
-     "\n    -P  With -A, check filesystems in parallel" \
-     "\n    -R  With -A, skip the root filesystem" \
-     "\n    -T  Don't show title on startup" \
-     "\n    -V  Verbose" \
-     "\n    -C n    Write status information to specified filedescriptor" \
-     "\n    -t TYPE List of filesystem types to check" \
-
-#define fsck_minix_trivial_usage \
-       "[-larvsmf] BLOCKDEV"
-#define fsck_minix_full_usage "\n\n" \
-       "Check MINIX filesystem\n" \
-     "\nOptions:" \
-     "\n    -l  List all filenames" \
-     "\n    -r  Perform interactive repairs" \
-     "\n    -a  Perform automatic repairs" \
-     "\n    -v  Verbose" \
-     "\n    -s  Output superblock information" \
-     "\n    -m  Show \"mode not cleared\" warnings" \
-     "\n    -f  Force file system check" \
-
-#define ftpd_trivial_usage \
-       "[-wvS] [-t N] [-T N] [DIR]"
-#define ftpd_full_usage "\n\n" \
-       "Anonymous FTP server\n" \
-       "\n" \
-       "ftpd should be used as an inetd service.\n" \
-       "ftpd's line for inetd.conf:\n" \
-       "    21 stream tcp nowait root ftpd ftpd /files/to/serve\n" \
-       "It also can be ran from tcpsvd:\n" \
-       "    tcpsvd -vE 0.0.0.0 21 ftpd /files/to/serve\n" \
-     "\nOptions:" \
-     "\n    -w  Allow upload" \
-     "\n    -v  Log to stderr" \
-     "\n    -S  Log to syslog" \
-     "\n    -t,-T   Idle and absolute timeouts" \
-     "\n    DIR Change root to this directory" \
-
-#define ftpget_trivial_usage \
-       "[OPTIONS] HOST [LOCAL_FILE] REMOTE_FILE"
-#define ftpget_full_usage "\n\n" \
-       "Retrieve a remote file via FTP\n" \
-     "\nOptions:" \
-    IF_FEATURE_FTPGETPUT_LONG_OPTIONS( \
-     "\n    -c,--continue   Continue previous transfer" \
-     "\n    -v,--verbose    Verbose" \
-     "\n    -u,--username   Username" \
-     "\n    -p,--password   Password" \
-     "\n    -P,--port   Port number" \
-    ) \
-    IF_NOT_FEATURE_FTPGETPUT_LONG_OPTIONS( \
-     "\n    -c  Continue previous transfer" \
-     "\n    -v  Verbose" \
-     "\n    -u  Username" \
-     "\n    -p  Password" \
-     "\n    -P  Port number" \
-    )
-
-#define ftpput_trivial_usage \
-       "[OPTIONS] HOST [REMOTE_FILE] LOCAL_FILE"
-#define ftpput_full_usage "\n\n" \
-       "Store a local file on a remote machine via FTP\n" \
-     "\nOptions:" \
-    IF_FEATURE_FTPGETPUT_LONG_OPTIONS( \
-     "\n    -v,--verbose    Verbose" \
-     "\n    -u,--username   Username" \
-     "\n    -p,--password   Password" \
-     "\n    -P,--port   Port number" \
-    ) \
-    IF_NOT_FEATURE_FTPGETPUT_LONG_OPTIONS( \
-     "\n    -v  Verbose" \
-     "\n    -u  Username" \
-     "\n    -p  Password" \
-     "\n    -P  Port number" \
-    )
-
-#define fuser_trivial_usage \
-       "[OPTIONS] FILE or PORT/PROTO"
-#define fuser_full_usage "\n\n" \
-       "Find processes which use FILEs or PORTs\n" \
-     "\nOptions:" \
-     "\n    -m  Find processes which use same fs as FILEs" \
-     "\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)" \
-
-#define getenforce_trivial_usage NOUSAGE_STR
-#define getenforce_full_usage ""
-
-#define getopt_trivial_usage \
-       "[OPTIONS]"
-#define getopt_full_usage "\n\n" \
-       "Options:" \
-    IF_LONG_OPTS( \
-     "\n    -a,--alternative        Allow long options starting with single -" \
-     "\n    -l,--longoptions=longopts   Long options to be recognized" \
-     "\n    -n,--name=progname      The name under which errors are reported" \
-     "\n    -o,--options=optstring      Short options to be recognized" \
-     "\n    -q,--quiet          Disable error reporting by getopt(3)" \
-     "\n    -Q,--quiet-output       No normal output" \
-     "\n    -s,--shell=shell        Set shell quoting conventions" \
-     "\n    -T,--test           Test for getopt(1) version" \
-     "\n    -u,--unquoted           Don't quote the output" \
-    ) \
-    IF_NOT_LONG_OPTS( \
-     "\n    -a      Allow long options starting with single -" \
-     "\n    -l longopts Long options to be recognized" \
-     "\n    -n progname The name under which errors are reported" \
-     "\n    -o optstring    Short options to be recognized" \
-     "\n    -q      Disable error reporting by getopt(3)" \
-     "\n    -Q      No normal output" \
-     "\n    -s shell    Set shell quoting conventions" \
-     "\n    -T      Test for getopt(1) version" \
-     "\n    -u      Don't quote the output" \
-    )
-#define getopt_example_usage \
-       "$ cat getopt.test\n" \
-       "#!/bin/sh\n" \
-       "GETOPT=`getopt -o ab:c:: --long a-long,b-long:,c-long:: \\\n" \
-       "       -n 'example.busybox' -- \"$@\"`\n" \
-       "if [ $? != 0 ]; then exit 1; fi\n" \
-       "eval set -- \"$GETOPT\"\n" \
-       "while true; do\n" \
-       " case $1 in\n" \
-       "   -a|--a-long) echo \"Option a\"; shift;;\n" \
-       "   -b|--b-long) echo \"Option b, argument '$2'\"; shift 2;;\n" \
-       "   -c|--c-long)\n" \
-       "     case \"$2\" in\n" \
-       "       \"\") echo \"Option c, no argument\"; shift 2;;\n" \
-       "       *)  echo \"Option c, argument '$2'\"; shift 2;;\n" \
-       "     esac;;\n" \
-       "   --) shift; break;;\n" \
-       "   *) echo \"Internal error!\"; exit 1;;\n" \
-       " esac\n" \
-       "done\n"
-
-#define getsebool_trivial_usage \
-       "-a or getsebool boolean..."
-#define getsebool_full_usage "\n\n" \
-       "    -a  Show all selinux booleans"
-
-#define getty_trivial_usage \
-       "[OPTIONS] BAUD_RATE TTY [TERMTYPE]"
-#define getty_full_usage "\n\n" \
-       "Open a tty, prompt for a login name, then invoke /bin/login\n" \
-     "\nOptions:" \
-     "\n    -h      Enable hardware (RTS/CTS) flow control" \
-     "\n    -i      Don't display /etc/issue before running login" \
-     "\n    -L      Local line, don't do carrier detect" \
-     "\n    -m      Get baud rate from modem's CONNECT status message" \
-     "\n    -w      Wait for a CR or LF before sending /etc/issue" \
-     "\n    -n      Don't prompt the user for a login name" \
-     "\n    -f ISSUE_FILE   Display ISSUE_FILE instead of /etc/issue" \
-     "\n    -l LOGIN    Invoke LOGIN instead of /bin/login" \
-     "\n    -t SEC      Terminate after SEC if no username is read" \
-     "\n    -I INITSTR  Send INITSTR before anything else" \
-     "\n    -H HOST     Log HOST into the utmp file as the hostname" \
-
-#define gunzip_trivial_usage \
-       "[-cft] [FILE]..."
-#define gunzip_full_usage "\n\n" \
-       "Decompress FILEs (or stdin)\n" \
-     "\nOptions:" \
-     "\n    -c  Write to stdout" \
-     "\n    -f  Force" \
-     "\n    -t  Test file integrity" \
-
-#define gunzip_example_usage \
-       "$ ls -la /tmp/BusyBox*\n" \
-       "-rw-rw-r--    1 andersen andersen   557009 Apr 11 10:55 /tmp/BusyBox-0.43.tar.gz\n" \
-       "$ gunzip /tmp/BusyBox-0.43.tar.gz\n" \
-       "$ ls -la /tmp/BusyBox*\n" \
-       "-rw-rw-r--    1 andersen andersen  1761280 Apr 14 17:47 /tmp/BusyBox-0.43.tar\n"
-
-#define gzip_trivial_usage \
-       "[-cfd] [FILE]..."
-#define gzip_full_usage "\n\n" \
-       "Compress FILEs (or stdin)\n" \
-     "\nOptions:" \
-     "\n    -d  Decompress" \
-     "\n    -c  Write to stdout" \
-     "\n    -f  Force" \
-
-#define gzip_example_usage \
-       "$ ls -la /tmp/busybox*\n" \
-       "-rw-rw-r--    1 andersen andersen  1761280 Apr 14 17:47 /tmp/busybox.tar\n" \
-       "$ gzip /tmp/busybox.tar\n" \
-       "$ ls -la /tmp/busybox*\n" \
-       "-rw-rw-r--    1 andersen andersen   554058 Apr 14 17:49 /tmp/busybox.tar.gz\n"
-
-#define hdparm_trivial_usage \
-       "[OPTIONS] [DEVICE]"
-#define hdparm_full_usage "\n\n" \
-       "Options:" \
-     "\n    -a  Get/set fs readahead" \
-     "\n    -A  Set drive read-lookahead flag (0/1)" \
-     "\n    -b  Get/set bus state (0 == off, 1 == on, 2 == tristate)" \
-     "\n    -B  Set Advanced Power Management setting (1-255)" \
-     "\n    -c  Get/set IDE 32-bit IO setting" \
-     "\n    -C  Check IDE power mode status" \
-    IF_FEATURE_HDPARM_HDIO_GETSET_DMA( \
-     "\n    -d  Get/set using_dma flag") \
-     "\n    -D  Enable/disable drive defect-mgmt" \
-     "\n    -f  Flush buffer cache for device on exit" \
-     "\n    -g  Display drive geometry" \
-     "\n    -h  Display terse usage information" \
-    IF_FEATURE_HDPARM_GET_IDENTITY( \
-     "\n    -i  Display drive identification") \
-    IF_FEATURE_HDPARM_GET_IDENTITY( \
-     "\n    -I  Detailed/current information directly from drive") \
-     "\n    -k  Get/set keep_settings_over_reset flag (0/1)" \
-     "\n    -K  Set drive keep_features_over_reset flag (0/1)" \
-     "\n    -L  Set drive doorlock (0/1) (removable harddisks only)" \
-     "\n    -m  Get/set multiple sector count" \
-     "\n    -n  Get/set ignore-write-errors flag (0/1)" \
-     "\n    -p  Set PIO mode on IDE interface chipset (0,1,2,3,4,...)" \
-     "\n    -P  Set drive prefetch count" \
-/*   "\n    -q  Change next setting quietly" - not supported ib bbox */ \
-     "\n    -Q  Get/set DMA tagged-queuing depth (if supported)" \
-     "\n    -r  Get/set readonly flag (DANGEROUS to set)" \
-    IF_FEATURE_HDPARM_HDIO_SCAN_HWIF( \
-     "\n    -R  Register an IDE interface (DANGEROUS)") \
-     "\n    -S  Set standby (spindown) timeout" \
-     "\n    -t  Perform device read timings" \
-     "\n    -T  Perform cache read timings" \
-     "\n    -u  Get/set unmaskirq flag (0/1)" \
-    IF_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF( \
-     "\n    -U  Unregister an IDE interface (DANGEROUS)") \
-     "\n    -v  Defaults; same as -mcudkrag for IDE drives" \
-     "\n    -V  Display program version and exit immediately" \
-    IF_FEATURE_HDPARM_HDIO_DRIVE_RESET( \
-     "\n    -w  Perform device reset (DANGEROUS)") \
-     "\n    -W  Set drive write-caching flag (0/1) (DANGEROUS)" \
-    IF_FEATURE_HDPARM_HDIO_TRISTATE_HWIF( \
-     "\n    -x  Tristate device for hotswap (0/1) (DANGEROUS)") \
-     "\n    -X  Set IDE xfer mode (DANGEROUS)" \
-     "\n    -y  Put IDE drive in standby mode" \
-     "\n    -Y  Put IDE drive to sleep" \
-     "\n    -Z  Disable Seagate auto-powersaving mode" \
-     "\n    -z  Reread partition table" \
-
-#define head_trivial_usage \
-       "[OPTIONS] [FILE]..."
-#define head_full_usage "\n\n" \
-       "Print first 10 lines of each FILE (or stdin) to stdout.\n" \
-       "With more than one FILE, precede each with a filename header.\n" \
-     "\nOptions:" \
-     "\n    -n N[kbm]   Print first N lines" \
-    IF_FEATURE_FANCY_HEAD( \
-     "\n    -c N[kbm]   Print first N bytes" \
-     "\n    -q      Never print headers" \
-     "\n    -v      Always print headers" \
-    ) \
-     "\n" \
-     "\nN may be suffixed by k (x1024), b (x512), or m (x1024^2)." \
-
-#define head_example_usage \
-       "$ head -n 2 /etc/passwd\n" \
-       "root:x:0:0:root:/root:/bin/bash\n" \
-       "daemon:x:1:1:daemon:/usr/sbin:/bin/sh\n"
-
-#define tail_trivial_usage \
-       "[OPTIONS] [FILE]..."
-#define tail_full_usage "\n\n" \
-       "Print last 10 lines of each FILE (or stdin) to stdout.\n" \
-       "With more than one FILE, precede each with a filename header.\n" \
-     "\nOptions:" \
-     "\n    -f      Print data as file grows" \
-    IF_FEATURE_FANCY_TAIL( \
-     "\n    -s SECONDS  Wait SECONDS between reads with -f" \
-    ) \
-     "\n    -n N[kbm]   Print last N lines" \
-    IF_FEATURE_FANCY_TAIL( \
-     "\n    -c N[kbm]   Print last N bytes" \
-     "\n    -q      Never print headers" \
-     "\n    -v      Always print headers" \
-     "\n" \
-     "\nN may be suffixed by k (x1024), b (x512), or m (x1024^2)." \
-     "\nIf N starts with a '+', output begins with the Nth item from the start" \
-     "\nof each file, not from the end." \
-    ) \
-
-#define tail_example_usage \
-       "$ tail -n 1 /etc/resolv.conf\n" \
-       "nameserver 10.0.0.1\n"
-
-#define hexdump_trivial_usage \
-       "[-bcCdefnosvx" IF_FEATURE_HEXDUMP_REVERSE("R") "] [FILE]..."
-#define hexdump_full_usage "\n\n" \
-       "Display FILEs (or stdin) in a user specified format\n" \
-     "\nOptions:" \
-     "\n    -b      One-byte octal display" \
-     "\n    -c      One-byte character display" \
-     "\n    -C      Canonical hex+ASCII, 16 bytes per line" \
-     "\n    -d      Two-byte decimal display" \
-     "\n    -e FORMAT STRING" \
-     "\n    -f FORMAT FILE" \
-     "\n    -n LENGTH   Interpret only LENGTH bytes of input" \
-     "\n    -o      Two-byte octal display" \
-     "\n    -s OFFSET   Skip OFFSET bytes" \
-     "\n    -v      Display all input data" \
-     "\n    -x      Two-byte hexadecimal display" \
-    IF_FEATURE_HEXDUMP_REVERSE( \
-     "\n    -R      Reverse of 'hexdump -Cv'") \
-
-#define hd_trivial_usage \
-       "FILE..."
-#define hd_full_usage "\n\n" \
-       "hd is an alias for hexdump -C"
-
-#define hostid_trivial_usage \
-       ""
-#define hostid_full_usage "\n\n" \
-       "Print out a unique 32-bit identifier for the machine"
-
-#define hostname_trivial_usage \
-       "[OPTIONS] [HOSTNAME | -F FILE]"
-#define hostname_full_usage "\n\n" \
-       "Get or set hostname or DNS domain name\n" \
-     "\nOptions:" \
-     "\n    -s  Short" \
-     "\n    -i  Addresses for the hostname" \
-     "\n    -d  DNS domain name" \
-     "\n    -f  Fully qualified domain name" \
-     "\n    -F FILE Use FILE's content as hostname" \
-
-#define hostname_example_usage \
-       "$ hostname\n" \
-       "sage\n"
-
-#define dnsdomainname_trivial_usage NOUSAGE_STR
-#define dnsdomainname_full_usage ""
-
-#define httpd_trivial_usage \
-       "[-ifv[v]]" \
-       " [-c CONFFILE]" \
-       " [-p [IP:]PORT]" \
-    IF_FEATURE_HTTPD_SETUID(" [-u USER[:GRP]]") \
-    IF_FEATURE_HTTPD_BASIC_AUTH(" [-r REALM]") \
-       " [-h HOME]\n" \
-       "or httpd -d/-e" IF_FEATURE_HTTPD_AUTH_MD5("/-m") " STRING"
-#define httpd_full_usage "\n\n" \
-       "Listen for incoming HTTP requests\n" \
-     "\nOptions:" \
-     "\n    -i      Inetd mode" \
-     "\n    -f      Don't daemonize" \
-     "\n    -v[v]       Verbose" \
-     "\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( \
-     "\n    -r REALM    Authentication Realm for Basic Authentication") \
-     "\n    -h HOME     Home directory (default .)" \
-     "\n    -c FILE     Configuration file (default {/etc,HOME}/httpd.conf)" \
-    IF_FEATURE_HTTPD_AUTH_MD5( \
-     "\n    -m STRING   MD5 crypt STRING") \
-     "\n    -e STRING   HTML encode STRING" \
-     "\n    -d STRING   URL decode STRING" \
-
-#define hwclock_trivial_usage \
-    IF_FEATURE_HWCLOCK_LONG_OPTIONS( \
-       "[-r|--show] [-s|--hctosys] [-w|--systohc]" \
-       " [-l|--localtime] [-u|--utc]" \
-       " [-f FILE]" \
-    ) \
-    IF_NOT_FEATURE_HWCLOCK_LONG_OPTIONS( \
-       "[-r] [-s] [-w] [-l] [-u] [-f FILE]" \
-    )
-#define hwclock_full_usage "\n\n" \
-       "Query and set hardware clock (RTC)\n" \
-     "\nOptions:" \
-     "\n    -r  Show hardware clock time" \
-     "\n    -s  Set system time from hardware clock" \
-     "\n    -w  Set hardware clock to system time" \
-     "\n    -u  Hardware clock is in UTC" \
-     "\n    -l  Hardware clock is in local time" \
-     "\n    -f FILE Use specified device (e.g. /dev/rtc2)" \
-
-#define id_trivial_usage \
-       "[OPTIONS] [USER]"
-#define id_full_usage "\n\n" \
-       "Print information about USER or the current user\n" \
-     "\nOptions:" \
-    IF_SELINUX( \
-     "\n    -Z  Security context" \
-    ) \
-     "\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" \
-       "uid=1000(andersen) gid=1000(andersen)\n"
-
-#define ifconfig_trivial_usage \
-    IF_FEATURE_IFCONFIG_STATUS("[-a]") " interface [address]"
-#define ifconfig_full_usage "\n\n" \
-       "Configure a network interface\n" \
-     "\nOptions:" \
-     "\n" \
-    IF_FEATURE_IPV6( \
-       "    [add ADDRESS[/PREFIXLEN]]\n") \
-    IF_FEATURE_IPV6( \
-       "    [del ADDRESS[/PREFIXLEN]]\n") \
-       "    [[-]broadcast [ADDRESS]] [[-]pointopoint [ADDRESS]]\n" \
-       "    [netmask ADDRESS] [dstaddr ADDRESS]\n" \
-    IF_FEATURE_IFCONFIG_SLIP( \
-       "    [outfill NN] [keepalive NN]\n") \
-       "    " IF_FEATURE_IFCONFIG_HW("[hw ether" IF_FEATURE_HWIB("|infiniband")" ADDRESS] ") "[metric NN] [mtu NN]\n" \
-       "    [[-]trailers] [[-]arp] [[-]allmulti]\n" \
-       "    [multicast] [[-]promisc] [txqueuelen NN] [[-]dynamic]\n" \
-    IF_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ( \
-       "    [mem_start NN] [io_addr NN] [irq NN]\n") \
-       "    [up|down] ..."
-
-#define ifenslave_trivial_usage \
-       "[-cdf] MASTER_IFACE SLAVE_IFACE..."
-#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" */
-
-#define ifenslave_example_usage \
-       "To create a bond device, simply follow these three steps:\n" \
-       "- ensure that the required drivers are properly loaded:\n" \
-       "  # modprobe bonding ; modprobe <3c59x|eepro100|pcnet32|tulip|...>\n" \
-       "- assign an IP address to the bond device:\n" \
-       "  # ifconfig bond0 <addr> netmask <mask> broadcast <bcast>\n" \
-       "- attach all the interfaces you need to the bond device:\n" \
-       "  # ifenslave bond0 eth0 eth1 eth2\n" \
-       "  If bond0 didn't have a MAC address, it will take eth0's. Then, all\n" \
-       "  interfaces attached AFTER this assignment will get the same MAC addr.\n\n" \
-       "  To detach a dead interface without setting the bond device down:\n" \
-       "  # ifenslave -d bond0 eth1\n\n" \
-       "  To set the bond device down and automatically release all the slaves:\n" \
-       "  # ifconfig bond0 down\n\n" \
-       "  To change active slave:\n" \
-       "  # ifenslave -c bond0 eth0\n" \
-
-#define ifplugd_trivial_usage \
-       "[OPTIONS]"
-#define ifplugd_full_usage "\n\n" \
-       "Network interface plug detection daemon\n" \
-     "\nOptions:" \
-     "\n    -n      Don't daemonize" \
-     "\n    -s      Don't log to syslog" \
-     "\n    -i IFACE    Interface" \
-     "\n    -f/-F       Treat link detection error as link down/link up" \
-     "\n            (otherwise exit on error)" \
-     "\n    -a      Don't up interface at each link probe" \
-     "\n    -M      Monitor creation/destruction of interface" \
-     "\n            (otherwise it must exist)" \
-     "\n    -r PROG     Script to run" \
-     "\n    -x ARG      Extra argument for script" \
-     "\n    -I      Don't exit on nonzero exit code from script" \
-     "\n    -p      Don't run script on daemon startup" \
-     "\n    -q      Don't run script on daemon quit" \
-     "\n    -l      Run script on startup even if no cable is detected" \
-     "\n    -t SECS     Poll time in seconds" \
-     "\n    -u SECS     Delay before running script after link up" \
-     "\n    -d SECS     Delay after link down" \
-     "\n    -m MODE     API mode (mii, priv, ethtool, wlan, iff, auto)" \
-     "\n    -k      Kill running daemon" \
-
-#define ifup_trivial_usage \
-       "[-an"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] [-i FILE] IFACE..."
-#define ifup_full_usage "\n\n" \
-       "Options:" \
-     "\n    -a  De/configure all interfaces automatically" \
-     "\n    -i FILE Use FILE for interface definitions" \
-     "\n    -n  Print out what would happen, but don't do it" \
-    IF_FEATURE_IFUPDOWN_MAPPING( \
-     "\n        (note: doesn't disable mappings)" \
-     "\n    -m  Don't run any mappings" \
-    ) \
-     "\n    -v  Print out what would happen before doing it" \
-     "\n    -f  Force de/configuration" \
-
-#define ifdown_trivial_usage \
-       "[-an"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] [-i FILE] IFACE..."
-#define ifdown_full_usage "\n\n" \
-       "Options:" \
-     "\n    -a  De/configure all interfaces automatically" \
-     "\n    -i FILE Use FILE for interface definitions" \
-     "\n    -n  Print out what would happen, but don't do it" \
-    IF_FEATURE_IFUPDOWN_MAPPING( \
-     "\n        (note: doesn't disable mappings)" \
-     "\n    -m  Don't run any mappings" \
-    ) \
-     "\n    -v  Print out what would happen before doing it" \
-     "\n    -f  Force de/configuration" \
-
-#define inetd_trivial_usage \
-       "[-fe] [-q N] [-R N] [CONFFILE]"
-#define inetd_full_usage "\n\n" \
-       "Listen for network connections and launch programs\n" \
-     "\nOptions:" \
-     "\n    -f  Run in foreground" \
-     "\n    -e  Log to stderr" \
-     "\n    -q N    Socket listen queue (default: 128)" \
-     "\n    -R N    Pause services after N connects/min" \
-     "\n        (default: 0 - disabled)" \
-
-#define inotifyd_trivial_usage \
-    "PROG FILE1[:MASK]..."
-#define inotifyd_full_usage "\n\n" \
-       "Run PROG on filesystem changes." \
-     "\nWhen a filesystem event matching MASK occurs on FILEn," \
-     "\nPROG ACTUAL_EVENTS FILEn [SUBFILE] is run." \
-     "\nEvents:" \
-     "\n    a   File is accessed" \
-     "\n    c   File is modified" \
-     "\n    e   Metadata changed" \
-     "\n    w   Writable file is closed" \
-     "\n    0   Unwritable file is closed" \
-     "\n    r   File is opened" \
-     "\n    D   File is deleted" \
-     "\n    M   File is moved" \
-     "\n    u   Backing fs is unmounted" \
-     "\n    o   Event queue overflowed" \
-     "\n    x   File can't be watched anymore" \
-     "\nIf watching a directory:" \
-     "\n    m   Subfile is moved into dir" \
-     "\n    y   Subfile is moved out of dir" \
-     "\n    n   Subfile is created" \
-     "\n    d   Subfile is deleted" \
-     "\n" \
-     "\ninotifyd waits for PROG to exit." \
-     "\nWhen x event happens for all FILEs, inotifyd exits." \
-
-/* -v, -b, -c are ignored */
-#define install_trivial_usage \
-    "[-cdDsp] [-o USER] [-g GRP] [-m MODE] [SOURCE]... DEST"
-#define install_full_usage "\n\n" \
-       "Copy files and set attributes\n" \
-     "\nOptions:" \
-     "\n    -c  Just copy (default)" \
-     "\n    -d  Create directories" \
-     "\n    -D  Create leading target directories" \
-     "\n    -s  Strip symbol table" \
-     "\n    -p  Preserve date" \
-     "\n    -o USER Set ownership" \
-     "\n    -g GRP  Set group ownership" \
-     "\n    -m MODE Set permissions" \
-    IF_SELINUX( \
-     "\n    -Z  Set security context" \
-    )
-
-/* would need to make the " | " optional depending on more than one selected: */
-#define ip_trivial_usage \
-       "[OPTIONS] {" \
-    IF_FEATURE_IP_ADDRESS("address | ") \
-    IF_FEATURE_IP_ROUTE("route | ") \
-    IF_FEATURE_IP_LINK("link | ") \
-    IF_FEATURE_IP_TUNNEL("tunnel | ") \
-    IF_FEATURE_IP_RULE("rule") \
-       "} {COMMAND}"
-#define ip_full_usage "\n\n" \
-       "ip [OPTIONS] OBJECT {COMMAND}\n" \
-       "where OBJECT := {" \
-    IF_FEATURE_IP_ADDRESS("address | ") \
-    IF_FEATURE_IP_ROUTE("route | ") \
-    IF_FEATURE_IP_LINK("link | ") \
-    IF_FEATURE_IP_TUNNEL("tunnel | ") \
-    IF_FEATURE_IP_RULE("rule") \
-       "}\n" \
-       "OPTIONS := { -f[amily] { inet | inet6 | link } | -o[neline] }" \
-
-#define ipaddr_trivial_usage \
-       "{ {add|del} IFADDR dev STRING | {show|flush}\n" \
-       "        [dev STRING] [to PREFIX] }"
-#define ipaddr_full_usage "\n\n" \
-       "ipaddr {add|delete} IFADDR dev STRING\n" \
-       "ipaddr {show|flush} [dev STRING] [scope SCOPE-ID]\n" \
-       "    [to PREFIX] [label PATTERN]\n" \
-       "    IFADDR := PREFIX | ADDR peer PREFIX\n" \
-       "    [broadcast ADDR] [anycast ADDR]\n" \
-       "    [label STRING] [scope SCOPE-ID]\n" \
-       "    SCOPE-ID := [host | link | global | NUMBER]" \
-
-#define ipcalc_trivial_usage \
-       "[OPTIONS] ADDRESS[[/]NETMASK] [NETMASK]"
-#define ipcalc_full_usage "\n\n" \
-       "Calculate IP network settings from a IP address\n" \
-     "\nOptions:" \
-    IF_FEATURE_IPCALC_LONG_OPTIONS( \
-     "\n    -b,--broadcast  Display calculated broadcast address" \
-     "\n    -n,--network    Display calculated network address" \
-     "\n    -m,--netmask    Display default netmask for IP" \
-    IF_FEATURE_IPCALC_FANCY( \
-     "\n    -p,--prefix Display the prefix for IP/NETMASK" \
-     "\n    -h,--hostname   Display first resolved host name" \
-     "\n    -s,--silent Don't ever display error messages" \
-    ) \
-    ) \
-    IF_NOT_FEATURE_IPCALC_LONG_OPTIONS( \
-     "\n    -b  Display calculated broadcast address" \
-     "\n    -n  Display calculated network address" \
-     "\n    -m  Display default netmask for IP" \
-    IF_FEATURE_IPCALC_FANCY( \
-     "\n    -p  Display the prefix for IP/NETMASK" \
-     "\n    -h  Display first resolved host name" \
-     "\n    -s  Don't ever display error messages" \
-    ) \
-    )
-
-#define ipcrm_trivial_usage \
-       "[-MQS key] [-mqs id]"
-#define ipcrm_full_usage "\n\n" \
-       "Upper-case options MQS remove an object by shmkey value.\n" \
-       "Lower-case options remove an object by shmid value.\n" \
-     "\nOptions:" \
-     "\n    -mM Remove memory segment after last detach" \
-     "\n    -qQ Remove message queue" \
-     "\n    -sS Remove semaphore" \
-
-#define ipcs_trivial_usage \
-       "[[-smq] -i shmid] | [[-asmq] [-tcplu]]"
-#define ipcs_full_usage "\n\n" \
-       "    -i  Show specific resource" \
-     "\nResource specification:" \
-     "\n    -m  Shared memory segments" \
-     "\n    -q  Message queues" \
-     "\n    -s  Semaphore arrays" \
-     "\n    -a  All (default)" \
-     "\nOutput format:" \
-     "\n    -t  Time" \
-     "\n    -c  Creator" \
-     "\n    -p  Pid" \
-     "\n    -l  Limits" \
-     "\n    -u  Summary" \
-
-#define iplink_trivial_usage \
-       "{ set DEVICE { up | down | arp { on | off } | show [DEVICE] }"
-#define iplink_full_usage "\n\n" \
-       "iplink set DEVICE { up | down | arp | multicast { on | off } |\n" \
-       "            dynamic { on | off } |\n" \
-       "            mtu MTU }\n" \
-       "iplink show [DEVICE]" \
-
-#define iproute_trivial_usage \
-       "{ list | flush | { add | del | change | append |\n" \
-       "        replace | monitor } ROUTE }"
-#define iproute_full_usage "\n\n" \
-       "iproute { list | flush } SELECTOR\n" \
-       "iproute get ADDRESS [from ADDRESS iif STRING]\n" \
-       "            [oif STRING]  [tos TOS]\n" \
-       "iproute { add | del | change | append | replace | monitor } ROUTE\n" \
-       "            SELECTOR := [root PREFIX] [match PREFIX] [proto RTPROTO]\n" \
-       "            ROUTE := [TYPE] PREFIX [tos TOS] [proto RTPROTO]\n" \
-       "                [metric METRIC]" \
-
-#define iprule_trivial_usage \
-       "{[list | add | del] RULE}"
-#define iprule_full_usage "\n\n" \
-       "iprule [list | add | del] SELECTOR ACTION\n" \
-       "    SELECTOR := [from PREFIX] [to PREFIX] [tos TOS] [fwmark FWMARK]\n" \
-       "            [dev STRING] [pref NUMBER]\n" \
-       "    ACTION := [table TABLE_ID] [nat ADDRESS]\n" \
-       "            [prohibit | reject | unreachable]\n" \
-       "            [realms [SRCREALM/]DSTREALM]\n" \
-       "    TABLE_ID := [local | main | default | NUMBER]" \
-
-#define iptunnel_trivial_usage \
-       "{ add | change | del | show } [NAME]\n" \
-       "    [mode { ipip | gre | sit }]\n" \
-       "    [remote ADDR] [local ADDR] [ttl TTL]"
-#define iptunnel_full_usage "\n\n" \
-       "iptunnel { add | change | del | show } [NAME]\n" \
-       "    [mode { ipip | gre | sit }] [remote ADDR] [local ADDR]\n" \
-       "    [[i|o]seq] [[i|o]key KEY] [[i|o]csum]\n" \
-       "    [ttl TTL] [tos TOS] [[no]pmtudisc] [dev PHYS_DEV]" \
-
-#define kbd_mode_trivial_usage \
-       "[-a|k|s|u] [-C TTY]"
-#define kbd_mode_full_usage "\n\n" \
-       "Report or set the keyboard mode\n" \
-     "\nOptions:" \
-     "\n    -a  Default (ASCII)" \
-     "\n    -k  Medium-raw (keyboard)" \
-     "\n    -s  Raw (scancode)" \
-     "\n    -u  Unicode (utf-8)" \
-     "\n    -C TTY  Affect TTY instead of /dev/tty" \
-
-#define kill_trivial_usage \
-       "[-l] [-SIG] PID..."
-#define kill_full_usage "\n\n" \
-       "Send a signal (default: TERM) to given PIDs\n" \
-     "\nOptions:" \
-     "\n    -l  List all signal names and numbers" \
-/*   "\n    -s SIG  Yet another way of specifying SIG" */ \
-
-#define kill_example_usage \
-       "$ ps | grep apache\n" \
-       "252 root     root     S [apache]\n" \
-       "263 www-data www-data S [apache]\n" \
-       "264 www-data www-data S [apache]\n" \
-       "265 www-data www-data S [apache]\n" \
-       "266 www-data www-data S [apache]\n" \
-       "267 www-data www-data S [apache]\n" \
-       "$ kill 252\n"
-
-#define killall_trivial_usage \
-       "[-l] [-q] [-SIG] PROCESS_NAME..."
-#define killall_full_usage "\n\n" \
-       "Send a signal (default: TERM) to given processes\n" \
-     "\nOptions:" \
-     "\n    -l  List all signal names and numbers" \
-/*   "\n    -s SIG  Yet another way of specifying SIG" */ \
-     "\n    -q  Don't complain if no processes were killed" \
-
-#define killall_example_usage \
-       "$ killall apache\n"
-
-#define killall5_trivial_usage \
-       "[-l] [-SIG] [-o PID]..."
-#define killall5_full_usage "\n\n" \
-       "Send a signal (default: TERM) to all processes outside current session\n" \
-     "\nOptions:" \
-     "\n    -l  List all signal names and numbers" \
-     "\n    -o PID  Don't signal this PID" \
-/*   "\n    -s SIG  Yet another way of specifying SIG" */ \
-
-#define klogd_trivial_usage \
-       "[-c N] [-n]"
-#define klogd_full_usage "\n\n" \
-       "Kernel logger\n" \
-     "\nOptions:" \
-     "\n    -c N    Only messages with level < N are printed to console" \
-     "\n    -n  Run in foreground" \
-
-#define length_trivial_usage \
-       "STRING"
-#define length_full_usage "\n\n" \
-       "Print STRING's length"
-
-#define length_example_usage \
-       "$ length Hello\n" \
-       "5\n"
-
-#define less_trivial_usage \
-       "[-EMNmh~I?] [FILE]..."
-#define less_full_usage "\n\n" \
-       "View FILE (or stdin) one screenful at a time\n" \
-     "\nOptions:" \
-     "\n    -E  Quit once the end of a file is reached" \
-     "\n    -M,-m   Display status line with line numbers" \
-     "\n        and percentage through the file" \
-     "\n    -N  Prefix line number to each line" \
-     "\n    -I  Ignore case in all searches" \
-     "\n    -~  Suppress ~s displayed past the end of the file" \
-
-#define linux32_trivial_usage NOUSAGE_STR
-#define linux32_full_usage ""
-#define linux64_trivial_usage NOUSAGE_STR
-#define linux64_full_usage ""
-
-#define setarch_trivial_usage \
-       "personality PROG ARGS"
-#define setarch_full_usage "\n\n" \
-       "Personality may be:\n" \
-       "    linux32     Set 32bit uname emulation\n" \
-       "    linux64     Set 64bit uname emulation" \
-
-#define ln_trivial_usage \
-       "[OPTIONS] TARGET... LINK|DIR"
-#define ln_full_usage "\n\n" \
-       "Create a link LINK or DIR/TARGET to the specified TARGET(s)\n" \
-     "\nOptions:" \
-     "\n    -s  Make symlinks instead of hardlinks" \
-     "\n    -f  Remove existing destinations" \
-     "\n    -n  Don't dereference symlinks - treat like normal file" \
-     "\n    -b  Make a backup of the target (if exists) before link operation" \
-     "\n    -S suf  Use suffix instead of ~ when making backup files" \
-
-#define ln_example_usage \
-       "$ ln -s BusyBox /tmp/ls\n" \
-       "$ ls -l /tmp/ls\n" \
-       "lrwxrwxrwx    1 root     root            7 Apr 12 18:39 ls -> BusyBox*\n"
-
-#define load_policy_trivial_usage NOUSAGE_STR
-#define load_policy_full_usage ""
-
-#define loadfont_trivial_usage \
-       "< font"
-#define loadfont_full_usage "\n\n" \
-       "Load a console font from stdin" \
-/*   "\n    -C TTY  Affect TTY instead of /dev/tty" */ \
-
-#define loadfont_example_usage \
-       "$ loadfont < /etc/i18n/fontname\n"
-
-#define loadkmap_trivial_usage \
-       "< keymap"
-#define loadkmap_full_usage "\n\n" \
-       "Load a binary keyboard translation table from stdin\n" \
-/*   "\n    -C TTY  Affect TTY instead of /dev/tty" */ \
-
-#define loadkmap_example_usage \
-       "$ loadkmap < /etc/i18n/lang-keymap\n"
-
-#define logger_trivial_usage \
-       "[OPTIONS] [MESSAGE]"
-#define logger_full_usage "\n\n" \
-       "Write MESSAGE (or stdin) to syslog\n" \
-     "\nOptions:" \
-     "\n    -s  Log to stderr as well as the system log" \
-     "\n    -t TAG  Log using the specified tag (defaults to user name)" \
-     "\n    -p PRIO Priority (numeric or facility.level pair)" \
-
-#define logger_example_usage \
-       "$ logger \"hello\"\n"
-
-#define login_trivial_usage \
-       "[-p] [-h HOST] [[-f] USER]"
-#define login_full_usage "\n\n" \
-       "Begin a new session on the system\n" \
-     "\nOptions:" \
-     "\n    -f  Don't authenticate (user already authenticated)" \
-     "\n    -h  Name of the remote host" \
-     "\n    -p  Preserve environment" \
-
-#define logname_trivial_usage \
-       ""
-#define logname_full_usage "\n\n" \
-       "Print the name of the current user"
-#define logname_example_usage \
-       "$ logname\n" \
-       "root\n"
-
-#define logread_trivial_usage \
-       "[-f]"
-#define logread_full_usage "\n\n" \
-       "Show messages in syslogd's circular buffer\n" \
-     "\nOptions:" \
-     "\n    -f  Output data as log grows" \
-
-#define losetup_trivial_usage \
-       "[-o OFS] LOOPDEV FILE - associate loop devices\n" \
-       "    losetup -d LOOPDEV - disassociate\n" \
-       "    losetup [-f] - show"
-#define losetup_full_usage "\n\n" \
-       "Options:" \
-     "\n    -o OFS  Start OFS bytes into FILE" \
-     "\n    -f  Show first free loop device" \
-
-#define losetup_notes_usage \
-       "No arguments will display all current associations.\n" \
-       "One argument (losetup /dev/loop1) will display the current association\n" \
-       "(if any), or disassociate it (with -d). The display shows the offset\n" \
-       "and filename of the file the loop device is currently bound to.\n\n" \
-       "Two arguments (losetup /dev/loop1 file.img) create a new association,\n" \
-       "with an optional offset (-o 12345). Encryption is not yet supported.\n" \
-       "losetup -f will show the first loop free loop device\n\n"
-
-#define lpd_trivial_usage \
-       "SPOOLDIR [HELPER [ARGS]]"
-#define lpd_full_usage "\n\n" \
-       "SPOOLDIR must contain (symlinks to) device nodes or directories" \
-     "\nwith names matching print queue names. In the first case, jobs are" \
-     "\nsent directly to the device. Otherwise each job is stored in queue" \
-     "\ndirectory and HELPER program is called. Name of file to print" \
-     "\nis passed in $DATAFILE variable." \
-     "\nExample:" \
-     "\n    tcpsvd -E 0 515 softlimit -m 999999 lpd /var/spool ./print" \
-
-#define lpq_trivial_usage \
-       "[-P queue[@host[:port]]] [-U USERNAME] [-d JOBID]... [-fs]"
-#define lpq_full_usage "\n\n" \
-       "Options:" \
-     "\n    -P  lp service to connect to (else uses $PRINTER)" \
-     "\n    -d  Delete jobs" \
-     "\n    -f  Force any waiting job to be printed" \
-     "\n    -s  Short display" \
-
-#define lpr_trivial_usage \
-       "-P queue[@host[:port]] -U USERNAME -J TITLE -Vmh [FILE]..."
-/* -C CLASS exists too, not shown.
- * CLASS is supposed to be printed on banner page, if one is requested */
-#define lpr_full_usage "\n\n" \
-       "Options:" \
-     "\n    -P  lp service to connect to (else uses $PRINTER)"\
-     "\n    -m  Send mail on completion" \
-     "\n    -h  Print banner page too" \
-     "\n    -V  Verbose" \
-
-#define ls_trivial_usage \
-       "[-1Aa" IF_FEATURE_LS_TIMESTAMPS("c") "Cd" \
-    IF_FEATURE_LS_TIMESTAMPS("e") IF_FEATURE_LS_FILETYPES("F") "iln" \
-    IF_FEATURE_LS_FILETYPES("p") IF_FEATURE_LS_FOLLOWLINKS("L") \
-    IF_FEATURE_LS_RECURSIVE("R") IF_FEATURE_LS_SORTFILES("rS") "s" \
-    IF_FEATURE_AUTOWIDTH("T") IF_FEATURE_LS_TIMESTAMPS("tu") \
-    IF_FEATURE_LS_SORTFILES("v") IF_FEATURE_AUTOWIDTH("w") "x" \
-    IF_FEATURE_LS_SORTFILES("X") IF_FEATURE_HUMAN_READABLE("h") "k" \
-    IF_SELINUX("K") "] [FILE]..."
-#define ls_full_usage "\n\n" \
-       "List directory contents\n" \
-     "\nOptions:" \
-     "\n    -1  List in a single column" \
-     "\n    -A  Don't list . and .." \
-     "\n    -a  Don't hide entries starting with ." \
-     "\n    -C  List by columns" \
-    IF_FEATURE_LS_TIMESTAMPS( \
-     "\n    -c  With -l: sort by ctime") \
-    IF_FEATURE_LS_COLOR( \
-     "\n    --color[={always,never,auto}]   Control coloring") \
-     "\n    -d  List directory entries instead of contents" \
-    IF_FEATURE_LS_TIMESTAMPS( \
-     "\n    -e  List full date and time") \
-    IF_FEATURE_LS_FILETYPES( \
-     "\n    -F  Append indicator (one of */=@|) to entries") \
-     "\n    -i  List inode numbers" \
-     "\n    -l  Long listing format" \
-     "\n    -n  List numeric UIDs and GIDs instead of names" \
-    IF_FEATURE_LS_FILETYPES( \
-     "\n    -p  Append indicator (one of /=@|) to entries") \
-    IF_FEATURE_LS_FOLLOWLINKS( \
-     "\n    -L  List entries pointed to by symlinks") \
-    IF_FEATURE_LS_RECURSIVE( \
-     "\n    -R  Recurse") \
-    IF_FEATURE_LS_SORTFILES( \
-     "\n    -r  Sort in reverse order") \
-    IF_FEATURE_LS_SORTFILES( \
-     "\n    -S  Sort by file size") \
-     "\n    -s  List the size of each file, in blocks" \
-    IF_FEATURE_AUTOWIDTH( \
-     "\n    -T N    Assume tabstop every N columns") \
-    IF_FEATURE_LS_TIMESTAMPS( \
-     "\n    -t  With -l: sort by modification time") \
-    IF_FEATURE_LS_TIMESTAMPS( \
-     "\n    -u  With -l: sort by access time") \
-    IF_FEATURE_LS_SORTFILES( \
-     "\n    -v  Sort by version") \
-    IF_FEATURE_AUTOWIDTH( \
-     "\n    -w N    Assume the terminal is N columns wide") \
-     "\n    -x  List by lines" \
-    IF_FEATURE_LS_SORTFILES( \
-     "\n    -X  Sort by extension") \
-    IF_FEATURE_HUMAN_READABLE( \
-     "\n    -h  List sizes in human readable format (1K 243M 2G)") \
-    IF_SELINUX( \
-     "\n    -k  List security context") \
-    IF_SELINUX( \
-     "\n    -K  List security context in long format") \
-    IF_SELINUX( \
-     "\n    -Z  List security context and permission") \
-
-#define lsattr_trivial_usage \
-       "[-Radlv] [FILE]..."
-#define lsattr_full_usage "\n\n" \
-       "List file attributes on an ext2 fs\n" \
-     "\nOptions:" \
-     "\n    -R  Recurse" \
-     "\n    -a  Don't hide entries starting with ." \
-     "\n    -d  List directory entries instead of contents" \
-     "\n    -l  List long flag names" \
-     "\n    -v  List the file's version/generation number" \
-
-#define lspci_trivial_usage \
-       "[-mk]"
-#define lspci_full_usage "\n\n" \
-       "List all PCI devices" \
-     "\n" \
-     "\n    -m  Parseable output" \
-     "\n    -k  Show driver" \
-
-#define lsusb_trivial_usage NOUSAGE_STR
-#define lsusb_full_usage ""
-
-#if ENABLE_FEATURE_MAKEDEVS_LEAF
-#define makedevs_trivial_usage \
-       "NAME TYPE MAJOR MINOR FIRST LAST [s]"
-#define makedevs_full_usage "\n\n" \
-       "Create a range of block or character special files" \
-     "\n" \
-     "\nTYPE is:" \
-     "\n    b   Block device" \
-     "\n    c   Character device" \
-     "\n    f   FIFO, MAJOR and MINOR are ignored" \
-     "\n" \
-     "\nFIRST..LAST specify numbers appended to NAME." \
-     "\nIf 's' is the last argument, the base device is created as well." \
-     "\n" \
-     "\nExamples:" \
-     "\n    makedevs /dev/ttyS c 4 66 2 63   ->  ttyS2-ttyS63" \
-     "\n    makedevs /dev/hda b 3 0 0 8 s    ->  hda,hda1-hda8"
-#define makedevs_example_usage \
-       "# makedevs /dev/ttyS c 4 66 2 63\n" \
-       "[creates ttyS2-ttyS63]\n" \
-       "# makedevs /dev/hda b 3 0 0 8 s\n" \
-       "[creates hda,hda1-hda8]\n"
-#endif
-
-#if ENABLE_FEATURE_MAKEDEVS_TABLE
-#define makedevs_trivial_usage \
-       "[-d device_table] rootdir"
-#define makedevs_full_usage "\n\n" \
-       "Create a range of special files as specified in a device table.\n" \
-       "Device table entries take the form of:\n" \
-       "<type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>\n" \
-       "Where name is the file name, type can be one of:\n" \
-       "    f   Regular file\n" \
-       "    d   Directory\n" \
-       "    c   Character device\n" \
-       "    b   Block device\n" \
-       "    p   Fifo (named pipe)\n" \
-       "uid is the user id for the target file, gid is the group id for the\n" \
-       "target file. The rest of the entries (major, minor, etc) apply to\n" \
-       "to device special files. A '-' may be used for blank entries."
-#define makedevs_example_usage \
-       "For example:\n" \
-       "<name>    <type> <mode><uid><gid><major><minor><start><inc><count>\n" \
-       "/dev         d   755    0    0    -      -      -      -    -\n" \
-       "/dev/console c   666    0    0    5      1      -      -    -\n" \
-       "/dev/null    c   666    0    0    1      3      0      0    -\n" \
-       "/dev/zero    c   666    0    0    1      5      0      0    -\n" \
-       "/dev/hda     b   640    0    0    3      0      0      0    -\n" \
-       "/dev/hda     b   640    0    0    3      1      1      1    15\n\n" \
-       "Will Produce:\n" \
-       "/dev\n" \
-       "/dev/console\n" \
-       "/dev/null\n" \
-       "/dev/zero\n" \
-       "/dev/hda\n" \
-       "/dev/hda[0-15]\n"
-#endif
-
-#define makemime_trivial_usage \
-       "[OPTIONS] [FILE]..."
-#define makemime_full_usage "\n\n" \
-       "Create multipart MIME-encoded message from FILEs\n" \
-/*     "Transfer encoding is base64, disposition is inline (not attachment)\n" */ \
-     "\nOptions:" \
-     "\n    -o FILE Output. Default: stdout" \
-     "\n    -a HDR  Add header. Examples:" \
-     "\n        \"From: user@host.org\", \"Date: `date -R`\"" \
-     "\n    -c CT   Content type. Default: text/plain" \
-     "\n    -C CS   Charset. Default: " CONFIG_FEATURE_MIME_CHARSET \
-/*   "\n    -e ENC  Transfer encoding. Ignored. base64 is assumed" */ \
-     "\n" \
-     "\nOther options are silently ignored" \
-
-#define man_trivial_usage \
-       "[-aw] [MANPAGE]..."
-#define man_full_usage "\n\n" \
-       "Format and display manual page\n" \
-     "\nOptions:" \
-     "\n    -a      Display all pages" \
-     "\n    -w  Show page locations" \
-
-#define matchpathcon_trivial_usage \
-       "[-n] [-N] [-f file_contexts_file] [-p prefix] [-V]"
-#define matchpathcon_full_usage "\n\n" \
-       "    -n  Don't display path" \
-     "\n    -N  Don't use translations" \
-     "\n    -f  Use alternate file_context file" \
-     "\n    -p  Use prefix to speed translations" \
-     "\n    -V  Verify file context on disk matches defaults" \
-
-#define md5sum_trivial_usage \
-       "[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" \
-     "\nOptions:" \
-     "\n    -c  Check sums against given list" \
-     "\n    -s  Don't output anything, status code shows success" \
-     "\n    -w  Warn about improperly formatted checksum lines" \
-    )
-
-#define md5sum_example_usage \
-       "$ md5sum < busybox\n" \
-       "6fd11e98b98a58f64ff3398d7b324003\n" \
-       "$ md5sum busybox\n" \
-       "6fd11e98b98a58f64ff3398d7b324003  busybox\n" \
-       "$ md5sum -c -\n" \
-       "6fd11e98b98a58f64ff3398d7b324003  busybox\n" \
-       "busybox: OK\n" \
-       "^D\n"
-
-#define sha1sum_trivial_usage \
-       "[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" \
-     "\nOptions:" \
-     "\n    -c  Check sums against given list" \
-     "\n    -s  Don't output anything, status code shows success" \
-     "\n    -w  Warn about improperly formatted checksum lines" \
-    )
-
-#define sha256sum_trivial_usage \
-       "[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" \
-     "\nOptions:" \
-     "\n    -c  Check sums against given list" \
-     "\n    -s  Don't output anything, status code shows success" \
-     "\n    -w  Warn about improperly formatted checksum lines" \
-    )
-
-#define sha512sum_trivial_usage \
-       "[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" \
-     "\nOptions:" \
-     "\n    -c  Check sums against given list" \
-     "\n    -s  Don't output anything, status code shows success" \
-     "\n    -w  Warn about improperly formatted checksum lines" \
-    )
-
-#define mdev_trivial_usage \
-       "[-s]"
-#define mdev_full_usage "\n\n" \
-       "    -s  Scan /sys and populate /dev during system boot\n" \
-       "\n" \
-       "It can be run by kernel as a hotplug helper. To activate it:\n" \
-       " echo /sbin/mdev > /proc/sys/kernel/hotplug\n" \
-    IF_FEATURE_MDEV_CONF( \
-       "It uses /etc/mdev.conf with lines\n" \
-       "[-]DEVNAME UID:GID PERM" \
-            IF_FEATURE_MDEV_RENAME(" [>|=PATH]") \
-            IF_FEATURE_MDEV_EXEC(" [@|$|*PROG]") \
-    ) \
-
-#define mdev_notes_usage "" \
-    IF_FEATURE_MDEV_CONFIG( \
-       "The mdev config file contains lines that look like:\n" \
-       "  hd[a-z][0-9]* 0:3 660\n\n" \
-       "That's device name (with regex match), uid:gid, and permissions.\n\n" \
-    IF_FEATURE_MDEV_EXEC( \
-       "Optionally, that can be followed (on the same line) by a special character\n" \
-       "and a command line to run after creating/before deleting the corresponding\n" \
-       "device(s). The environment variable $MDEV indicates the active device node\n" \
-       "(which is useful if it's a regex match). For example:\n\n" \
-       "  hdc root:cdrom 660  *ln -s $MDEV cdrom\n\n" \
-       "The special characters are @ (run after creating), $ (run before deleting),\n" \
-       "and * (run both after creating and before deleting). The commands run in\n" \
-       "the /dev directory, and use system() which calls /bin/sh.\n\n" \
-    ) \
-       "Config file parsing stops on the first matching line. If no config\n" \
-       "entry is matched, devices are created with default 0:0 660. (Make\n" \
-       "the last line match .* to override this.)\n\n" \
-    )
-
-#define microcom_trivial_usage \
-       "[-d DELAY] [-t TIMEOUT] [-s SPEED] [-X] TTY"
-#define microcom_full_usage "\n\n" \
-       "Copy bytes for stdin to TTY and from TTY to stdout\n" \
-     "\nOptions:" \
-     "\n    -d  Wait up to DELAY ms for TTY output before sending every" \
-     "\n        next byte to it" \
-     "\n    -t  Exit if both stdin and TTY are silent for TIMEOUT ms" \
-     "\n    -s  Set serial line to SPEED" \
-     "\n    -X  Disable special meaning of NUL and Ctrl-X from stdin" \
-
-#define mkdir_trivial_usage \
-       "[OPTIONS] DIRECTORY..."
-#define mkdir_full_usage "\n\n" \
-       "Create DIRECTORY\n" \
-     "\nOptions:" \
-     "\n    -m MODE Mode" \
-     "\n    -p  No error if exists; make parent directories as needed" \
-    IF_SELINUX( \
-     "\n    -Z  Set security context" \
-    )
-
-#define mkdir_example_usage \
-       "$ mkdir /tmp/foo\n" \
-       "$ mkdir /tmp/foo\n" \
-       "/tmp/foo: File exists\n" \
-       "$ mkdir /tmp/foo/bar/baz\n" \
-       "/tmp/foo/bar/baz: No such file or directory\n" \
-       "$ mkdir -p /tmp/foo/bar/baz\n"
-
-#define mkfifo_trivial_usage \
-       "[-m MODE] " IF_SELINUX("[-Z] ") "NAME"
-#define mkfifo_full_usage "\n\n" \
-       "Create named pipe\n" \
-     "\nOptions:" \
-     "\n    -m MODE Mode (default a=rw)" \
-    IF_SELINUX( \
-     "\n    -Z  Set security context" \
-    )
-
-#define mkfs_ext2_trivial_usage \
-       "[-Fn] " \
-       /* "[-c|-l filename] " */ \
-       "[-b BLK_SIZE] " \
-       /* "[-f fragment-size] [-g blocks-per-group] " */ \
-       "[-i INODE_RATIO] [-I INODE_SIZE] " \
-       /* "[-j] [-J journal-options] [-N number-of-inodes] " */ \
-       "[-m RESERVED_PERCENT] " \
-       /* "[-o creator-os] [-O feature[,...]] [-q] " */ \
-       /* "[r fs-revision-level] [-E extended-options] [-v] [-F] " */ \
-       "[-L LABEL] " \
-       /* "[-M last-mounted-directory] [-S] [-T filesystem-type] " */ \
-       "BLOCKDEV [KBYTES]"
-#define mkfs_ext2_full_usage "\n\n" \
-       "    -b BLK_SIZE Block size, bytes" \
-/*   "\n    -c      Check device for bad blocks" */ \
-/*   "\n    -E opts     Set extended options" */ \
-/*   "\n    -f size     Fragment size in bytes" */ \
-     "\n    -F      Force" \
-/*   "\n    -g N        Number of blocks in a block group" */ \
-     "\n    -i RATIO    Max number of files is filesystem_size / RATIO" \
-     "\n    -I BYTES    Inode size (min 128)" \
-/*   "\n    -j      Create a journal (ext3)" */ \
-/*   "\n    -J opts     Set journal options (size/device)" */ \
-/*   "\n    -l file     Read bad blocks list from file" */ \
-     "\n    -L LBL      Volume label" \
-     "\n    -m PERCENT  Percent of blocks to reserve for admin" \
-/*   "\n    -M dir      Set last mounted directory" */ \
-     "\n    -n      Dry run" \
-/*   "\n    -N N        Number of inodes to create" */ \
-/*   "\n    -o os       Set the 'creator os' field" */ \
-/*   "\n    -O features Dir_index/filetype/has_journal/journal_dev/sparse_super" */ \
-/*   "\n    -q      Quiet" */ \
-/*   "\n    -r rev      Set filesystem revision" */ \
-/*   "\n    -S      Write superblock and group descriptors only" */ \
-/*   "\n    -T fs-type  Set usage type (news/largefile/largefile4)" */ \
-/*   "\n    -v      Verbose" */ \
-
-#define mkfs_minix_trivial_usage \
-       "[-c | -l FILE] [-nXX] [-iXX] BLOCKDEV [KBYTES]"
-#define mkfs_minix_full_usage "\n\n" \
-       "Make a MINIX filesystem\n" \
-     "\nOptions:" \
-     "\n    -c      Check device for bad blocks" \
-     "\n    -n [14|30]  Maximum length of filenames" \
-     "\n    -i INODES   Number of inodes for the filesystem" \
-     "\n    -l FILE     Read bad blocks list from FILE" \
-     "\n    -v      Make version 2 filesystem" \
-
-#define mkfs_reiser_trivial_usage \
-       "[-f] [-l LABEL] BLOCKDEV [4K-BLOCKS]"
-
-#define mkfs_reiser_full_usage "\n\n" \
-       "Make a ReiserFS V3 filesystem\n" \
-     "\nOptions:" \
-     "\n    -f  Force" \
-     "\n    -l LBL  Volume label" \
-
-#define mkfs_vfat_trivial_usage \
-       "[-v] [-n LABEL] BLOCKDEV [KBYTES]"
-/* Accepted but ignored:
-       "[-c] [-C] [-I] [-l bad-block-file] [-b backup-boot-sector] "
-       "[-m boot-msg-file] [-i volume-id] "
-       "[-s sectors-per-cluster] [-S logical-sector-size] [-f number-of-FATs] "
-       "[-h hidden-sectors] [-F fat-size] [-r root-dir-entries] [-R reserved-sectors] "
-*/
-#define mkfs_vfat_full_usage "\n\n" \
-       "Make a FAT32 filesystem\n" \
-     "\nOptions:" \
-/*   "\n    -c  Check device for bad blocks" */ \
-     "\n    -v  Verbose" \
-/*   "\n    -I  Allow to use entire disk device (e.g. /dev/hda)" */ \
-     "\n    -n LBL  Volume label" \
-
-#define mknod_trivial_usage \
-       "[-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 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 \
-       "[-L LBL] BLOCKDEV [KBYTES]"
-#define mkswap_full_usage "\n\n" \
-       "Prepare BLOCKDEV to be used as swap partition\n" \
-     "\nOptions:" \
-     "\n    -L LBL  Label" \
-
-#define mktemp_trivial_usage \
-       "[-dt] [-p DIR] [TEMPLATE]"
-#define mktemp_full_usage "\n\n" \
-       "Create a temporary file with name based on TEMPLATE and print its name.\n" \
-       "TEMPLATE must end with XXXXXX (e.g. [/dir/]nameXXXXXX).\n" \
-     "\nOptions:" \
-     "\n    -d  Make a directory instead of a file" \
-/*   "\n    -q  Fail silently if an error occurs" - we ignore it */ \
-     "\n    -t  Generate a path rooted in temporary directory" \
-     "\n    -p DIR  Use DIR as a temporary directory (implies -t)" \
-     "\n" \
-     "\nFor -t or -p, directory is chosen as follows:" \
-     "\n$TMPDIR if set, else -p DIR, else /tmp" \
-
-#define mktemp_example_usage \
-       "$ mktemp /tmp/temp.XXXXXX\n" \
-       "/tmp/temp.mWiLjM\n" \
-       "$ ls -la /tmp/temp.mWiLjM\n" \
-       "-rw-------    1 andersen andersen        0 Apr 25 17:10 /tmp/temp.mWiLjM\n"
-
-#define more_trivial_usage \
-       "[FILE]..."
-#define more_full_usage "\n\n" \
-       "View FILE (or stdin) one screenful at a time"
-
-#define more_example_usage \
-       "$ dmesg | more\n"
-
-#define mount_trivial_usage \
-       "[OPTIONS] [-o OPTS] DEVICE NODE"
-#define mount_full_usage "\n\n" \
-       "Mount a filesystem. Filesystem autodetection requires /proc.\n" \
-     "\nOptions:" \
-     "\n    -a      Mount all filesystems in fstab" \
-    IF_FEATURE_MOUNT_FAKE( \
-    IF_FEATURE_MTAB_SUPPORT( \
-     "\n    -f      Update /etc/mtab, but don't mount" \
-    ) \
-    IF_NOT_FEATURE_MTAB_SUPPORT( \
-     "\n    -f      Dry run" \
-    ) \
-    ) \
-    IF_FEATURE_MOUNT_HELPERS( \
-     "\n    -i      Don't run mount helper" \
-    ) \
-    IF_FEATURE_MTAB_SUPPORT( \
-     "\n    -n      Don't update /etc/mtab" \
-    ) \
-     "\n    -r      Read-only mount" \
-     "\n    -w      Read-write mount (default)" \
-     "\n    -t FSTYPE   Filesystem type" \
-     "\n    -O OPT      Mount only filesystems with option OPT (-a only)" \
-     "\n-o OPT:" \
-    IF_FEATURE_MOUNT_LOOP( \
-     "\n    loop        Ignored (loop devices are autodetected)" \
-    ) \
-    IF_FEATURE_MOUNT_FLAGS( \
-     "\n    [a]sync     Writes are [a]synchronous" \
-     "\n    [no]atime   Disable/enable updates to inode access times" \
-     "\n    [no]diratime    Disable/enable atime updates to directories" \
-     "\n    [no]relatime    Disable/enable atime updates relative to modification time" \
-     "\n    [no]dev     (Dis)allow use of special device files" \
-     "\n    [no]exec    (Dis)allow use of executable files" \
-     "\n    [no]suid    (Dis)allow set-user-id-root programs" \
-     "\n    [r]shared   Convert [recursively] to a shared subtree" \
-     "\n    [r]slave    Convert [recursively] to a slave subtree" \
-     "\n    [r]private  Convert [recursively] to a private subtree" \
-     "\n    [un]bindable    Make mount point [un]able to be bind mounted" \
-     "\n    bind        Bind a file or directory to another location" \
-     "\n    move        Relocate an existing mount point" \
-    ) \
-     "\n    remount     Remount a mounted filesystem, changing flags" \
-     "\n    ro/rw       Same as -r/-w" \
-     "\n" \
-     "\nThere are filesystem-specific -o flags." \
-
-#define mount_example_usage \
-       "$ mount\n" \
-       "/dev/hda3 on / type minix (rw)\n" \
-       "proc on /proc type proc (rw)\n" \
-       "devpts on /dev/pts type devpts (rw)\n" \
-       "$ mount /dev/fd0 /mnt -t msdos -o ro\n" \
-       "$ mount /tmp/diskimage /opt -t ext2 -o loop\n" \
-       "$ mount cd_image.iso mydir\n"
-#define mount_notes_usage \
-       "Returns 0 for success, number of failed mounts for -a, or errno for one mount."
-
-#define mountpoint_trivial_usage \
-       "[-q] <[-dn] DIR | -x DEVICE>"
-#define mountpoint_full_usage "\n\n" \
-       "Check if the directory is a mountpoint\n" \
-     "\nOptions:" \
-     "\n    -q  Quiet" \
-     "\n    -d  Print major/minor device number of the filesystem" \
-     "\n    -n  Print device name of the filesystem" \
-     "\n    -x  Print major/minor device number of the blockdevice" \
-
-#define mountpoint_example_usage \
-       "$ mountpoint /proc\n" \
-       "/proc is not a mountpoint\n" \
-       "$ mountpoint /sys\n" \
-       "/sys is a mountpoint\n"
-
-#define mt_trivial_usage \
-       "[-f device] opcode value"
-#define mt_full_usage "\n\n" \
-       "Control magnetic tape drive operation\n" \
-       "\n" \
-       "Available Opcodes:\n" \
-       "\n" \
-       "bsf bsfm bsr bss datacompression drvbuffer eof eom erase\n" \
-       "fsf fsfm fsr fss load lock mkpart nop offline ras1 ras2\n" \
-       "ras3 reset retension rewind rewoffline seek setblk setdensity\n" \
-       "setpart tell unload unlock weof wset" \
-
-#define nameif_trivial_usage \
-       "[-s] [-c FILE] [{IFNAME MACADDR}]"
-#define nameif_full_usage "\n\n" \
-       "Rename network interface while it in the down state\n" \
-     "\nOptions:" \
-     "\n    -c FILE     Use configuration file (default: /etc/mactab)" \
-     "\n    -s      Use syslog (LOCAL0 facility)" \
-     "\n    IFNAME MACADDR  new_interface_name interface_mac_address" \
-
-#define nameif_example_usage \
-       "$ nameif -s dmz0 00:A0:C9:8C:F6:3F\n" \
-       " or\n" \
-       "$ nameif -c /etc/my_mactab_file\n" \
-
-#define nmeter_trivial_usage \
-       "format_string"
-#define nmeter_full_usage "\n\n" \
-       "Monitor system in real time\n\n" \
-       "Format specifiers:\n" \
-       " %Nc or %[cN]   Monitor CPU. N - bar size, default 10\n" \
-       "        (displays: S:system U:user N:niced D:iowait I:irq i:softirq)\n" \
-       " %[niface]  Monitor network interface 'iface'\n" \
-       " %m     Monitor allocated memory\n" \
-       " %[mf]      Monitor free memory\n" \
-       " %[mt]      Monitor total memory\n" \
-       " %s     Monitor allocated swap\n" \
-       " %f     Monitor number of used file descriptors\n" \
-       " %Ni        Monitor total/specific IRQ rate\n" \
-       " %x     Monitor context switch rate\n" \
-       " %p     Monitor forks\n" \
-       " %[pn]      Monitor # of processes\n" \
-       " %b     Monitor block io\n" \
-       " %Nt        Show time (with N decimal points)\n" \
-       " %Nd        Milliseconds between updates (default:1000)\n" \
-       " %r     Print <cr> instead of <lf> at EOL" \
-
-#define nmeter_example_usage \
-       "nmeter '%250d%t %20c int %i bio %b mem %m forks%p'"
-
-#define nohup_trivial_usage \
-       "PROG ARGS"
-#define nohup_full_usage "\n\n" \
-       "Run PROG immune to hangups, with output to a non-tty"
-#define nohup_example_usage \
-       "$ nohup make &"
-
-#define nslookup_trivial_usage \
-       "[HOST] [SERVER]"
-#define nslookup_full_usage "\n\n" \
-       "Query the nameserver for the IP address of the given HOST\n" \
-       "optionally using a specified DNS server"
-#define nslookup_example_usage \
-       "$ nslookup localhost\n" \
-       "Server:     default\n" \
-       "Address:    default\n" \
-       "\n" \
-       "Name:       debian\n" \
-       "Address:    127.0.0.1\n"
-
-#define ntpd_trivial_usage \
-    "[-dnqNw"IF_FEATURE_NTPD_SERVER("l")"] [-S PROG] [-p PEER]..."
-#define ntpd_full_usage "\n\n" \
-       "NTP client/server\n" \
-     "\nOptions:" \
-     "\n    -d  Verbose" \
-     "\n    -n  Do not daemonize" \
-     "\n    -q  Quit after clock is set" \
-     "\n    -N  Run at high priority" \
-     "\n    -w  Do not set time (only query peers), implies -n" \
-    IF_FEATURE_NTPD_SERVER( \
-     "\n    -l  Run as server on port 123" \
-    ) \
-     "\n    -S PROG Run PROG after stepping time, stratum change, and every 11 mins" \
-     "\n    -p PEER Obtain time from PEER (may be repeated)" \
-
-#define od_trivial_usage \
-       "[-aBbcDdeFfHhIiLlOovXx] " IF_DESKTOP("[-t TYPE] ") "[FILE]"
-#define od_full_usage "\n\n" \
-       "Write an unambiguous representation, octal bytes by default, of FILE\n" \
-       "(or stdin) to stdout"
-
-#define openvt_trivial_usage \
-       "[-c N] [-sw] [PROG ARGS]"
-#define openvt_full_usage "\n\n" \
-       "Start PROG on a new virtual terminal\n" \
-     "\nOptions:" \
-     "\n    -c N    Use specified VT" \
-     "\n    -s  Switch to the VT" \
-/*   "\n    -l  Run PROG as login shell (by prepending '-')" */ \
-     "\n    -w  Wait for PROG to exit" \
-
-#define openvt_example_usage \
-       "openvt 2 /bin/ash\n"
-
-/*
-#define parse_trivial_usage \
-       "[-n MAXTOKENS] [-m MINTOKENS] [-d DELIMS] [-f FLAGS] FILE..."
-#define parse_full_usage ""
-*/
-
-#define passwd_trivial_usage \
-       "[OPTIONS] [USER]"
-#define passwd_full_usage "\n\n" \
-       "Change USER's password. If no USER is specified,\n" \
-       "changes the password for the current user.\n" \
-     "\nOptions:" \
-     "\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" \
-
-#define chpasswd_trivial_usage \
-    IF_LONG_OPTS("[--md5|--encrypted]") IF_NOT_LONG_OPTS("[-m|-e]")
-#define chpasswd_full_usage "\n\n" \
-       "Read user:password from stdin and update /etc/passwd\n" \
-     "\nOptions:" \
-    IF_LONG_OPTS( \
-     "\n    -e,--encrypted  Supplied passwords are in encrypted form" \
-     "\n    -m,--md5    Use MD5 encryption instead of DES" \
-    ) \
-    IF_NOT_LONG_OPTS( \
-     "\n    -e  Supplied passwords are in encrypted form" \
-     "\n    -m  Use MD5 encryption instead of DES" \
-    )
-
-#define pgrep_trivial_usage \
-       "[-flnovx] [-s SID|-P PPID|PATTERN]"
-#define pgrep_full_usage "\n\n" \
-       "Display process(es) selected by regex PATTERN\n" \
-     "\nOptions:" \
-     "\n    -l  Show command name too" \
-     "\n    -f  Match against entire command line" \
-     "\n    -n  Show the newest process only" \
-     "\n    -o  Show the oldest process only" \
-     "\n    -v  Negate the match" \
-     "\n    -x  Match whole name (not substring)" \
-     "\n    -s  Match session ID (0 for current)" \
-     "\n    -P  Match parent process ID" \
-
-#if (ENABLE_FEATURE_PIDOF_SINGLE || ENABLE_FEATURE_PIDOF_OMIT)
-#define pidof_trivial_usage \
-       "[OPTIONS] [NAME]..."
-#define USAGE_PIDOF "\n\nOptions:"
-#else
-#define pidof_trivial_usage \
-       "[NAME]..."
-#define USAGE_PIDOF /* none */
-#endif
-#define pidof_full_usage "\n\n" \
-       "List PIDs of all processes with names that match NAMEs" \
-    USAGE_PIDOF \
-    IF_FEATURE_PIDOF_SINGLE( \
-     "\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" \
-    ) \
-
-#define pidof_example_usage \
-       "$ pidof init\n" \
-       "1\n" \
-    IF_FEATURE_PIDOF_OMIT( \
-       "$ pidof /bin/sh\n20351 5973 5950\n") \
-    IF_FEATURE_PIDOF_OMIT( \
-       "$ pidof /bin/sh -o %PPID\n20351 5950")
-
-#if !ENABLE_FEATURE_FANCY_PING
-#define ping_trivial_usage \
-       "host"
-#define ping_full_usage "\n\n" \
-       "Send ICMP ECHO_REQUEST packets to network hosts"
-#define ping6_trivial_usage \
-       "host"
-#define ping6_full_usage "\n\n" \
-       "Send ICMP ECHO_REQUEST packets to network hosts"
-#else
-#define ping_trivial_usage \
-       "[OPTIONS] HOST"
-#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    -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" \
-     "\n    -W SEC      Seconds to wait for the first response (default:10)" \
-     "\n            (after all -c CNT packets are sent)" \
-     "\n    -w SEC      Seconds until ping exits (default:infinite)" \
-     "\n            (can exit earlier with -c CNT)" \
-     "\n    -q      Quiet, only displays output at start" \
-     "\n            and when finished" \
-
-#define ping6_trivial_usage \
-       "[OPTIONS] HOST"
-#define ping6_full_usage "\n\n" \
-       "Send ICMP ECHO_REQUEST packets to network hosts\n" \
-     "\nOptions:" \
-     "\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" \
-     "\n    -q      Quiet, only displays output at start" \
-     "\n            and when finished" \
-
-#endif
-#define ping_example_usage \
-       "$ ping localhost\n" \
-       "PING slag (127.0.0.1): 56 data bytes\n" \
-       "64 bytes from 127.0.0.1: icmp_seq=0 ttl=255 time=20.1 ms\n" \
-       "\n" \
-       "--- debian ping statistics ---\n" \
-       "1 packets transmitted, 1 packets received, 0% packet loss\n" \
-       "round-trip min/avg/max = 20.1/20.1/20.1 ms\n"
-#define ping6_example_usage \
-       "$ ping6 ip6-localhost\n" \
-       "PING ip6-localhost (::1): 56 data bytes\n" \
-       "64 bytes from ::1: icmp6_seq=0 ttl=64 time=20.1 ms\n" \
-       "\n" \
-       "--- ip6-localhost ping statistics ---\n" \
-       "1 packets transmitted, 1 packets received, 0% packet loss\n" \
-       "round-trip min/avg/max = 20.1/20.1/20.1 ms\n"
-
-#define pipe_progress_trivial_usage NOUSAGE_STR
-#define pipe_progress_full_usage ""
-
-#define pivot_root_trivial_usage \
-       "NEW_ROOT PUT_OLD"
-#define pivot_root_full_usage "\n\n" \
-       "Move the current root file system to PUT_OLD and make NEW_ROOT\n" \
-       "the new root file system"
-
-#define pkill_trivial_usage \
-       "[-l|-SIGNAL] [-fnovx] [-s SID|-P PPID|PATTERN]"
-#define pkill_full_usage "\n\n" \
-       "Send a signal to process(es) selected by regex PATTERN\n" \
-     "\nOptions:" \
-     "\n    -l  List all signals" \
-     "\n    -f  Match against entire command line" \
-     "\n    -n  Signal the newest process only" \
-     "\n    -o  Signal the oldest process only" \
-     "\n    -v  Negate the match" \
-     "\n    -x  Match whole name (not substring)" \
-     "\n    -s  Match session ID (0 for current)" \
-     "\n    -P  Match parent process ID" \
-
-#define popmaildir_trivial_usage \
-       "[OPTIONS] MAILDIR [CONN_HELPER ARGS]"
-#define popmaildir_full_usage "\n\n" \
-       "Fetch content of remote mailbox to local maildir\n" \
-     "\nOptions:" \
-/*   "\n    -b      Binary mode. Ignored" */ \
-/*   "\n    -d      Debug. Ignored" */ \
-/*   "\n    -m      Show used memory. Ignored" */ \
-/*   "\n    -V      Show version. Ignored" */ \
-/*   "\n    -c      Use tcpclient. Ignored" */ \
-/*   "\n    -a      Use APOP protocol. Implied. If server supports APOP -> use it" */ \
-     "\n    -s      Skip authorization" \
-     "\n    -T      Get messages with TOP instead of RETR" \
-     "\n    -k      Keep retrieved messages on the server" \
-     "\n    -t SEC      Network timeout" \
-    IF_FEATURE_POPMAILDIR_DELIVERY( \
-     "\n    -F \"PROG ARGS\"    Filter program (may be repeated)" \
-     "\n    -M \"PROG ARGS\"    Delivery program" \
-    ) \
-     "\n" \
-     "\nFetch from plain POP3 server:" \
-     "\npopmaildir -k DIR nc pop3.server.com 110 <user_and_pass.txt" \
-     "\nFetch from SSLed POP3 server and delete fetched emails:" \
-     "\npopmaildir DIR -- openssl s_client -quiet -connect pop3.server.com:995 <user_and_pass.txt"
-/*   "\n    -R BYTES    Remove old messages on the server >= BYTES. Ignored" */
-/*   "\n    -Z N1-N2    Remove messages from N1 to N2 (dangerous). Ignored" */
-/*   "\n    -L BYTES    Don't retrieve new messages >= BYTES. Ignored" */
-/*   "\n    -H LINES    Type first LINES of a message. Ignored" */
-#define popmaildir_example_usage \
-       "$ 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 printenv_trivial_usage \
-       "[VARIABLE]..."
-#define printenv_full_usage "\n\n" \
-       "Print environment VARIABLEs.\n" \
-       "If no VARIABLE specified, print all."
-
-#define printf_trivial_usage \
-       "FORMAT [ARGUMENT]..."
-#define printf_full_usage "\n\n" \
-       "Format and print ARGUMENT(s) according to FORMAT,\n" \
-       "where FORMAT controls the output exactly as in C printf"
-#define printf_example_usage \
-       "$ printf \"Val=%d\\n\" 5\n" \
-       "Val=5\n"
-
-
-#if ENABLE_DESKTOP
-
-#define ps_trivial_usage \
-       "[-o COL1,COL2=HEADER]" IF_FEATURE_SHOW_THREADS(" [-T]")
-#define ps_full_usage "\n\n" \
-       "Show list of processes\n" \
-     "\nOptions:" \
-     "\n    -o COL1,COL2=HEADER Select columns for display" \
-    IF_FEATURE_SHOW_THREADS( \
-     "\n    -T          Show threads" \
-    )
-
-#else /* !ENABLE_DESKTOP */
-
-#if !ENABLE_SELINUX && !ENABLE_FEATURE_PS_WIDE
-#define USAGE_PS "\nThis version of ps accepts no options"
-#else
-#define USAGE_PS "\nOptions:"
-#endif
-
-#define ps_trivial_usage \
-       ""
-#define ps_full_usage "\n\n" \
-       "Show list of processes\n" \
-    USAGE_PS \
-    IF_SELINUX( \
-     "\n    -Z  Show selinux context" \
-    ) \
-    IF_FEATURE_PS_WIDE( \
-     "\n    w   Wide output" \
-    )
-
-#endif /* ENABLE_DESKTOP */
-
-#define ps_example_usage \
-       "$ ps\n" \
-       "  PID  Uid      Gid State Command\n" \
-       "    1 root     root     S init\n" \
-       "    2 root     root     S [kflushd]\n" \
-       "    3 root     root     S [kupdate]\n" \
-       "    4 root     root     S [kpiod]\n" \
-       "    5 root     root     S [kswapd]\n" \
-       "  742 andersen andersen S [bash]\n" \
-       "  743 andersen andersen S -bash\n" \
-       "  745 root     root     S [getty]\n" \
-       " 2990 andersen andersen R ps\n" \
-
-#define pscan_trivial_usage \
-       "[-cb] [-p MIN_PORT] [-P MAX_PORT] [-t TIMEOUT] [-T MIN_RTT] HOST"
-#define pscan_full_usage "\n\n" \
-       "Scan a host, print all open ports\n" \
-     "\nOptions:" \
-     "\n    -c  Show closed ports too" \
-     "\n    -b  Show blocked ports too" \
-     "\n    -p  Scan from this port (default 1)" \
-     "\n    -P  Scan up to this port (default 1024)" \
-     "\n    -t  Timeout (default 5000 ms)" \
-     "\n    -T  Minimum rtt (default 5 ms, increase for congested hosts)" \
-
-#define pwd_trivial_usage \
-       ""
-#define pwd_full_usage "\n\n" \
-       "Print the full filename of the current working directory"
-#define pwd_example_usage \
-       "$ pwd\n" \
-       "/root\n"
-
-#define raidautorun_trivial_usage \
-       "DEVICE"
-#define raidautorun_full_usage "\n\n" \
-       "Tell the kernel to automatically search and start RAID arrays"
-#define raidautorun_example_usage \
-       "$ raidautorun /dev/md0"
-
-#define rdate_trivial_usage \
-       "[-sp] HOST"
-#define rdate_full_usage "\n\n" \
-       "Get and possibly set the system date and time from a remote HOST\n" \
-     "\nOptions:" \
-     "\n    -s  Set the system date and time (default)" \
-     "\n    -p  Print the date and time" \
-
-#define rdev_trivial_usage \
-       ""
-#define rdev_full_usage "\n\n" \
-       "Print the device node associated with the filesystem mounted at '/'"
-#define rdev_example_usage \
-       "$ rdev\n" \
-       "/dev/mtdblock9 /\n"
-
-#define readahead_trivial_usage \
-       "[FILE]..."
-#define readahead_full_usage "\n\n" \
-       "Preload FILEs to RAM"
-
-#define readlink_trivial_usage \
-    IF_FEATURE_READLINK_FOLLOW("[-fnv] ") "FILE"
-#define readlink_full_usage "\n\n" \
-       "Display the value of a symlink" \
-    IF_FEATURE_READLINK_FOLLOW( "\n" \
-     "\nOptions:" \
-     "\n    -f  Canonicalize by following all symlinks" \
-     "\n    -n  Don't add newline" \
-     "\n    -v  Verbose" \
-    ) \
-
-#define readprofile_trivial_usage \
-       "[OPTIONS]"
-#define readprofile_full_usage "\n\n" \
-       "Options:" \
-     "\n    -m mapfile  (Default: /boot/System.map)" \
-     "\n    -p profile  (Default: /proc/profile)" \
-     "\n    -M NUM      Set the profiling multiplier to NUM" \
-     "\n    -i      Print only info about the sampling step" \
-     "\n    -v      Verbose" \
-     "\n    -a      Print all symbols, even if count is 0" \
-     "\n    -b      Print individual histogram-bin counts" \
-     "\n    -s      Print individual counters within functions" \
-     "\n    -r      Reset all the counters (root only)" \
-     "\n    -n      Disable byte order auto-detection" \
-
-#define realpath_trivial_usage \
-       "FILE..."
-#define realpath_full_usage "\n\n" \
-       "Return the absolute pathnames of given FILE"
-
-#define reformime_trivial_usage \
-       "[OPTIONS] [FILE]..."
-#define reformime_full_usage "\n\n" \
-       "Parse MIME-encoded message\n" \
-     "\nOptions:" \
-     "\n    -x PREFIX   Extract content of MIME sections to files" \
-     "\n    -X PROG ARGS    Filter content of MIME sections through PROG" \
-     "\n            Must be the last option" \
-     "\n" \
-     "\nOther options are silently ignored" \
-
-#define scriptreplay_trivial_usage \
-       "timingfile [typescript [divisor]]"
-#define scriptreplay_full_usage "\n\n" \
-       "Play back typescripts, using timing information"
-
-#define reset_trivial_usage \
-       ""
-#define reset_full_usage "\n\n" \
-       "Reset the screen"
-
-#define resize_trivial_usage \
-       ""
-#define resize_full_usage "\n\n" \
-       "Resize the screen"
-
-#define restorecon_trivial_usage \
-       "[-iFnRv] [-e EXCLUDEDIR]... [-o FILE] [-f FILE]"
-#define restorecon_full_usage "\n\n" \
-       "Reset security contexts of files in pathname\n" \
-     "\n    -i  Ignore files that don't exist" \
-     "\n    -f FILE File with list of files to process" \
-     "\n    -e DIR  Directory to exclude" \
-     "\n    -R,-r   Recurse" \
-     "\n    -n  Don't change any file labels" \
-     "\n    -o FILE Save list of files with incorrect context" \
-     "\n    -v  Verbose" \
-     "\n    -vv Show changed labels" \
-     "\n    -F  Force reset of context to match file_context" \
-     "\n        for customizable files, or the user section," \
-     "\n        if it has changed" \
-
-#define rfkill_trivial_usage \
-       "COMMAND [INDEX|TYPE]"
-#define rfkill_full_usage "\n\n" \
-       "Enable/disable wireless devices\n" \
-       "\nCommands:" \
-     "\n    list [INDEX|TYPE]   List current state" \
-     "\n    block INDEX|TYPE    Disable device" \
-     "\n    unblock INDEX|TYPE  Enable device" \
-     "\n" \
-     "\n    TYPE: all, wlan(wifi), bluetooth, uwb(ultrawideband)," \
-     "\n        wimax, wwan, gps, fm" \
-
-#define rm_trivial_usage \
-       "[-irf] FILE..."
-#define rm_full_usage "\n\n" \
-       "Remove (unlink) FILEs\n" \
-     "\nOptions:" \
-     "\n    -i  Always prompt before removing" \
-     "\n    -f  Never prompt" \
-     "\n    -R,-r   Recurse" \
-
-#define rm_example_usage \
-       "$ rm -rf /tmp/foo\n"
-
-#define rmdir_trivial_usage \
-       "[OPTIONS] DIRECTORY..."
-#define rmdir_full_usage "\n\n" \
-       "Remove DIRECTORY if it is empty\n" \
-     "\nOptions:" \
-    IF_FEATURE_RMDIR_LONG_OPTIONS( \
-     "\n    -p|--parents    Include parents" \
-     "\n    --ignore-fail-on-non-empty" \
-    ) \
-    IF_NOT_FEATURE_RMDIR_LONG_OPTIONS( \
-     "\n    -p  Include parents" \
-    )
-
-#define rmdir_example_usage \
-       "# rmdir /tmp/foo\n"
-
-#define route_trivial_usage \
-       "[{add|del|delete}]"
-#define route_full_usage "\n\n" \
-       "Edit kernel routing tables\n" \
-     "\nOptions:" \
-     "\n    -n  Don't resolve names" \
-     "\n    -e  Display other/more information" \
-     "\n    -A inet" IF_FEATURE_IPV6("{6}") "   Select address family" \
-
-#define rpm_trivial_usage \
-       "-i PACKAGE.rpm; rpm -qp[ildc] PACKAGE.rpm"
-#define rpm_full_usage "\n\n" \
-       "Manipulate RPM packages\n" \
-     "\nCommands:" \
-     "\n    -i  Install package" \
-     "\n    -qp Query package" \
-     "\nOptions:" \
-     "\n    -i  Show information" \
-     "\n    -l  List contents" \
-     "\n    -d  List documents" \
-     "\n    -c  List config files" \
-
-#define rpm2cpio_trivial_usage \
-       "package.rpm"
-#define rpm2cpio_full_usage "\n\n" \
-       "Output a cpio archive of the rpm file"
-
-#define rtcwake_trivial_usage \
-       "[-a | -l | -u] [-d DEV] [-m MODE] [-s SEC | -t TIME]"
-#define rtcwake_full_usage "\n\n" \
-       "Enter a system sleep state until specified wakeup time\n" \
-    IF_LONG_OPTS( \
-     "\n    -a,--auto   Read clock mode from adjtime" \
-     "\n    -l,--local  Clock is set to local time" \
-     "\n    -u,--utc    Clock is set to UTC time" \
-     "\n    -d,--device=DEV Specify the RTC device" \
-     "\n    -m,--mode=MODE  Set the sleep state (default: standby)" \
-     "\n    -s,--seconds=SEC Set the timeout in SEC seconds from now" \
-     "\n    -t,--time=TIME  Set the timeout to TIME seconds from epoch" \
-    ) \
-    IF_NOT_LONG_OPTS( \
-     "\n    -a  Read clock mode from adjtime" \
-     "\n    -l  Clock is set to local time" \
-     "\n    -u  Clock is set to UTC time" \
-     "\n    -d DEV  Specify the RTC device" \
-     "\n    -m MODE Set the sleep state (default: standby)" \
-     "\n    -s SEC  Set the timeout in SEC seconds from now" \
-     "\n    -t TIME Set the timeout to TIME seconds from epoch" \
-    )
-
-#define runcon_trivial_usage \
-       "[-c] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] PROG ARGS\n" \
-       "runcon CONTEXT PROG ARGS"
-#define runcon_full_usage "\n\n" \
-       "Run PROG in a different security context\n" \
-     "\n    CONTEXT     Complete security context\n" \
-    IF_FEATURE_RUNCON_LONG_OPTIONS( \
-     "\n    -c,--compute    Compute process transition context before modifying" \
-     "\n    -t,--type=TYPE  Type (for same role as parent)" \
-     "\n    -u,--user=USER  User identity" \
-     "\n    -r,--role=ROLE  Role" \
-     "\n    -l,--range=RNG  Levelrange" \
-    ) \
-    IF_NOT_FEATURE_RUNCON_LONG_OPTIONS( \
-     "\n    -c  Compute process transition context before modifying" \
-     "\n    -t TYPE Type (for same role as parent)" \
-     "\n    -u USER User identity" \
-     "\n    -r ROLE Role" \
-     "\n    -l RNG  Levelrange" \
-    )
-
-#define run_parts_trivial_usage \
-       "[-t] "IF_FEATURE_RUN_PARTS_FANCY("[-l] ")"[-a ARG] [-u MASK] DIRECTORY"
-#define run_parts_full_usage "\n\n" \
-       "Run a bunch of scripts in DIRECTORY\n" \
-     "\nOptions:" \
-     "\n    -t  Print what would be run, but don't actually run anything" \
-     "\n    -a ARG  Pass ARG as argument for every program" \
-     "\n    -u MASK Set the umask to MASK before running every program" \
-    IF_FEATURE_RUN_PARTS_FANCY( \
-     "\n    -l  Print names of all matching files even if they are not executable" \
-    )
-
-#define run_parts_example_usage \
-       "$ run-parts -a start /etc/init.d\n" \
-       "$ run-parts -a stop=now /etc/init.d\n\n" \
-       "Let's assume you have a script foo/dosomething:\n" \
-       "#!/bin/sh\n" \
-       "for i in $*; do eval $i; done; unset i\n" \
-       "case \"$1\" in\n" \
-       "start*) echo starting something;;\n" \
-       "stop*) set -x; shutdown -h $stop;;\n" \
-       "esac\n\n" \
-       "Running this yields:\n" \
-       "$run-parts -a stop=+4m foo/\n" \
-       "+ shutdown -h +4m"
-
-#define runlevel_trivial_usage \
-       "[FILE]"
-#define runlevel_full_usage "\n\n" \
-       "Find the current and previous system runlevel\n" \
-       "\n" \
-       "If no utmp FILE exists or if no runlevel record can be found,\n" \
-       "print \"unknown\""
-#define runlevel_example_usage \
-       "$ runlevel /var/run/utmp\n" \
-       "N 2"
-
-#define runsv_trivial_usage \
-       "DIR"
-#define runsv_full_usage "\n\n" \
-       "Start and monitor a service and optionally an appendant log service"
-
-#define runsvdir_trivial_usage \
-       "[-P] [-s SCRIPT] DIR"
-#define runsvdir_full_usage "\n\n" \
-       "Start a runsv process for each subdirectory. If it exits, restart it.\n" \
-     "\n    -P      Put each runsv in a new session" \
-     "\n    -s SCRIPT   Run SCRIPT <signo> after signal is processed" \
-
-#define rx_trivial_usage \
-       "FILE"
-#define rx_full_usage "\n\n" \
-       "Receive a file using the xmodem protocol"
-#define rx_example_usage \
-       "$ rx /tmp/foo\n"
-
-#define script_trivial_usage \
-       "[-afq" IF_SCRIPTREPLAY("t") "] [-c PROG] [OUTFILE]"
-#define script_full_usage "\n\n" \
-       "Options:" \
-     "\n    -a  Append output" \
-     "\n    -c PROG Run PROG, not shell" \
-     "\n    -f  Flush output after each write" \
-     "\n    -q  Quiet" \
-    IF_SCRIPTREPLAY( \
-     "\n    -t  Send timing to stderr" \
-    )
-
-#define sed_trivial_usage \
-       "[-efinr] SED_CMD [FILE]..."
-#define sed_full_usage "\n\n" \
-       "Options:" \
-     "\n    -e CMD  Add CMD to sed commands to be executed" \
-     "\n    -f FILE Add FILE contents to sed commands to be executed" \
-     "\n    -i  Edit files in-place (else sends result to stdout)" \
-     "\n    -n  Suppress automatic printing of pattern space" \
-     "\n    -r  Use extended regex syntax" \
-     "\n" \
-     "\nIf no -e or -f, the first non-option argument is the sed command string." \
-     "\nRemaining arguments are input files (stdin if none)."
-
-#define sed_example_usage \
-       "$ echo \"foo\" | sed -e 's/f[a-zA-Z]o/bar/g'\n" \
-       "bar\n"
-
-#define selinuxenabled_trivial_usage NOUSAGE_STR
-#define selinuxenabled_full_usage ""
-
-#define sendmail_trivial_usage \
-       "[OPTIONS] [RECIPIENT_EMAIL]..."
-#define sendmail_full_usage "\n\n" \
-       "Read email from stdin and send it\n" \
-     "\nStandard options:" \
-     "\n    -t      Read additional recipients from message body" \
-     "\n    -f sender   Sender (required)" \
-     "\n    -o options  Various options. -oi implied, others are ignored" \
-     "\n    -i      -oi synonym. implied and ignored" \
-     "\n" \
-     "\nBusybox specific options:" \
-     "\n    -w seconds  Network timeout" \
-     "\n    -H 'PROG ARGS'  Run connection helper" \
-     "\n            Examples:" \
-     "\n            -H 'exec openssl s_client -quiet -tls1 -starttls smtp" \
-     "\n                -connect smtp.gmail.com:25' <email.txt" \
-     "\n                [4<username_and_passwd.txt | -au<username> -ap<password>]" \
-     "\n            -H 'exec openssl s_client -quiet -tls1" \
-     "\n                -connect smtp.gmail.com:465' <email.txt" \
-     "\n                [4<username_and_passwd.txt | -au<username> -ap<password>]" \
-     "\n    -S server[:port] Server" \
-     "\n    -au<username>   Username for AUTH LOGIN" \
-     "\n    -ap<password>   Password for AUTH LOGIN" \
-     "\n    -am<method> Authentication method. Ignored. LOGIN is implied" \
-     "\n" \
-     "\nOther options are silently ignored; -oi -t is implied" \
-    IF_MAKEMIME( \
-     "\nUse makemime applet to create message with attachments" \
-    )
-
-#define seq_trivial_usage \
-       "[-w] [-s SEP] [FIRST [INC]] LAST"
-#define seq_full_usage "\n\n" \
-       "Print numbers from FIRST to LAST, in steps of INC.\n" \
-       "FIRST, INC default to 1.\n" \
-     "\nOptions:" \
-     "\n    -w  Pad to last with leading zeros" \
-     "\n    -s SEP  String separator" \
-
-#define sestatus_trivial_usage \
-       "[-vb]"
-#define sestatus_full_usage "\n\n" \
-       "    -v  Verbose" \
-     "\n    -b  Display current state of booleans" \
-
-#define setconsole_trivial_usage \
-       "[-r" IF_FEATURE_SETCONSOLE_LONG_OPTIONS("|--reset") "] [DEVICE]"
-#define setconsole_full_usage "\n\n" \
-       "Redirect system console output to DEVICE (default: /dev/tty)\n" \
-     "\nOptions:" \
-     "\n    -r  Reset output to /dev/console" \
-
-#define setenforce_trivial_usage \
-       "[Enforcing | Permissive | 1 | 0]"
-#define setenforce_full_usage ""
-
-#define setfiles_trivial_usage \
-       "[-dnpqsvW] [-e DIR]... [-o FILE] [-r alt_root_path]" \
-    IF_FEATURE_SETFILES_CHECK_OPTION( \
-       " [-c policyfile] spec_file" \
-    ) \
-       " pathname"
-#define setfiles_full_usage "\n\n" \
-       "Reset file contexts under pathname according to spec_file\n" \
-    IF_FEATURE_SETFILES_CHECK_OPTION( \
-     "\n    -c FILE Check the validity of the contexts against the specified binary policy" \
-    ) \
-     "\n    -d  Show which specification matched each file" \
-     "\n    -l  Log changes in file labels to syslog" \
-     "\n    -n  Don't change any file labels" \
-     "\n    -q  Suppress warnings" \
-     "\n    -r DIR  Use an alternate root path" \
-     "\n    -e DIR  Exclude DIR" \
-     "\n    -F  Force reset of context to match file_context for customizable files" \
-     "\n    -o FILE Save list of files with incorrect context" \
-     "\n    -s  Take a list of files from stdin (instead of command line)" \
-     "\n    -v  Show changes in file labels, if type or role are changing" \
-     "\n    -vv Show changes in file labels, if type, role, or user are changing" \
-     "\n    -W  Display warnings about entries that had no matching files" \
-
-#define setfont_trivial_usage \
-       "FONT [-m MAPFILE] [-C TTY]"
-#define setfont_full_usage "\n\n" \
-       "Load a console font\n" \
-     "\nOptions:" \
-     "\n    -m MAPFILE  Load console screen map" \
-     "\n    -C TTY      Affect TTY instead of /dev/tty" \
-
-#define setfont_example_usage \
-       "$ setfont -m koi8-r /etc/i18n/fontname\n"
-
-#define setkeycodes_trivial_usage \
-       "SCANCODE KEYCODE..."
-#define setkeycodes_full_usage "\n\n" \
-       "Set entries into the kernel's scancode-to-keycode map,\n" \
-       "allowing unusual keyboards to generate usable keycodes.\n\n" \
-       "SCANCODE may be either xx or e0xx (hexadecimal),\n" \
-       "and KEYCODE is given in decimal." \
-
-#define setkeycodes_example_usage \
-       "$ setkeycodes e030 127\n"
-
-#define setlogcons_trivial_usage \
-       "N"
-#define setlogcons_full_usage "\n\n" \
-       "Redirect the kernel output to console N (0 for current)"
-
-#define setsebool_trivial_usage \
-       "boolean value"
-
-#define setsebool_full_usage "\n\n" \
-       "Change boolean setting"
-
-#define setsid_trivial_usage \
-       "PROG ARGS"
-#define setsid_full_usage "\n\n" \
-       "Run PROG in a new session. PROG will have no controlling terminal\n" \
-       "and will not be affected by keyboard signals (Ctrl-C etc).\n" \
-       "See setsid(2) for details." \
-
-#define last_trivial_usage \
-       ""IF_FEATURE_LAST_FANCY("[-HW] [-f FILE]")
-#define last_full_usage "\n\n" \
-       "Show listing of the last users that logged into the system" \
-    IF_FEATURE_LAST_FANCY( "\n" \
-     "\nOptions:" \
-/*   "\n    -H  Show header line" */ \
-     "\n    -W  Display with no host column truncation" \
-     "\n    -f FILE Read from FILE instead of /var/log/wtmp" \
-    )
-
-#define showkey_trivial_usage \
-       "[-a | -k | -s]"
-#define showkey_full_usage "\n\n" \
-       "Show keys pressed\n" \
-     "\nOptions:" \
-     "\n    -a  Display decimal/octal/hex values of the keys" \
-     "\n    -k  Display interpreted keycodes (default)" \
-     "\n    -s  Display raw scan-codes" \
-
-#define slattach_trivial_usage \
-       "[-cehmLF] [-s SPEED] [-p PROTOCOL] DEVICE"
-#define slattach_full_usage "\n\n" \
-       "Attach network interface(s) to serial line(s)\n" \
-     "\nOptions:" \
-     "\n    -p PROT Set protocol (slip, cslip, slip6, clisp6 or adaptive)" \
-     "\n    -s SPD  Set line speed" \
-     "\n    -e  Exit after initializing device" \
-     "\n    -h  Exit when the carrier is lost" \
-     "\n    -c PROG Run PROG when the line is hung up" \
-     "\n    -m  Do NOT initialize the line in raw 8 bits mode" \
-     "\n    -L  Enable 3-wire operation" \
-     "\n    -F  Disable RTS/CTS flow control" \
-
-#define sleep_trivial_usage \
-    IF_FEATURE_FANCY_SLEEP("[") "N" IF_FEATURE_FANCY_SLEEP("]...")
-#define sleep_full_usage "\n\n" \
-    IF_NOT_FEATURE_FANCY_SLEEP("Pause for N seconds") \
-    IF_FEATURE_FANCY_SLEEP( \
-       "Pause for a time equal to the total of the args given, where each arg can\n" \
-       "have an optional suffix of (s)econds, (m)inutes, (h)ours, or (d)ays")
-#define sleep_example_usage \
-       "$ sleep 2\n" \
-       "[2 second delay results]\n" \
-    IF_FEATURE_FANCY_SLEEP( \
-       "$ sleep 1d 3h 22m 8s\n" \
-       "[98528 second delay results]\n")
-
-#define sort_trivial_usage \
-       "[-nru" \
-    IF_FEATURE_SORT_BIG("gMcszbdfimSTokt] [-o FILE] [-k start[.offset][opts][,end[.offset][opts]] [-t CHAR") \
-       "] [FILE]..."
-#define sort_full_usage "\n\n" \
-       "Sort lines of text\n" \
-     "\nOptions:" \
-    IF_FEATURE_SORT_BIG( \
-     "\n    -b  Ignore leading blanks" \
-     "\n    -c  Check whether input is sorted" \
-     "\n    -d  Dictionary order (blank or alphanumeric only)" \
-     "\n    -f  Ignore case" \
-     "\n    -g  General numerical sort" \
-     "\n    -i  Ignore unprintable characters" \
-     "\n    -k  Sort key" \
-     "\n    -M  Sort month" \
-    ) \
-     "\n    -n  Sort numbers" \
-    IF_FEATURE_SORT_BIG( \
-     "\n    -o  Output to file" \
-     "\n    -k  Sort by key" \
-     "\n    -t CHAR Key separator" \
-    ) \
-     "\n    -r  Reverse sort order" \
-    IF_FEATURE_SORT_BIG( \
-     "\n    -s  Stable (don't sort ties alphabetically)" \
-    ) \
-     "\n    -u  Suppress duplicate lines" \
-    IF_FEATURE_SORT_BIG( \
-     "\n    -z  Lines are terminated by NUL, not newline" \
-     "\n    -mST    Ignored for GNU compatibility") \
-
-#define sort_example_usage \
-       "$ echo -e \"e\\nf\\nb\\nd\\nc\\na\" | sort\n" \
-       "a\n" \
-       "b\n" \
-       "c\n" \
-       "d\n" \
-       "e\n" \
-       "f\n" \
-    IF_FEATURE_SORT_BIG( \
-        "$ echo -e \"c 3\\nb 2\\nd 2\" | $SORT -k 2,2n -k 1,1r\n" \
-        "d 2\n" \
-        "b 2\n" \
-        "c 3\n" \
-    ) \
-       ""
-
-#define split_trivial_usage \
-       "[OPTIONS] [INPUT [PREFIX]]"
-#define split_full_usage "\n\n" \
-       "Options:" \
-     "\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" \
-       "$ cat TODO | split -a 2 -l 2 TODO_\n"
-
-#define start_stop_daemon_trivial_usage \
-       "[OPTIONS] [-S|-K] ... [-- ARGS...]"
-#define start_stop_daemon_full_usage "\n\n" \
-       "Search for matching processes, and then\n" \
-       "-K: stop all matching processes.\n" \
-       "-S: start a process unless a matching process is found.\n" \
-    IF_FEATURE_START_STOP_DAEMON_LONG_OPTIONS( \
-     "\nProcess matching:" \
-     "\n    -u,--user USERNAME|UID  Match only this user's processes" \
-     "\n    -n,--name NAME      Match processes with NAME" \
-     "\n                in comm field in /proc/PID/stat" \
-     "\n    -x,--exec EXECUTABLE    Match processes with this command" \
-     "\n                in /proc/PID/cmdline" \
-     "\n    -p,--pidfile FILE   Match a process with PID from the file" \
-     "\n    All specified conditions must match" \
-     "\n-S only:" \
-     "\n    -x,--exec EXECUTABLE    Program to run" \
-     "\n    -a,--startas NAME   Zeroth argument" \
-     "\n    -b,--background     Background" \
-    IF_FEATURE_START_STOP_DAEMON_FANCY( \
-     "\n    -N,--nicelevel N    Change nice level" \
-    ) \
-     "\n    -c,--chuid USER[:[GRP]] Change to user/group" \
-     "\n    -m,--make-pidfile   Write PID to the pidfile specified by -p" \
-     "\n-K only:" \
-     "\n    -s,--signal SIG     Signal to send" \
-     "\n    -t,--test       Match only, exit with 0 if a process is found" \
-     "\nOther:" \
-    IF_FEATURE_START_STOP_DAEMON_FANCY( \
-     "\n    -o,--oknodo     Exit with status 0 if nothing is done" \
-     "\n    -v,--verbose        Verbose" \
-    ) \
-     "\n    -q,--quiet      Quiet" \
-    ) \
-    IF_NOT_FEATURE_START_STOP_DAEMON_LONG_OPTIONS( \
-     "\nProcess matching:" \
-     "\n    -u USERNAME|UID Match only this user's processes" \
-     "\n    -n NAME     Match processes with NAME" \
-     "\n            in comm field in /proc/PID/stat" \
-     "\n    -x EXECUTABLE   Match processes with this command" \
-     "\n            command in /proc/PID/cmdline" \
-     "\n    -p FILE     Match a process with PID from the file" \
-     "\n    All specified conditions must match" \
-     "\n-S only:" \
-     "\n    -x EXECUTABLE   Program to run" \
-     "\n    -a NAME     Zeroth argument" \
-     "\n    -b      Background" \
-    IF_FEATURE_START_STOP_DAEMON_FANCY( \
-     "\n    -N N        Change nice level" \
-    ) \
-     "\n    -c USER[:[GRP]] Change to user/group" \
-     "\n    -m      Write PID to the pidfile specified by -p" \
-     "\n-K only:" \
-     "\n    -s SIG      Signal to send" \
-     "\n    -t      Match only, exit with 0 if a process is found" \
-     "\nOther:" \
-    IF_FEATURE_START_STOP_DAEMON_FANCY( \
-     "\n    -o      Exit with status 0 if nothing is done" \
-     "\n    -v      Verbose" \
-    ) \
-     "\n    -q      Quiet" \
-    ) \
-
-#define stat_trivial_usage \
-       "[OPTIONS] FILE..."
-#define stat_full_usage "\n\n" \
-       "Display file (default) or filesystem status\n" \
-     "\nOptions:" \
-    IF_FEATURE_STAT_FORMAT( \
-     "\n    -c fmt  Use the specified format" \
-    ) \
-     "\n    -f  Display filesystem status" \
-     "\n    -L  Follow links" \
-     "\n    -t  Display info in terse form" \
-    IF_SELINUX( \
-     "\n    -Z  Print security context" \
-    ) \
-    IF_FEATURE_STAT_FORMAT( \
-       "\n\nValid format sequences for files:\n" \
-       " %a Access rights in octal\n" \
-       " %A Access rights in human readable form\n" \
-       " %b Number of blocks allocated (see %B)\n" \
-       " %B The size in bytes of each block reported by %b\n" \
-       " %d Device number in decimal\n" \
-       " %D Device number in hex\n" \
-       " %f Raw mode in hex\n" \
-       " %F File type\n" \
-       " %g Group ID of owner\n" \
-       " %G Group name of owner\n" \
-       " %h Number of hard links\n" \
-       " %i Inode number\n" \
-       " %n File name\n" \
-       " %N File name, with -> TARGET if symlink\n" \
-       " %o I/O block size\n" \
-       " %s Total size, in bytes\n" \
-       " %t Major device type in hex\n" \
-       " %T Minor device type in hex\n" \
-       " %u User ID of owner\n" \
-       " %U User name of owner\n" \
-       " %x Time of last access\n" \
-       " %X Time of last access as seconds since Epoch\n" \
-       " %y Time of last modification\n" \
-       " %Y Time of last modification as seconds since Epoch\n" \
-       " %z Time of last change\n" \
-       " %Z Time of last change as seconds since Epoch\n" \
-       "\nValid format sequences for file systems:\n" \
-       " %a Free blocks available to non-superuser\n" \
-       " %b Total data blocks in file system\n" \
-       " %c Total file nodes in file system\n" \
-       " %d Free file nodes in file system\n" \
-       " %f Free blocks in file system\n" \
-    IF_SELINUX( \
-       " %C Security context in selinux\n" \
-    ) \
-       " %i File System ID in hex\n" \
-       " %l Maximum length of filenames\n" \
-       " %n File name\n" \
-       " %s Block size (for faster transfer)\n" \
-       " %S Fundamental block size (for block counts)\n" \
-       " %t Type in hex\n" \
-       " %T Type in human readable form" \
-    ) \
-
-#define strings_trivial_usage \
-       "[-afo] [-n LEN] [FILE]..."
-#define strings_full_usage "\n\n" \
-       "Display printable strings in a binary file\n" \
-     "\nOptions:" \
-     "\n    -a  Scan whole file (default)" \
-     "\n    -f  Precede strings with filenames" \
-     "\n    -n LEN  At least LEN characters form a string (default 4)" \
-     "\n    -o  Precede strings with decimal offsets" \
-
-#define stty_trivial_usage \
-       "[-a|g] [-F DEVICE] [SETTING]..."
-#define stty_full_usage "\n\n" \
-       "Without arguments, prints baud rate, line discipline,\n" \
-       "and deviations from stty sane\n" \
-     "\nOptions:" \
-     "\n    -F DEVICE   Open device instead of stdin" \
-     "\n    -a      Print all current settings in human-readable form" \
-     "\n    -g      Print in stty-readable form" \
-     "\n    [SETTING]   See manpage" \
-
-#define su_trivial_usage \
-       "[OPTIONS] [-] [USERNAME]"
-#define su_full_usage "\n\n" \
-       "Change user id or become root\n" \
-     "\nOptions:" \
-     "\n    -p,-m   Preserve environment" \
-     "\n    -c CMD  Command to pass to 'sh -c'" \
-     "\n    -s SH   Shell to use instead of default shell" \
-
-#define sulogin_trivial_usage \
-       "[-t N] [TTY]"
-#define sulogin_full_usage "\n\n" \
-       "Single user login\n" \
-     "\nOptions:" \
-     "\n    -t N    Timeout" \
-
-#define sum_trivial_usage \
-       "[-rs] [FILE]..."
-#define sum_full_usage "\n\n" \
-       "Checksum and count the blocks in a file\n" \
-     "\nOptions:" \
-     "\n    -r  Use BSD sum algorithm (1K blocks)" \
-     "\n    -s  Use System V sum algorithm (512byte blocks)" \
-
-#define sv_trivial_usage \
-       "[-v] [-w SEC] CMD SERVICE_DIR..."
-#define sv_full_usage "\n\n" \
-       "Control services monitored by runsv supervisor.\n" \
-       "Commands (only first character is enough):\n" \
-       "\n" \
-       "status: query service status\n" \
-       "up: if service isn't running, start it. If service stops, restart it\n" \
-       "once: like 'up', but if service stops, don't restart it\n" \
-       "down: send TERM and CONT signals. If ./run exits, start ./finish\n" \
-       "    if it exists. After it stops, don't restart service\n" \
-       "exit: send TERM and CONT signals to service and log service. If they exit,\n" \
-       "    runsv exits too\n" \
-       "pause, cont, hup, alarm, interrupt, quit, 1, 2, term, kill: send\n" \
-       "STOP, CONT, HUP, ALRM, INT, QUIT, USR1, USR2, TERM, KILL signal to service" \
-
-#define svlogd_trivial_usage \
-       "[-ttv] [-r C] [-R CHARS] [-l MATCHLEN] [-b BUFLEN] DIR..."
-#define svlogd_full_usage "\n\n" \
-       "Continuously read log data from stdin, optionally\n" \
-       "filter log messages, and write the data to one or more automatically\n" \
-       "rotated logs" \
-
-#define swapoff_trivial_usage \
-       "[-a] [DEVICE]"
-#define swapoff_full_usage "\n\n" \
-       "Stop swapping on DEVICE\n" \
-     "\nOptions:" \
-     "\n    -a  Stop swapping on all swap devices" \
-
-#define swapon_trivial_usage \
-       "[-a]" IF_FEATURE_SWAPON_PRI(" [-p PRI]") " [DEVICE]"
-#define swapon_full_usage "\n\n" \
-       "Start swapping on DEVICE\n" \
-     "\nOptions:" \
-     "\n    -a  Start swapping on all swap devices" \
-    IF_FEATURE_SWAPON_PRI( \
-     "\n    -p PRI  Set swap device priority" \
-    ) \
-
-#define switch_root_trivial_usage \
-       "[-c /dev/console] NEW_ROOT NEW_INIT [ARGS]"
-#define switch_root_full_usage "\n\n" \
-       "Free initramfs and switch to another root fs:\n" \
-       "chroot to NEW_ROOT, delete all in /, move NEW_ROOT to /,\n" \
-       "execute NEW_INIT. PID must be 1. NEW_ROOT must be a mountpoint.\n" \
-     "\nOptions:" \
-     "\n    -c DEV  Reopen stdio to DEV after switch" \
-
-#define sync_trivial_usage \
-       ""
-#define sync_full_usage "\n\n" \
-       "Write all buffered blocks to disk"
-
-#define fsync_trivial_usage \
-       "[-d] FILE..."
-#define fsync_full_usage "\n\n" \
-       "Write files' buffered blocks to disk\n" \
-     "\nOptions:" \
-     "\n    -d  Avoid syncing metadata"
-
-#define sysctl_trivial_usage \
-       "[OPTIONS] [VALUE]..."
-#define sysctl_full_usage "\n\n" \
-       "Configure kernel parameters at runtime\n" \
-     "\nOptions:" \
-     "\n    -n  Don't print key names" \
-     "\n    -e  Don't warn about unknown keys" \
-     "\n    -w  Change sysctl setting" \
-     "\n    -p FILE Load sysctl settings from FILE (default /etc/sysctl.conf)" \
-     "\n    -a  Display all values" \
-     "\n    -A  Display all values in table form" \
-
-#define sysctl_example_usage \
-       "sysctl [-n] [-e] variable...\n" \
-       "sysctl [-n] [-e] -w variable=value...\n" \
-       "sysctl [-n] [-e] -a\n" \
-       "sysctl [-n] [-e] -p file    (default /etc/sysctl.conf)\n" \
-       "sysctl [-n] [-e] -A\n"
-
-#define syslogd_trivial_usage \
-       "[OPTIONS]"
-#define syslogd_full_usage "\n\n" \
-       "System logging utility.\n" \
-       "This version of syslogd ignores /etc/syslog.conf\n" \
-     "\nOptions:" \
-     "\n    -n      Run in foreground" \
-     "\n    -O FILE     Log to given file (default:/var/log/messages)" \
-     "\n    -l N        Set local log level" \
-     "\n    -S      Smaller logging output" \
-    IF_FEATURE_ROTATE_LOGFILE( \
-     "\n    -s SIZE     Max size (KB) before rotate (default:200KB, 0=off)" \
-     "\n    -b N        N rotated logs to keep (default:1, max=99, 0=purge)") \
-    IF_FEATURE_REMOTE_LOG( \
-     "\n    -R HOST[:PORT]  Log to IP or hostname on PORT (default PORT=514/UDP)" \
-     "\n    -L      Log locally and via network (default is network only if -R)") \
-    IF_FEATURE_SYSLOGD_DUP( \
-     "\n    -D      Drop duplicates") \
-    IF_FEATURE_IPC_SYSLOG( \
-     "\n    -C[size(KiB)]   Log to shared mem buffer (read it using logread)") \
-    /* NB: -Csize shouldn't have space (because size is optional) */
-/*   "\n    -m MIN      Minutes between MARK lines (default:20, 0=off)" */
-
-#define syslogd_example_usage \
-       "$ syslogd -R masterlog:514\n" \
-       "$ syslogd -R 192.168.1.1:601\n"
-
-#define tac_trivial_usage \
-    "[FILE]..."
-#define tac_full_usage "\n\n" \
-    "Concatenate FILEs and print them in reverse"
-
-#define taskset_trivial_usage \
-       "[-p] [MASK] [PID | PROG ARGS]"
-#define taskset_full_usage "\n\n" \
-       "Set or get CPU affinity\n" \
-     "\nOptions:" \
-     "\n    -p  Operate on an existing PID" \
-
-#define taskset_example_usage \
-       "$ taskset 0x7 ./dgemm_test&\n" \
-       "$ taskset -p 0x1 $!\n" \
-       "pid 4790's current affinity mask: 7\n" \
-       "pid 4790's new affinity mask: 1\n" \
-       "$ taskset 0x7 /bin/sh -c './taskset -p 0x1 $$'\n" \
-       "pid 6671's current affinity mask: 1\n" \
-       "pid 6671's new affinity mask: 1\n" \
-       "$ taskset -p 1\n" \
-       "pid 1's current affinity mask: 3\n"
-
-#define tee_trivial_usage \
-       "[-ai] [FILE]..."
-#define tee_full_usage "\n\n" \
-       "Copy stdin to each FILE, and also to stdout\n" \
-     "\nOptions:" \
-     "\n    -a  Append to the given FILEs, don't overwrite" \
-     "\n    -i  Ignore interrupt signals (SIGINT)" \
-
-#define tee_example_usage \
-       "$ echo \"Hello\" | tee /tmp/foo\n" \
-       "$ cat /tmp/foo\n" \
-       "Hello\n"
-
-#if ENABLE_FEATURE_TELNET_AUTOLOGIN
-#define telnet_trivial_usage \
-       "[-a] [-l USER] HOST [PORT]"
-#define telnet_full_usage "\n\n" \
-       "Connect to telnet server\n" \
-     "\nOptions:" \
-     "\n    -a  Automatic login with $USER variable" \
-     "\n    -l USER Automatic login as USER" \
-
-#else
-#define telnet_trivial_usage \
-       "HOST [PORT]"
-#define telnet_full_usage "\n\n" \
-       "Connect to telnet server"
-#endif
-
-#define telnetd_trivial_usage \
-       "[OPTIONS]"
-#define telnetd_full_usage "\n\n" \
-       "Handle incoming telnet connections" \
-    IF_NOT_FEATURE_TELNETD_STANDALONE(" via inetd") "\n" \
-     "\nOptions:" \
-     "\n    -l LOGIN    Exec LOGIN on connect" \
-     "\n    -f ISSUE_FILE   Display ISSUE_FILE instead of /etc/issue" \
-     "\n    -K      Close connection as soon as login exits" \
-     "\n            (normally wait until all programs close slave pty)" \
-    IF_FEATURE_TELNETD_STANDALONE( \
-     "\n    -p PORT     Port to listen on" \
-     "\n    -b ADDR[:PORT]  Address to bind to" \
-     "\n    -F      Run in foreground" \
-     "\n    -i      Inetd mode" \
-    IF_FEATURE_TELNETD_INETD_WAIT( \
-     "\n    -w SEC      Inetd 'wait' mode, linger time SEC" \
-     "\n    -S      Log to syslog (implied by -i or without -F and -w)" \
-    ) \
-    )
-
-/* "test --help" does not print help (POSIX compat), only "[ --help" does.
- * We display "<applet> EXPRESSION ]" here (not "<applet> EXPRESSION")
- * Unfortunately, it screws up generated BusyBox.html. TODO. */
-#define test_trivial_usage \
-       "EXPRESSION ]"
-#define test_full_usage "\n\n" \
-       "Check file types, compare values etc. Return a 0/1 exit code\n" \
-       "depending on logical value of EXPRESSION"
-#define test_example_usage \
-       "$ test 1 -eq 2\n" \
-       "$ echo $?\n" \
-       "1\n" \
-       "$ test 1 -eq 1\n" \
-       "$ echo $?\n" \
-       "0\n" \
-       "$ [ -d /etc ]\n" \
-       "$ echo $?\n" \
-       "0\n" \
-       "$ [ -d /junk ]\n" \
-       "$ echo $?\n" \
-       "1\n"
-
-#define tc_trivial_usage \
-    /*"[OPTIONS] "*/"OBJECT CMD [dev STRING]"
-#define tc_full_usage "\n\n" \
-    "OBJECT: {qdisc|class|filter}\n" \
-    "CMD: {add|del|change|replace|show}\n" \
-    "\n" \
-    "qdisc [ handle QHANDLE ] [ root |"IF_FEATURE_TC_INGRESS(" ingress |")" parent CLASSID ]\n" \
-    /* "[ estimator INTERVAL TIME_CONSTANT ]\n" */ \
-    "   [ [ QDISC_KIND ] [ help | OPTIONS ] ]\n" \
-    "   QDISC_KIND := { [p|b]fifo | tbf | prio | cbq | red | etc. }\n" \
-    "qdisc show [ dev STRING ]"IF_FEATURE_TC_INGRESS(" [ingress]")"\n" \
-    "class [ classid CLASSID ] [ root | parent CLASSID ]\n" \
-    "   [ [ QDISC_KIND ] [ help | OPTIONS ] ]\n" \
-    "class show [ dev STRING ] [ root | parent CLASSID ]\n" \
-    "filter [ pref PRIO ] [ protocol PROTO ]\n" \
-    /* "\t[ estimator INTERVAL TIME_CONSTANT ]\n" */ \
-    "   [ root | classid CLASSID ] [ handle FILTERID ]\n" \
-    "   [ [ FILTER_TYPE ] [ help | OPTIONS ] ]\n" \
-    "filter show [ dev STRING ] [ root | parent CLASSID ]"
-
-#define tcpsvd_trivial_usage \
-       "[-hEv] [-c N] [-C N[:MSG]] [-b N] [-u USER] [-l NAME] IP PORT PROG"
-/* with not-implemented options: */
-/*     "[-hpEvv] [-c N] [-C N[:MSG]] [-b N] [-u USER] [-l NAME] [-i DIR|-x CDB] [-t SEC] IP PORT PROG" */
-#define tcpsvd_full_usage "\n\n" \
-       "Create TCP socket, bind to IP:PORT and listen\n" \
-       "for incoming connection. Run PROG for each connection.\n" \
-     "\n    IP      IP to listen on. '0' = all" \
-     "\n    PORT        Port to listen on" \
-     "\n    PROG ARGS   Program to run" \
-     "\n    -l NAME     Local hostname (else looks up local hostname in DNS)" \
-     "\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            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" \
-     "\n    -E      Don't set up environment variables" \
-     "\n    -v      Verbose" \
-
-#define udpsvd_trivial_usage \
-       "[-hEv] [-c N] [-u USER] [-l NAME] IP PORT PROG"
-#define udpsvd_full_usage "\n\n" \
-       "Create UDP socket, bind to IP:PORT and wait\n" \
-       "for incoming packets. Run PROG for each packet,\n" \
-       "redirecting all further packets with same peer ip:port to it.\n" \
-     "\n    IP      IP to listen on. '0' = all" \
-     "\n    PORT        Port to listen on" \
-     "\n    PROG ARGS   Program to run" \
-     "\n    -l NAME     Local hostname (else looks up local hostname in DNS)" \
-     "\n    -u USER[:GRP]   Change to user/group after bind" \
-     "\n    -c N        Handle up to N connections simultaneously" \
-     "\n    -h      Look up peer's hostname" \
-     "\n    -E      Don't set up environment variables" \
-     "\n    -v      Verbose" \
-
-#define tftp_trivial_usage \
-       "[OPTIONS] HOST [PORT]"
-#define tftp_full_usage "\n\n" \
-       "Transfer a file from/to tftp server\n" \
-     "\nOptions:" \
-     "\n    -l FILE Local FILE" \
-     "\n    -r FILE Remote FILE" \
-    IF_FEATURE_TFTP_GET( \
-     "\n    -g  Get file" \
-    ) \
-    IF_FEATURE_TFTP_PUT( \
-     "\n    -p  Put file" \
-    ) \
-    IF_FEATURE_TFTP_BLOCKSIZE( \
-     "\n    -b SIZE Transfer blocks of SIZE octets" \
-    )
-
-#define tftpd_trivial_usage \
-       "[-cr] [-u USER] [DIR]"
-#define tftpd_full_usage "\n\n" \
-       "Transfer a file on tftp client's request\n" \
-       "\n" \
-       "tftpd should be used as an inetd service.\n" \
-       "tftpd's line for inetd.conf:\n" \
-       "    69 dgram udp nowait root tftpd tftpd /files/to/serve\n" \
-       "It also can be ran from udpsvd:\n" \
-       "    udpsvd -vE 0.0.0.0 69 tftpd /files/to/serve\n" \
-     "\nOptions:" \
-     "\n    -r  Prohibit upload" \
-     "\n    -c  Allow file creation via upload" \
-     "\n    -u  Access files as USER" \
-
-#define time_trivial_usage \
-       "[-v] PROG ARGS"
-#define time_full_usage "\n\n" \
-       "Run PROG, display resource usage when it exits\n" \
-     "\nOptions:" \
-     "\n    -v  Verbose" \
-
-#define timeout_trivial_usage \
-       "[-t SECS] [-s SIG] PROG ARGS"
-#define timeout_full_usage "\n\n" \
-       "Runs PROG. Sends SIG to it if it is not gone in SECS seconds.\n" \
-       "Defaults: SECS: 10, SIG: TERM." \
-
-#define top_trivial_usage \
-       "[-b] [-nCOUNT] [-dSECONDS]" IF_FEATURE_TOPMEM(" [-m]")
-#define top_full_usage "\n\n" \
-       "Provide a view of process activity in real time.\n" \
-       "Read the status of all processes from /proc each SECONDS\n" \
-       "and display a screenful of them." \
-//TODO: add options and keyboard commands
-
-#define touch_trivial_usage \
-       "[-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" \
-       "/bin/ls: /tmp/foo: No such file or directory\n" \
-       "$ touch /tmp/foo\n" \
-       "$ ls -l /tmp/foo\n" \
-       "-rw-rw-r--    1 andersen andersen        0 Apr 15 01:11 /tmp/foo\n"
-
-#define tr_trivial_usage \
-       "[-cds] STRING1 [STRING2]"
-#define tr_full_usage "\n\n" \
-       "Translate, squeeze, or delete characters from stdin, writing to stdout\n" \
-     "\nOptions:" \
-     "\n    -c  Take complement of STRING1" \
-     "\n    -d  Delete input characters coded STRING1" \
-     "\n    -s  Squeeze multiple output characters of STRING2 into one character" \
-
-#define tr_example_usage \
-       "$ echo \"gdkkn vnqkc\" | tr [a-y] [b-z]\n" \
-       "hello world\n"
-
-#define traceroute_trivial_usage \
-       "[-"IF_TRACEROUTE6("46")"FIldnrv] [-f 1ST_TTL] [-m MAXTTL] [-p PORT] [-q PROBES]\n" \
-       "    [-s SRC_IP] [-t TOS] [-w WAIT_SEC] [-g GATEWAY] [-i IFACE]\n" \
-       "    [-z PAUSE_MSEC] HOST [BYTES]"
-#define traceroute_full_usage "\n\n" \
-       "Trace the route to HOST\n" \
-     "\nOptions:" \
-    IF_TRACEROUTE6( \
-     "\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" \
-     "\n    -l  Display the TTL value of the returned packet" \
-     "\n    -d  Set SO_DEBUG options to socket" \
-     "\n    -n  Print numeric addresses" \
-     "\n    -r  Bypass routing tables, send directly to HOST" \
-     "\n    -v  Verbose" \
-     "\n    -m  Max time-to-live (max number of hops)" \
-     "\n    -p  Base UDP port number used in probes" \
-     "\n        (default 33434)" \
-     "\n    -q  Number of probes per TTL (default 3)" \
-     "\n    -s  IP address to use as the source address" \
-     "\n    -t  Type-of-service in probe packets (default 0)" \
-     "\n    -w  Time in seconds to wait for a response (default 3)" \
-     "\n    -g  Loose source route gateway (8 max)" \
-
-#define traceroute6_trivial_usage \
-       "[-dnrv] [-m MAXTTL] [-p PORT] [-q PROBES]\n" \
-       "    [-s SRC_IP] [-t TOS] [-w WAIT_SEC] [-i IFACE]\n" \
-       "    HOST [BYTES]"
-#define traceroute6_full_usage "\n\n" \
-       "Trace the route to HOST\n" \
-     "\nOptions:" \
-     "\n    -d  Set SO_DEBUG options to socket" \
-     "\n    -n  Print numeric addresses" \
-     "\n    -r  Bypass routing tables, send directly to HOST" \
-     "\n    -v  Verbose" \
-     "\n    -m  Max time-to-live (max number of hops)" \
-     "\n    -p  Base UDP port number used in probes" \
-     "\n        (default is 33434)" \
-     "\n    -q  Number of probes per TTL (default 3)" \
-     "\n    -s  IP address to use as the source address" \
-     "\n    -t  Type-of-service in probe packets (default 0)" \
-     "\n    -w  Time in seconds to wait for a response (default 3)" \
-
-#define true_trivial_usage \
-       ""
-#define true_full_usage "\n\n" \
-       "Return an exit code of TRUE (0)"
-#define true_example_usage \
-       "$ true\n" \
-       "$ echo $?\n" \
-       "0\n"
-
-#define tty_trivial_usage \
-       ""
-#define tty_full_usage "\n\n" \
-       "Print file name of stdin's terminal" \
-    IF_INCLUDE_SUSv2( "\n" \
-     "\nOptions:" \
-     "\n    -s  Print nothing, only return exit status" \
-    )
-#define tty_example_usage \
-       "$ tty\n" \
-       "/dev/tty2\n"
-
-#define ttysize_trivial_usage \
-       "[w] [h]"
-#define ttysize_full_usage "\n\n" \
-       "Print dimension(s) of stdin's terminal, on error return 80x25"
-
-#define tunctl_trivial_usage \
-       "[-f device] ([-t name] | -d name)" IF_FEATURE_TUNCTL_UG(" [-u owner] [-g group] [-b]")
-#define tunctl_full_usage "\n\n" \
-       "Create or delete tun interfaces\n" \
-     "\nOptions:" \
-     "\n    -f name     tun device (/dev/net/tun)" \
-     "\n    -t name     Create iface 'name'" \
-     "\n    -d name     Delete iface 'name'" \
-    IF_FEATURE_TUNCTL_UG( \
-     "\n    -u owner    Set iface owner" \
-     "\n    -g group    Set iface group" \
-     "\n    -b      Brief output" \
-    )
-#define tunctl_example_usage \
-       "# tunctl\n" \
-       "# tunctl -d tun0\n"
-
-#define udhcpd_trivial_usage \
-       "[-fS]" IF_FEATURE_UDHCP_PORT(" [-P N]") " [CONFFILE]" \
-
-#define udhcpd_full_usage "\n\n" \
-       "DHCP server\n" \
-     "\n    -f  Run in foreground" \
-     "\n    -S  Log to syslog too" \
-    IF_FEATURE_UDHCP_PORT( \
-     "\n    -P N    Use port N (default 67)" \
-    )
-
-#define umount_trivial_usage \
-       "[OPTIONS] FILESYSTEM|DIRECTORY"
-#define umount_full_usage "\n\n" \
-       "Unmount file systems\n" \
-     "\nOptions:" \
-    IF_FEATURE_UMOUNT_ALL( \
-     "\n    -a  Unmount all file systems" IF_FEATURE_MTAB_SUPPORT(" in /etc/mtab") \
-    ) \
-    IF_FEATURE_MTAB_SUPPORT( \
-     "\n    -n  Don't erase /etc/mtab entries" \
-    ) \
-     "\n    -r  Try to remount devices as read-only if mount is busy" \
-     "\n    -l  Lazy umount (detach filesystem)" \
-     "\n    -f  Force umount (i.e., unreachable NFS server)" \
-    IF_FEATURE_MOUNT_LOOP( \
-     "\n    -d  Free loop device if it has been used" \
-    )
-
-#define umount_example_usage \
-       "$ umount /dev/hdc1\n"
-
-#define uname_trivial_usage \
-       "[-amnrspv]"
-#define uname_full_usage "\n\n" \
-       "Print system information\n" \
-     "\nOptions:" \
-     "\n    -a  Print all" \
-     "\n    -m  The machine (hardware) type" \
-     "\n    -n  Hostname" \
-     "\n    -r  OS release" \
-     "\n    -s  OS name (default)" \
-     "\n    -p  Processor type" \
-     "\n    -v  OS version" \
-
-#define uname_example_usage \
-       "$ uname -a\n" \
-       "Linux debian 2.4.23 #2 Tue Dec 23 17:09:10 MST 2003 i686 GNU/Linux\n"
-
-#define uncompress_trivial_usage \
-       "[-cf] [FILE]..."
-#define uncompress_full_usage "\n\n" \
-       "Decompress .Z file[s]\n" \
-     "\nOptions:" \
-     "\n    -c  Write to stdout" \
-     "\n    -f  Overwrite" \
-
-#define unexpand_trivial_usage \
-       "[-fa][-t N] [FILE]..."
-#define unexpand_full_usage "\n\n" \
-       "Convert spaces to tabs, writing to stdout\n" \
-     "\nOptions:" \
-    IF_FEATURE_UNEXPAND_LONG_OPTIONS( \
-     "\n    -a,--all    Convert all blanks" \
-     "\n    -f,--first-only Convert only leading blanks" \
-     "\n    -t,--tabs=N Tabstops every N chars" \
-    ) \
-    IF_NOT_FEATURE_UNEXPAND_LONG_OPTIONS( \
-     "\n    -a  Convert all blanks" \
-     "\n    -f  Convert only leading blanks" \
-     "\n    -t N    Tabstops every N chars" \
-    )
-
-#define uniq_trivial_usage \
-       "[-cdu][-f,s,w N] [INPUT [OUTPUT]]"
-#define uniq_full_usage "\n\n" \
-       "Discard duplicate lines\n" \
-     "\nOptions:" \
-     "\n    -c  Prefix lines by the number of occurrences" \
-     "\n    -d  Only print duplicate lines" \
-     "\n    -u  Only print unique lines" \
-     "\n    -f N    Skip first N fields" \
-     "\n    -s N    Skip first N chars (after any skipped fields)" \
-     "\n    -w N    Compare N characters in line" \
-
-#define uniq_example_usage \
-       "$ echo -e \"a\\na\\nb\\nc\\nc\\na\" | sort | uniq\n" \
-       "a\n" \
-       "b\n" \
-       "c\n"
-
-#define unzip_trivial_usage \
-       "[-opts[modifiers]] FILE[.zip] [LIST] [-x XLIST] [-d DIR]"
-#define unzip_full_usage "\n\n" \
-       "Extract files from ZIP archives\n" \
-     "\nOptions:" \
-     "\n    -l  List archive contents (with -q for short form)" \
-     "\n    -n  Never overwrite files (default)" \
-     "\n    -o  Overwrite" \
-     "\n    -p  Send output to stdout" \
-     "\n    -q  Quiet" \
-     "\n    -x XLST Exclude these files" \
-     "\n    -d DIR  Extract files into DIR" \
-
-#define uptime_trivial_usage \
-       ""
-#define uptime_full_usage "\n\n" \
-       "Display the time since the last boot"
-
-#define uptime_example_usage \
-       "$ uptime\n" \
-       "  1:55pm  up  2:30, load average: 0.09, 0.04, 0.00\n"
-
-#define usleep_trivial_usage \
-       "N"
-#define usleep_full_usage "\n\n" \
-       "Pause for N microseconds"
-
-#define usleep_example_usage \
-       "$ usleep 1000000\n" \
-       "[pauses for 1 second]\n"
-
-#define uudecode_trivial_usage \
-       "[-o OUTFILE] [INFILE]"
-#define uudecode_full_usage "\n\n" \
-       "Uudecode a file\n" \
-       "Finds outfile name in uuencoded source unless -o is given"
-
-#define uudecode_example_usage \
-       "$ uudecode -o busybox busybox.uu\n" \
-       "$ ls -l busybox\n" \
-       "-rwxr-xr-x   1 ams      ams        245264 Jun  7 21:35 busybox\n"
-
-#define uuencode_trivial_usage \
-       "[-m] [INFILE] STORED_FILENAME"
-#define uuencode_full_usage "\n\n" \
-       "Uuencode a file to stdout\n" \
-     "\nOptions:" \
-     "\n    -m  Use base64 encoding per RFC1521" \
-
-#define uuencode_example_usage \
-       "$ uuencode busybox busybox\n" \
-       "begin 755 busybox\n" \
-       "<encoded file snipped>\n" \
-       "$ uudecode busybox busybox > busybox.uu\n" \
-       "$\n"
-
-#define vconfig_trivial_usage \
-       "COMMAND [OPTIONS]"
-#define vconfig_full_usage "\n\n" \
-       "Create and remove virtual ethernet devices\n" \
-     "\nOptions:" \
-     "\n    add     [interface-name] [vlan_id]" \
-     "\n    rem     [vlan-name]" \
-     "\n    set_flag    [interface-name] [flag-num] [0 | 1]" \
-     "\n    set_egress_map  [vlan-name] [skb_priority] [vlan_qos]" \
-     "\n    set_ingress_map [vlan-name] [skb_priority] [vlan_qos]" \
-     "\n    set_name_type   [name-type]" \
-
-#define vi_trivial_usage \
-       "[OPTIONS] [FILE]..."
-#define vi_full_usage "\n\n" \
-       "Edit FILE\n" \
-     "\nOptions:" \
-    IF_FEATURE_VI_COLON( \
-     "\n    -c  Initial command to run ($EXINIT also available)" \
-    ) \
-    IF_FEATURE_VI_READONLY( \
-     "\n    -R  Read-only" \
-    ) \
-     "\n    -H  Short help regarding available features" \
-
-#define vlock_trivial_usage \
-       "[-a]"
-#define vlock_full_usage "\n\n" \
-       "Lock a virtual terminal. A password is required to unlock.\n" \
-     "\nOptions:" \
-     "\n    -a  Lock all VTs" \
-
-#define volname_trivial_usage \
-       "[DEVICE]"
-#define volname_full_usage "\n\n" \
-       "Show CD volume name of the DEVICE (default /dev/cdrom)"
-
-#define wall_trivial_usage \
-    "[FILE]"
-#define wall_full_usage "\n\n" \
-    "Write content of FILE or stdin to all logged-in users"
-#define wall_sample_usage \
-    "echo foo | wall\n" \
-    "wall ./mymessage"
-
-#define watch_trivial_usage \
-       "[-n SEC] [-t] PROG ARGS"
-#define watch_full_usage "\n\n" \
-       "Run PROG periodically\n" \
-     "\nOptions:" \
-     "\n    -n  Loop period in seconds (default 2)" \
-     "\n    -t  Don't print header" \
-
-#define watch_example_usage \
-       "$ watch date\n" \
-       "Mon Dec 17 10:31:40 GMT 2000\n" \
-       "Mon Dec 17 10:31:42 GMT 2000\n" \
-       "Mon Dec 17 10:31:44 GMT 2000"
-
-#define watchdog_trivial_usage \
-       "[-t N[ms]] [-T N[ms]] [-F] DEV"
-#define watchdog_full_usage "\n\n" \
-       "Periodically write to watchdog device DEV\n" \
-     "\nOptions:" \
-     "\n    -T N    Reboot after N seconds if not reset (default 60)" \
-     "\n    -t N    Reset every N seconds (default 30)" \
-     "\n    -F  Run in foreground" \
-     "\n" \
-     "\nUse 500ms to specify period in milliseconds" \
-
-#define wget_trivial_usage \
-    IF_FEATURE_WGET_LONG_OPTIONS( \
-       "[-c|--continue] [-s|--spider] [-q|--quiet] [-O|--output-document FILE]\n" \
-       "    [--header 'header: value'] [-Y|--proxy on/off] [-P DIR]\n" \
-       "    [--no-check-certificate] [-U|--user-agent AGENT]" \
-            IF_FEATURE_WGET_TIMEOUT("[-T SEC] ") " URL" \
-    ) \
-    IF_NOT_FEATURE_WGET_LONG_OPTIONS( \
-       "[-csq] [-O FILE] [-Y on/off] [-P DIR] [-U AGENT]" \
-            IF_FEATURE_WGET_TIMEOUT("[-T SEC] ") " URL" \
-    )
-#define wget_full_usage "\n\n" \
-       "Retrieve files via HTTP or FTP\n" \
-     "\nOptions:" \
-     "\n    -s  Spider mode - only check file existence" \
-     "\n    -c  Continue retrieval of aborted transfer" \
-     "\n    -q  Quiet" \
-     "\n    -P DIR  Save to DIR (default .)" \
-    IF_FEATURE_WGET_TIMEOUT( \
-     "\n    -T SEC  Network read timeout is SEC seconds" \
-    ) \
-     "\n    -O FILE Save to FILE ('-' for stdout)" \
-     "\n    -U STR  Use STR for User-Agent header" \
-     "\n    -Y  Use proxy ('on' or 'off')" \
-
-#define which_trivial_usage \
-       "[COMMAND]..."
-#define which_full_usage "\n\n" \
-       "Locate a COMMAND"
-#define which_example_usage \
-       "$ which login\n" \
-       "/bin/login\n"
-
-#define who_trivial_usage \
-       "[-a]"
-#define who_full_usage "\n\n" \
-       "Show who is logged on\n" \
-     "\nOptions:" \
-     "\n    -a  Show all" \
-
-#define whoami_trivial_usage \
-       ""
-#define whoami_full_usage "\n\n" \
-       "Print the user name associated with the current effective user id"
-
-#define zcat_trivial_usage \
-       "FILE"
-#define zcat_full_usage "\n\n" \
-       "Decompress to stdout"
-
-#define zcip_trivial_usage \
-       "[OPTIONS] IFACE SCRIPT"
-#define zcip_full_usage "\n\n" \
-       "Manage a ZeroConf IPv4 link-local address\n" \
-     "\nOptions:" \
-     "\n    -f      Run in foreground" \
-     "\n    -q      Quit after obtaining address" \
-     "\n    -r 169.254.x.x  Request this address first" \
-     "\n    -v      Verbose" \
-     "\n" \
-     "\nWith no -q, runs continuously monitoring for ARP conflicts," \
-     "\nexits only on I/O errors (link down etc)" \
-
-
-#endif

branches/3.2/mindi-busybox/include/volume_id.h

@@ -21 +21 @@
 char *get_devname_from_label(const char *spec);
 char *get_devname_from_uuid(const char *spec);
-void display_uuid_cache(void);
+void display_uuid_cache(int scan_devices);
 
 /* Returns:
@@ -29 +29 @@
  */
 int resolve_mount_spec(char **fsname);
+int add_to_uuid_cache(const char *device);

branches/3.2/mindi-busybox/include/xatonum.h

@@ -169 +169 @@
     return BUG_bb_strtou32_unimplemented();
 }
+static ALWAYS_INLINE
+int32_t bb_strtoi32(const char *arg, char **endp, int base)
+{
+    if (sizeof(int32_t) == sizeof(int))
+        return bb_strtoi(arg, endp, base);
+    if (sizeof(int32_t) == sizeof(long))
+        return bb_strtol(arg, endp, base);
+    return BUG_bb_strtou32_unimplemented();
+}
 
 /* Floating point */