This patch, put together by Manuel Novoa III, is a merge of work
done by Evin Robertson (bug#1105) and work from Manuel to make
usage messages occupy less space and simplify how usage messages
are displayed.
diff --git a/applets.h b/applets.h
index 0b70a61..cb74456 100644
--- a/applets.h
+++ b/applets.h
@@ -10,403 +10,417 @@
* file result in the listing remaining in ascii order. You have been warned.
*/
+#undef APPLET
+#undef APPLET_ODDNAME
+#undef APPLET_NOUSAGE
+
#if defined(PROTOTYPES)
-#define APPLET(a,b,c,d) \
- extern int b(int argc, char **argv); \
- extern const char d[];
+#define APPLET(a,b,c) \
+ extern int b(int argc, char **argv);
+#define APPLET_ODDNAME(a,b,c,d,e) APPLET(a,b,c)
#define APPLET_NOUSAGE(a,b,c) \
extern int b(int argc, char **argv);
#elif defined(MAKE_LINKS)
-#define APPLET(a,b,c,d) LINK c a
-#define APPLET_NOUSAGE(a,b,c) LINK c a
+#define APPLET(a,b,c) LINK c #a
+#define APPLET_ODDNAME(a,b,c,d,e) LINK c a
+#define APPLET_NOUSAGE(a,b,c) LINK c #a
+#elif defined(APPLET_ENUM)
+#define APPLET(a,b,c) a##_applet_number,
+#define APPLET_ODDNAME(a,b,c,d,e) e##_applet_number,
+#define APPLET_NOUSAGE(a,b,c) a##applet_number,
#else
+#define USAGE_ENUM
+#include "usage.h"
const struct BB_applet applets[] = {
-#define APPLET(a,b,c,d) {a,b,c,d},
-#define APPLET_NOUSAGE(a,b,c) {a,b,c,NULL},
+#define APPLET(a,b,c) {#a,b,c,a##_usage_index},
+#define APPLET_ODDNAME(a,b,c,d,e) {a,b,c,d},
+#define APPLET_NOUSAGE(a,b,c) {#a,b,c,-1},
+#define zcat_usage_index gunzip_usage_index
+#define sh_usage_index shell_usage_index
#endif
#ifdef BB_TEST
- APPLET("[", test_main, _BB_DIR_USR_BIN, test_usage)
+ APPLET_ODDNAME("[", test_main, _BB_DIR_USR_BIN, test_usage_index, open_bracket)
#endif
#ifdef BB_AR
- APPLET("ar", ar_main, _BB_DIR_USR_BIN, ar_usage)
+ APPLET(ar, ar_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_BASENAME
- APPLET("basename", basename_main, _BB_DIR_USR_BIN, basename_usage)
+ APPLET(basename, basename_main, _BB_DIR_USR_BIN)
#endif
- APPLET_NOUSAGE("busybox", busybox_main, _BB_DIR_BIN)
+ APPLET_NOUSAGE(busybox, busybox_main, _BB_DIR_BIN)
#ifdef BB_CAT
- APPLET("cat", cat_main, _BB_DIR_BIN, cat_usage)
+ APPLET(cat, cat_main, _BB_DIR_BIN)
#endif
#ifdef BB_CHMOD_CHOWN_CHGRP
- APPLET("chgrp", chmod_chown_chgrp_main, _BB_DIR_BIN, chgrp_usage)
+ APPLET(chgrp, chmod_chown_chgrp_main, _BB_DIR_BIN)
#endif
#ifdef BB_CHMOD_CHOWN_CHGRP
- APPLET("chmod", chmod_chown_chgrp_main, _BB_DIR_BIN, chmod_usage)
+ APPLET(chmod, chmod_chown_chgrp_main, _BB_DIR_BIN)
#endif
#ifdef BB_CHMOD_CHOWN_CHGRP
- APPLET("chown", chmod_chown_chgrp_main, _BB_DIR_BIN, chown_usage)
+ APPLET(chown, chmod_chown_chgrp_main, _BB_DIR_BIN)
#endif
#ifdef BB_CHROOT
- APPLET("chroot", chroot_main, _BB_DIR_USR_SBIN, chroot_usage)
+ APPLET(chroot, chroot_main, _BB_DIR_USR_SBIN)
#endif
#ifdef BB_CHVT
- APPLET("chvt", chvt_main, _BB_DIR_USR_BIN, chvt_usage)
+ APPLET(chvt, chvt_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_CLEAR
- APPLET("clear", clear_main, _BB_DIR_USR_BIN, clear_usage)
+ APPLET(clear, clear_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_CMP
- APPLET("cmp", cmp_main, _BB_DIR_USR_BIN, cmp_usage)
+ APPLET(cmp, cmp_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_CP_MV
- APPLET("cp", cp_mv_main, _BB_DIR_BIN, cp_usage)
+ APPLET(cp, cp_mv_main, _BB_DIR_BIN)
#endif
#ifdef BB_CUT
- APPLET("cut", cut_main, _BB_DIR_USR_BIN, cut_usage)
+ APPLET(cut, cut_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_DATE
- APPLET("date", date_main, _BB_DIR_BIN, date_usage)
+ APPLET(date, date_main, _BB_DIR_BIN)
#endif
#ifdef BB_DC
- APPLET("dc", dc_main, _BB_DIR_USR_BIN, dc_usage)
+ APPLET(dc, dc_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_DD
- APPLET("dd", dd_main, _BB_DIR_BIN, dd_usage)
+ APPLET(dd, dd_main, _BB_DIR_BIN)
#endif
#ifdef BB_DEALLOCVT
- APPLET("deallocvt", deallocvt_main, _BB_DIR_USR_BIN, deallocvt_usage)
+ APPLET(deallocvt, deallocvt_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_DF
- APPLET("df", df_main, _BB_DIR_BIN, df_usage)
+ APPLET(df, df_main, _BB_DIR_BIN)
#endif
#ifdef BB_DIRNAME
- APPLET("dirname", dirname_main, _BB_DIR_USR_BIN, dirname_usage)
+ APPLET(dirname, dirname_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_DMESG
- APPLET("dmesg", dmesg_main, _BB_DIR_BIN, dmesg_usage)
+ APPLET(dmesg, dmesg_main, _BB_DIR_BIN)
#endif
#ifdef BB_DOS2UNIX
- APPLET("dos2unix", dos2unix_main, _BB_DIR_USR_BIN, dos2unix_usage)
+ APPLET(dos2unix, dos2unix_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_DPKG
- APPLET("dpkg", dpkg_main, _BB_DIR_USR_BIN, dpkg_usage)
+ APPLET(dpkg, dpkg_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_DPKG_DEB
- APPLET("dpkg-deb", dpkg_deb_main, _BB_DIR_USR_BIN, dpkg_deb_usage)
+ APPLET_ODDNAME("dpkg-deb", dpkg_deb_main, _BB_DIR_USR_BIN, dpkg_deb_usage_index, dpkg_deb)
#endif
#ifdef BB_DU
- APPLET("du", du_main, _BB_DIR_USR_BIN, du_usage)
+ APPLET(du, du_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_DUMPKMAP
- APPLET("dumpkmap", dumpkmap_main, _BB_DIR_BIN, dumpkmap_usage)
+ APPLET(dumpkmap, dumpkmap_main, _BB_DIR_BIN)
#endif
#ifdef BB_DUTMP
- APPLET("dutmp", dutmp_main, _BB_DIR_USR_SBIN, dutmp_usage)
+ APPLET(dutmp, dutmp_main, _BB_DIR_USR_SBIN)
#endif
#ifdef BB_ECHO
- APPLET("echo", echo_main, _BB_DIR_BIN, echo_usage)
+ APPLET(echo, echo_main, _BB_DIR_BIN)
#endif
#ifdef BB_EXPR
- APPLET("expr", expr_main, _BB_DIR_USR_BIN, expr_usage)
+ APPLET(expr, expr_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_TRUE_FALSE
- APPLET("false", false_main, _BB_DIR_BIN, false_usage)
+ APPLET(false, false_main, _BB_DIR_BIN)
#endif
#ifdef BB_FBSET
- APPLET_NOUSAGE("fbset", fbset_main, _BB_DIR_USR_SBIN)
+ APPLET_NOUSAGE(fbset, fbset_main, _BB_DIR_USR_SBIN)
#endif
#ifdef BB_FDFLUSH
- APPLET("fdflush", fdflush_main, _BB_DIR_BIN, fdflush_usage)
+ APPLET(fdflush, fdflush_main, _BB_DIR_BIN)
#endif
#ifdef BB_FIND
- APPLET("find", find_main, _BB_DIR_USR_BIN, find_usage)
+ APPLET(find, find_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_FREE
- APPLET("free", free_main, _BB_DIR_USR_BIN, free_usage)
+ APPLET(free, free_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_FREERAMDISK
- APPLET("freeramdisk", freeramdisk_main, _BB_DIR_SBIN, freeramdisk_usage)
+ APPLET(freeramdisk, freeramdisk_main, _BB_DIR_SBIN)
#endif
#ifdef BB_FSCK_MINIX
- APPLET("fsck.minix", fsck_minix_main, _BB_DIR_SBIN, fsck_minix_usage)
+ APPLET_ODDNAME("fsck.minix", fsck_minix_main, _BB_DIR_SBIN, fsck_minix_usage_index, fsck_minix)
#endif
#ifdef BB_GETOPT
- APPLET("getopt", getopt_main, _BB_DIR_BIN, getopt_usage)
+ APPLET(getopt, getopt_main, _BB_DIR_BIN)
#endif
#ifdef BB_GREP
- APPLET("grep", grep_main, _BB_DIR_BIN, grep_usage)
+ APPLET(grep, grep_main, _BB_DIR_BIN)
#endif
#ifdef BB_GUNZIP
- APPLET("gunzip", gunzip_main, _BB_DIR_BIN, gunzip_usage)
+ APPLET(gunzip, gunzip_main, _BB_DIR_BIN)
#endif
#ifdef BB_GZIP
- APPLET("gzip", gzip_main, _BB_DIR_BIN, gzip_usage)
+ APPLET(gzip, gzip_main, _BB_DIR_BIN)
#endif
#ifdef BB_HALT
- APPLET("halt", halt_main, _BB_DIR_SBIN, halt_usage)
+ APPLET(halt, halt_main, _BB_DIR_SBIN)
#endif
#ifdef BB_HEAD
- APPLET("head", head_main, _BB_DIR_USR_BIN, head_usage)
+ APPLET(head, head_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_HOSTID
- APPLET("hostid", hostid_main, _BB_DIR_USR_BIN, hostid_usage)
+ APPLET(hostid, hostid_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_HOSTNAME
- APPLET("hostname", hostname_main, _BB_DIR_BIN, hostname_usage)
+ APPLET(hostname, hostname_main, _BB_DIR_BIN)
#endif
#ifdef BB_ID
- APPLET("id", id_main, _BB_DIR_USR_BIN, id_usage)
+ APPLET(id, id_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_IFCONFIG
- APPLET("ifconfig", ifconfig_main, _BB_DIR_SBIN, ifconfig_usage)
+ APPLET(ifconfig, ifconfig_main, _BB_DIR_SBIN)
#endif
#ifdef BB_INIT
- APPLET_NOUSAGE("init", init_main, _BB_DIR_SBIN)
+ APPLET(init, init_main, _BB_DIR_SBIN)
#endif
#ifdef BB_INSMOD
- APPLET("insmod", insmod_main, _BB_DIR_SBIN, insmod_usage)
+ APPLET(insmod, insmod_main, _BB_DIR_SBIN)
#endif
#ifdef BB_KILL
- APPLET("kill", kill_main, _BB_DIR_BIN, kill_usage)
+ APPLET(kill, kill_main, _BB_DIR_BIN)
#endif
#ifdef BB_KILLALL
- APPLET("killall", kill_main, _BB_DIR_USR_BIN, killall_usage)
+ APPLET(killall, kill_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_LENGTH
- APPLET("length", length_main, _BB_DIR_USR_BIN, length_usage)
+ APPLET(length, length_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_LINUXRC
- APPLET_NOUSAGE("linuxrc", init_main, _BB_DIR_ROOT)
+ APPLET_NOUSAGE(linuxrc, init_main, _BB_DIR_ROOT)
#endif
#ifdef BB_LN
- APPLET("ln", ln_main, _BB_DIR_BIN, ln_usage)
+ APPLET(ln, ln_main, _BB_DIR_BIN)
#endif
#ifdef BB_LOADACM
- APPLET("loadacm", loadacm_main, _BB_DIR_USR_BIN, loadacm_usage)
+ APPLET(loadacm, loadacm_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_LOADFONT
- APPLET("loadfont", loadfont_main, _BB_DIR_USR_BIN, loadfont_usage)
+ APPLET(loadfont, loadfont_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_LOADKMAP
- APPLET("loadkmap", loadkmap_main, _BB_DIR_SBIN, loadkmap_usage)
+ APPLET(loadkmap, loadkmap_main, _BB_DIR_SBIN)
#endif
#ifdef BB_LOGGER
- APPLET("logger", logger_main, _BB_DIR_USR_BIN, logger_usage)
+ APPLET(logger, logger_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_LOGNAME
- APPLET("logname", logname_main, _BB_DIR_USR_BIN, logname_usage)
+ APPLET(logname, logname_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_LS
- APPLET("ls", ls_main, _BB_DIR_BIN, ls_usage)
+ APPLET(ls, ls_main, _BB_DIR_BIN)
#endif
#ifdef BB_LSMOD
- APPLET("lsmod", lsmod_main, _BB_DIR_SBIN, lsmod_usage)
+ APPLET(lsmod, lsmod_main, _BB_DIR_SBIN)
#endif
#ifdef BB_MAKEDEVS
- APPLET("makedevs", makedevs_main, _BB_DIR_SBIN, makedevs_usage)
+ APPLET(makedevs, makedevs_main, _BB_DIR_SBIN)
#endif
#ifdef BB_MD5SUM
- APPLET("md5sum", md5sum_main, _BB_DIR_USR_BIN, md5sum_usage)
+ APPLET(md5sum, md5sum_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_MKDIR
- APPLET("mkdir", mkdir_main, _BB_DIR_BIN, mkdir_usage)
+ APPLET(mkdir, mkdir_main, _BB_DIR_BIN)
#endif
#ifdef BB_MKFIFO
- APPLET("mkfifo", mkfifo_main, _BB_DIR_USR_BIN, mkfifo_usage)
+ APPLET(mkfifo, mkfifo_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_MKFS_MINIX
- APPLET("mkfs.minix", mkfs_minix_main, _BB_DIR_SBIN, mkfs_minix_usage)
+ APPLET_ODDNAME("mkfs.minix", mkfs_minix_main, _BB_DIR_SBIN, mkfs_minix_usage_index, mkfs_minix)
#endif
#ifdef BB_MKNOD
- APPLET("mknod", mknod_main, _BB_DIR_BIN, mknod_usage)
+ APPLET(mknod, mknod_main, _BB_DIR_BIN)
#endif
#ifdef BB_MKSWAP
- APPLET("mkswap", mkswap_main, _BB_DIR_SBIN, mkswap_usage)
+ APPLET(mkswap, mkswap_main, _BB_DIR_SBIN)
#endif
#ifdef BB_MKTEMP
- APPLET("mktemp", mktemp_main, _BB_DIR_BIN, mktemp_usage)
+ APPLET(mktemp, mktemp_main, _BB_DIR_BIN)
#endif
#ifdef BB_MORE
- APPLET("more", more_main, _BB_DIR_BIN, more_usage)
+ APPLET(more, more_main, _BB_DIR_BIN)
#endif
#ifdef BB_MOUNT
- APPLET("mount", mount_main, _BB_DIR_BIN, mount_usage)
+ APPLET(mount, mount_main, _BB_DIR_BIN)
#endif
#ifdef BB_MT
- APPLET("mt", mt_main, _BB_DIR_BIN, mt_usage)
+ APPLET(mt, mt_main, _BB_DIR_BIN)
#endif
#ifdef BB_CP_MV
- APPLET("mv", cp_mv_main, _BB_DIR_BIN, mv_usage)
+ APPLET(mv, cp_mv_main, _BB_DIR_BIN)
#endif
#ifdef BB_NC
- APPLET("nc", nc_main, _BB_DIR_USR_BIN, nc_usage)
+ APPLET(nc, nc_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_NSLOOKUP
- APPLET("nslookup", nslookup_main, _BB_DIR_USR_BIN, nslookup_usage)
+ APPLET(nslookup, nslookup_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_PING
- APPLET("ping", ping_main, _BB_DIR_BIN, ping_usage)
+ APPLET(ping, ping_main, _BB_DIR_BIN)
#endif
#ifdef BB_PIVOT_ROOT
- APPLET("pivot_root", pivot_root_main, _BB_DIR_SBIN, pivot_root_usage)
+ APPLET(pivot_root, pivot_root_main, _BB_DIR_SBIN)
#endif
#ifdef BB_POWEROFF
- APPLET("poweroff", poweroff_main, _BB_DIR_SBIN, poweroff_usage)
+ APPLET(poweroff, poweroff_main, _BB_DIR_SBIN)
#endif
#ifdef BB_PRINTF
- APPLET("printf", printf_main, _BB_DIR_USR_BIN, printf_usage)
+ APPLET(printf, printf_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_PS
- APPLET("ps", ps_main, _BB_DIR_BIN, ps_usage)
+ APPLET(ps, ps_main, _BB_DIR_BIN)
#endif
#ifdef BB_PWD
- APPLET("pwd", pwd_main, _BB_DIR_BIN, pwd_usage)
+ APPLET(pwd, pwd_main, _BB_DIR_BIN)
#endif
#ifdef BB_RDATE
- APPLET("rdate", rdate_main, _BB_DIR_USR_BIN, rdate_usage)
+ APPLET(rdate, rdate_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_READLINK
- APPLET("readlink", readlink_main, _BB_DIR_USR_BIN, readlink_usage)
+ APPLET(readlink, readlink_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_REBOOT
- APPLET("reboot", reboot_main, _BB_DIR_SBIN, reboot_usage)
+ APPLET(reboot, reboot_main, _BB_DIR_SBIN)
#endif
#ifdef BB_RENICE
- APPLET("renice", renice_main, _BB_DIR_USR_BIN, renice_usage)
+ APPLET(renice, renice_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_RESET
- APPLET("reset", reset_main, _BB_DIR_USR_BIN, reset_usage)
+ APPLET(reset, reset_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_RM
- APPLET("rm", rm_main, _BB_DIR_BIN, rm_usage)
+ APPLET(rm, rm_main, _BB_DIR_BIN)
#endif
#ifdef BB_RMDIR
- APPLET("rmdir", rmdir_main, _BB_DIR_BIN, rmdir_usage)
+ APPLET(rmdir, rmdir_main, _BB_DIR_BIN)
#endif
#ifdef BB_RMMOD
- APPLET("rmmod", rmmod_main, _BB_DIR_SBIN, rmmod_usage)
+ APPLET(rmmod, rmmod_main, _BB_DIR_SBIN)
#endif
#ifdef BB_ROUTE
- APPLET("route", route_main, _BB_DIR_USR_BIN, route_usage)
+ APPLET(route, route_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_RPMUNPACK
- APPLET("rpmunpack", rpmunpack_main, _BB_DIR_USR_BIN, rpmunpack_usage)
+ APPLET(rpmunpack, rpmunpack_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_SED
- APPLET("sed", sed_main, _BB_DIR_BIN, sed_usage)
+ APPLET(sed, sed_main, _BB_DIR_BIN)
#endif
#ifdef BB_SETKEYCODES
- APPLET("setkeycodes", setkeycodes_main, _BB_DIR_USR_BIN, setkeycodes_usage)
+ APPLET(setkeycodes, setkeycodes_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_SH
- APPLET("sh", shell_main, _BB_DIR_BIN, shell_usage)
+ APPLET(sh, shell_main, _BB_DIR_BIN)
#endif
#ifdef BB_SLEEP
- APPLET("sleep", sleep_main, _BB_DIR_BIN, sleep_usage)
+ APPLET(sleep, sleep_main, _BB_DIR_BIN)
#endif
#ifdef BB_SORT
- APPLET("sort", sort_main, _BB_DIR_USR_BIN, sort_usage)
+ APPLET(sort, sort_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_STTY
- APPLET("stty", stty_main, _BB_DIR_BIN, stty_usage)
+ APPLET(stty, stty_main, _BB_DIR_BIN)
#endif
#ifdef BB_SWAPONOFF
- APPLET("swapoff", swap_on_off_main, _BB_DIR_SBIN, swapoff_usage)
+ APPLET(swapoff, swap_on_off_main, _BB_DIR_SBIN)
#endif
#ifdef BB_SWAPONOFF
- APPLET("swapon", swap_on_off_main, _BB_DIR_SBIN, swapon_usage)
+ APPLET(swapon, swap_on_off_main, _BB_DIR_SBIN)
#endif
#ifdef BB_SYNC
- APPLET("sync", sync_main, _BB_DIR_BIN, sync_usage)
+ APPLET(sync, sync_main, _BB_DIR_BIN)
#endif
#ifdef BB_SYSLOGD
- APPLET("syslogd", syslogd_main, _BB_DIR_SBIN, syslogd_usage)
+ APPLET(syslogd, syslogd_main, _BB_DIR_SBIN)
#endif
#ifdef BB_TAIL
- APPLET("tail", tail_main, _BB_DIR_USR_BIN, tail_usage)
+ APPLET(tail, tail_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_TAR
- APPLET("tar", tar_main, _BB_DIR_BIN, tar_usage)
+ APPLET(tar, tar_main, _BB_DIR_BIN)
#endif
#ifdef BB_TEE
- APPLET("tee", tee_main, _BB_DIR_USR_BIN, tee_usage)
+ APPLET(tee, tee_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_TELNET
- APPLET("telnet", telnet_main, _BB_DIR_USR_BIN, telnet_usage)
+ APPLET(telnet, telnet_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_TEST
- APPLET("test", test_main, _BB_DIR_USR_BIN, test_usage)
+ APPLET(test, test_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_TOUCH
- APPLET("touch", touch_main, _BB_DIR_BIN, touch_usage)
+ APPLET(touch, touch_main, _BB_DIR_BIN)
#endif
#ifdef BB_TR
- APPLET("tr", tr_main, _BB_DIR_USR_BIN, tr_usage)
+ APPLET(tr, tr_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_TRUE_FALSE
- APPLET("true", true_main, _BB_DIR_BIN, true_usage)
+ APPLET(true, true_main, _BB_DIR_BIN)
#endif
#ifdef BB_TTY
- APPLET("tty", tty_main, _BB_DIR_USR_BIN, tty_usage)
+ APPLET(tty, tty_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_UMOUNT
- APPLET("umount", umount_main, _BB_DIR_BIN, umount_usage)
+ APPLET(umount, umount_main, _BB_DIR_BIN)
#endif
#ifdef BB_UNAME
- APPLET("uname", uname_main, _BB_DIR_BIN, uname_usage)
+ APPLET(uname, uname_main, _BB_DIR_BIN)
#endif
#ifdef BB_UNIQ
- APPLET("uniq", uniq_main, _BB_DIR_USR_BIN, uniq_usage)
+ APPLET(uniq, uniq_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_UNIX2DOS
- APPLET("unix2dos", unix2dos_main, _BB_DIR_USR_BIN, unix2dos_usage)
+ APPLET(unix2dos, unix2dos_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_UPDATE
- APPLET("update", update_main, _BB_DIR_SBIN, update_usage)
+ APPLET(update, update_main, _BB_DIR_SBIN)
#endif
#ifdef BB_UPTIME
- APPLET("uptime", uptime_main, _BB_DIR_USR_BIN, uptime_usage)
+ APPLET(uptime, uptime_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_USLEEP
- APPLET("usleep", usleep_main, _BB_DIR_BIN, usleep_usage)
+ APPLET(usleep, usleep_main, _BB_DIR_BIN)
#endif
#ifdef BB_UUDECODE
- APPLET("uudecode", uudecode_main, _BB_DIR_USR_BIN, uudecode_usage)
+ APPLET(uudecode, uudecode_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_UUENCODE
- APPLET("uuencode", uuencode_main, _BB_DIR_USR_BIN, uuencode_usage)
+ APPLET(uuencode, uuencode_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_WATCHDOG
- APPLET("watchdog", watchdog_main, _BB_DIR_SBIN, watchdog_usage)
+ APPLET(watchdog, watchdog_main, _BB_DIR_SBIN)
#endif
#ifdef BB_WC
- APPLET("wc", wc_main, _BB_DIR_USR_BIN, wc_usage)
+ APPLET(wc, wc_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_WGET
- APPLET("wget", wget_main, _BB_DIR_USR_BIN, wget_usage)
+ APPLET(wget, wget_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_WHICH
- APPLET("which", which_main, _BB_DIR_USR_BIN, which_usage)
+ APPLET(which, which_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_WHOAMI
- APPLET("whoami", whoami_main, _BB_DIR_USR_BIN, whoami_usage)
+ APPLET(whoami, whoami_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_XARGS
- APPLET("xargs", xargs_main, _BB_DIR_USR_BIN, xargs_usage)
+ APPLET(xargs, xargs_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_YES
- APPLET("yes", yes_main, _BB_DIR_USR_BIN, yes_usage)
+ APPLET(yes, yes_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_GUNZIP
- APPLET("zcat", gunzip_main, _BB_DIR_BIN, gunzip_usage)
+ APPLET(zcat, gunzip_main, _BB_DIR_BIN)
#endif
-#if !defined(PROTOTYPES) && !defined(MAKE_LINKS)
- { 0,NULL,0,NULL}
+#if !defined(PROTOTYPES) && !defined(MAKE_LINKS) && !defined(APPLET_ENUM)
+ { 0,NULL,0,-1}
};
-/* The -1 arises because of the {0,NULL,0,NULL} entry above. */
+/* The -1 arises because of the {0,NULL,0,-1} entry above. */
size_t NUM_APPLETS = (sizeof (applets) / sizeof (struct BB_applet) - 1);
#endif
diff --git a/applets/busybox.c b/applets/busybox.c
index 1409efa..6c1070f 100644
--- a/applets/busybox.c
+++ b/applets/busybox.c
@@ -87,7 +87,6 @@
int main(int argc, char **argv)
{
- struct BB_applet *applet;
const char *s;
for (s = applet_name = argv[0]; *s != '\0';) {
@@ -103,13 +102,7 @@
}
#endif
- /* Do a binary search to find the applet entry given the name. */
- if ((applet = find_applet_by_name(applet_name)) != NULL) {
- if (applet->usage && argv[1] && strcmp(argv[1], "--help") == 0)
- usage(applet->usage);
- exit((*(applet->main)) (argc, argv));
- }
-
+ run_applet_by_name(applet_name, argc, argv);
error_msg_and_die("applet not found");
}
diff --git a/applets/usage.c b/applets/usage.c
index 7f99808..1515c08 100644
--- a/applets/usage.c
+++ b/applets/usage.c
@@ -1,1635 +1,2 @@
-#include "busybox.h"
-
-#if defined BB_AR
-const char ar_usage[] =
- "ar -[ovR]{ptx} archive filenames"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nExtract or list files from an ar archive.\n\n"
- "Options:\n"
- "\t-o\t\tpreserve original dates\n"
- "\t-p\t\textract to stdout\n"
- "\t-t\t\tlist\n"
- "\t-x\t\textract\n"
- "\t-v\t\tverbosely list files processed\n"
- "\t-R\t\trecursive action"
-#endif
- ;
-#endif
-
-#if defined BB_BASENAME
-const char basename_usage[] =
- "basename FILE [SUFFIX]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nStrips directory path and suffixes from FILE.\n"
- "If specified, also removes any trailing SUFFIX."
-#endif
- ;
-#endif
-
-#if defined BB_CAT
-const char cat_usage[] =
- "cat [FILE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nConcatenates FILE(s) and prints them to stdout."
-#endif
- ;
-#endif
-
-#if defined BB_CHMOD_CHOWN_CHGRP
-const char chgrp_usage[] =
- "chgrp [OPTION]... GROUP FILE..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nChange the group membership of each FILE to GROUP.\n"
- "\nOptions:\n\t-R\tChanges files and directories recursively."
-#endif
- ;
-#endif
-
-#if defined BB_CHMOD_CHOWN_CHGRP
-const char chmod_usage[] =
- "chmod [-R] MODE[,MODE]... FILE..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nEach MODE is one or more of the letters ugoa, one of the symbols +-= and\n"
- "one or more of the letters rwxst.\n\n"
- "\nOptions:\n\t-R\tChanges files and directories recursively."
-#endif
- ;
-#endif
-
-#if defined BB_CHMOD_CHOWN_CHGRP
-const char chown_usage[] =
- "chown [OPTION]... OWNER[<.|:>[GROUP] FILE..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nChange the owner and/or group of each FILE to OWNER and/or GROUP.\n"
- "\nOptions:\n\t-R\tChanges files and directories recursively."
-#endif
- ;
-#endif
-
-#if defined BB_CHROOT
-const char chroot_usage[] =
- "chroot NEWROOT [COMMAND...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nRun COMMAND with root directory set to NEWROOT."
-#endif
- ;
-#endif
-
-#if defined BB_CHVT
-const char chvt_usage[] =
- "chvt N"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nChanges the foreground virtual terminal to /dev/ttyN"
-#endif
- ;
-#endif
-
-#if defined BB_CLEAR
-const char clear_usage[] =
- "clear"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nClear screen."
-#endif
- ;
-#endif
-
-#if defined BB_CMP
-const char cmp_usage[] =
- "cmp FILE1 [FILE2]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nCompare files."
-#endif
- ;
-#endif
-
-#if defined BB_CP_MV
-const char cp_usage[] =
- "cp [OPTION]... SOURCE DEST\n"
- " or: cp [OPTION]... SOURCE... DIRECTORY"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nCopies SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
- "\n"
- "\t-a\tSame as -dpR\n"
- "\t-d\tPreserves links\n"
- "\t-p\tPreserves file attributes if possible\n"
- "\t-f\tforce (implied; ignored) - always set\n"
- "\t-R\tCopies directories recursively"
-#endif
- ;
-#endif
-
-#if defined BB_CUT
-const char cut_usage[] =
- "cut [OPTION]... [FILE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrints selected fields from each input FILE to standard output.\n\n"
- "Options:\n"
- "\t-b LIST\tOutput only bytes from LIST\n"
- "\t-c LIST\tOutput only characters from LIST\n"
- "\t-d CHAR\tUse CHAR instead of tab as the field delimiter\n"
- "\t-s\tOutput only the lines containing delimiter\n"
- "\t-f N\tPrint only these fields\n"
- "\t-n\tIgnored"
-#endif
- ;
-#endif
-
-#if defined BB_DATE
-const char date_usage[] =
- "date [OPTION]... [+FORMAT]\n"
- " or: date [OPTION] [MMDDhhmm[[CC]YY][.ss]]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nDisplays the current time in the given FORMAT, or sets the system date.\n"
- "\nOptions:\n\t-R\t\tOutputs RFC-822 compliant date string\n"
- "\t-d STRING\tdisplay time described by STRING, not `now'\n"
- "\t-s\t\tSets time described by STRING\n"
- "\t-u\t\tPrints or sets Coordinated Universal Time"
-#endif
- ;
-#endif
-
-#if defined BB_DC
-const char dc_usage[] =
- "dc expression ..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nThis is a Tiny RPN calculator that understands the\n"
- "following operations: +, -, /, *, and, or, not, eor.\n"
- "i.e. 'dc 2 2 add' -> 4, and 'dc 8 8 \\* 2 2 + /' -> 16"
-#endif
- ;
-#endif
-
-#if defined BB_DD
-const char dd_usage[] =
- "dd [if=FILE] [of=FILE] [bs=N] [count=N] [skip=N] [seek=N] [conv=notrunc|sync]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nCopy a file, converting and formatting according to options\n\n"
- "\tif=FILE\tread from FILE instead of stdin\n"
- "\tof=FILE\twrite to FILE instead of stdout\n"
- "\tbs=N\tread and write N bytes at a time\n"
- "\tcount=N\tcopy only N input blocks\n"
- "\tskip=N\tskip N input blocks\n"
- "\tseek=N\tskip N output blocks\n"
- "\tconv=notrunc\tdon't truncate output file\n"
- "\tconv=sync\tpad blocks with zeros\n"
- "\n"
- "Numbers may be suffixed by c (x1), w (x2), b (x512), kD (x1000), k (x1024),\n"
- "MD (x1000000), M (x1048576), GD (x1000000000) or G (x1073741824)."
-#endif
- ;
-#endif
-
-#if defined BB_DEALLOCVT
-const char deallocvt_usage[] =
- "deallocvt N"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nDeallocate unused virtual terminal /dev/ttyN"
-#endif
- ;
-#endif
-
-#if defined BB_DF
-const char df_usage[] =
- "df [-?"
-#ifdef BB_FEATURE_HUMAN_READABLE
- "hm"
-#endif
- "k] [filesystem ...]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrint the filesystem space used and space available."
- "Options:\n"
- "\t-?\tshow usage information\n"
-#ifdef BB_FEATURE_HUMAN_READABLE
- "\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n"
- "\t-m\tprint sizes in megabytes\n"
- "\t-k\tprint sizes in kilobytes(default)\n"
-#else
- "\t-k\tprint sizes in kilobytes(compatability)\n"
-#endif
-#endif
- ;
-#endif
-
-#if defined BB_DIRNAME
-const char dirname_usage[] =
- "dirname [FILENAME ...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nStrips non-directory suffix from FILENAME"
-#endif
- ;
-#endif
-
-#if defined BB_DMESG
-const char dmesg_usage[] =
- "dmesg [-c] [-n LEVEL] [-s SIZE]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrints or controls the kernel ring buffer\n\n"
- "Options:\n"
- "\t-c\t\tClears the ring buffer's contents after printing\n"
- "\t-n LEVEL\tSets console logging level\n"
- "\t-s SIZE\t\tUse a buffer of size SIZE"
-#endif
- ;
-#endif
-
-#if defined BB_DOS2UNIX
-const char dos2unix_usage[] =
- "dos2unix < dosfile > unixfile"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nConverts a text file from dos format to unix format."
-#endif
- ;
-#endif
-
-#if defined BB_DPKG
-const char dpkg_usage[] =
- "udpkg <-i|-r|--unpack|--configure> my.deb\n"
- "WORK IN PROGRESS, only usefull for debian-installer\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-#endif
- ;
-#endif
-
-#if defined BB_DPKG_DEB
-const char dpkg_deb_usage[] =
- "dpkg-deb [-cexX] file directory"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPerform actions on debian packages (.debs)\n\n"
- "Options:\n"
- "\t-c\tList contents of filesystem tree (verbose)\n"
- "\t-l\tList contents of filesystem tree (.list format)\n"
- "\t-e\tExtract control files to directory\n"
- "\t-x\tExctract packages filesystem tree to directory\n"
- "\t-X\tVerbose extract"
-#endif
- ;
-#endif
-
-#if defined BB_DU
-const char du_usage[] =
- "du [-?ls"
-#ifdef BB_FEATURE_HUMAN_READABLE
- "hm"
-#endif
- "k] [FILE]...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nSummarizes disk space used for each FILE and/or directory.\n"
- "Disk space is printed in units of 1024 bytes.\n\n"
- "Options:\n"
- "\t-?\tshow usage information\n"
- "\t-l\tcount sizes many times if hard linked\n"
- "\t-s\tdisplay only a total for each argument"
-#ifdef BB_FEATURE_HUMAN_READABLE
- "\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n"
- "\t-m\tprint sizes in megabytes\n"
- "\t-k\tprint sizes in kilobytes(default)\n"
-#else
- "\t-k\tprint sizes in kilobytes(compatability)\n"
-#endif
-#endif
- ;
-#endif
-
-#if defined BB_DUMPKMAP
-const char dumpkmap_usage[] =
- "dumpkmap > keymap"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrints out a binary keyboard translation table to standard input."
-#endif
- ;
-#endif
-
-#if defined BB_DUTMP
-const char dutmp_usage[] =
- "dutmp [FILE]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nDump utmp file format (pipe delimited) from FILE\n"
- "or stdin to stdout. (i.e. 'dutmp /var/run/utmp')"
-#endif
- ;
-#endif
-
-#if defined BB_ECHO
-const char echo_usage[] =
- "echo [-neE] [ARG ...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrints the specified ARGs to stdout\n\n"
- "Options:\n"
- "\t-n\tsuppress trailing newline\n"
- "\t-e\tinterpret backslash-escaped characters (i.e. \\t=tab etc)\n"
- "\t-E\tdisable interpretation of backslash-escaped characters"
-#endif
- ;
-#endif
-
-#if defined BB_EXPR
-const char expr_usage[] =
- "expr EXPRESSION"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-"\n\nPrints the value of EXPRESSION to standard output.\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 ARG1 is less than ARG2\n"
-"ARG1 <= ARG2 ARG1 is less than or equal to ARG2\n"
-"ARG1 = ARG2 ARG1 is equal to ARG2\n"
-"ARG1 != ARG2 ARG1 is unequal to ARG2\n"
-"ARG1 >= ARG2 ARG1 is greater than or equal to ARG2\n"
-"ARG1 > ARG2 ARG1 is greater than ARG2\n"
-"ARG1 + ARG2 arithmetic sum of ARG1 and ARG2\n"
-"ARG1 - ARG2 arithmetic difference of ARG1 and ARG2\n"
-"ARG1 * ARG2 arithmetic product of ARG1 and ARG2\n"
-"ARG1 / ARG2 arithmetic quotient of ARG1 divided by ARG2\n"
-"ARG1 % ARG2 arithmetic remainder of ARG1 divided by 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 it is a \n"
-" keyword like `match' or an 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."
-
-#endif
- ;
-#endif
-
-
-#if defined BB_TRUE_FALSE
-const char false_usage[] =
- "false"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nReturn an exit code of FALSE (1)."
-#endif
- ;
-#endif
-
-#if defined BB_FDFLUSH
-const char fdflush_usage[] =
- "fdflush DEVICE"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nForces floppy disk drive to detect disk change"
-#endif
- ;
-#endif
-
-#if defined BB_FIND
-const char find_usage[] =
- "find [PATH...] [EXPRESSION]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nSearch for files in a directory hierarchy. The default PATH is\n"
- "the current directory; default EXPRESSION is '-print'\n\n"
- "\nEXPRESSION may consist of:\n"
- "\t-follow\t\tDereference symbolic links.\n"
- "\t-name PATTERN\tFile name (leading directories removed) matches PATTERN.\n"
-#ifdef BB_FEATURE_FIND_TYPE
- "\t-type X\t\tFiletype matches X (where X is one of: f,d,l,b,c,...)\n"
-#endif
-#ifdef BB_FEATURE_FIND_PERM
- "\t-perm PERMS\tPermissions match any of (+NNN); all of (-NNN); or exactly (NNN)\n"
-#endif
-#ifdef BB_FEATURE_FIND_MTIME
- "\t-mtime TIME\tModified time is greater than (+N); less than (-N); or exactly (N) days\n"
-#endif
-#endif
- ;
-#endif
-
-#if defined BB_FREE
-const char free_usage[] =
- "free"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nDisplays the amount of free and used system memory"
-#endif
- ;
-#endif
-
-#if defined BB_FREERAMDISK
-const char freeramdisk_usage[] =
- "freeramdisk DEVICE"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nFrees all memory used by the specified ramdisk."
-#endif
- ;
-#endif
-
-#if defined BB_FSCK_MINIX
-const char fsck_minix_usage[] =
- "Usage: fsck.minix [-larvsmf] /dev/name"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPerforms a consistency check for MINIX filesystems.\n\n"
- "Options:\n"
- "\t-l\tLists all filenames\n"
- "\t-r\tPerform interactive repairs\n"
- "\t-a\tPerform automatic repairs\n"
- "\t-v\tverbose\n"
- "\t-s\tOutputs super-block information\n"
- "\t-m\tActivates MINIX-like \"mode not cleared\" warnings\n"
- "\t-f\tForce file system check."
-#endif
- ;
-#endif
-
-#if defined BB_GETOPT
-const char getopt_usage[] =
-"getopt [OPTIONS]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-"\nParse command options\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, --unqote Do not quote the output"
-#endif
-;
-#endif
-
-#if defined BB_GREP
-const char grep_usage[] =
- "grep [-ihHnqvs] pattern [files...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nSearch for PATTERN in each FILE or standard input.\n\n"
- "Options:\n"
- "\t-H\tprefix output lines with filename where match was found\n"
- "\t-h\tsuppress the prefixing filename on output\n"
- "\t-i\tignore case distinctions\n"
- "\t-n\tprint line number with output lines\n"
- "\t-q\tbe quiet. Returns 0 if result was found, 1 otherwise\n"
- "\t-v\tselect non-matching lines\n"
- "\t-s\tsuppress file open/read error messages"
-#endif
- ;
-#endif
-
-#if defined BB_GUNZIP
-const char gunzip_usage[] =
- "gunzip [OPTION]... FILE"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nUncompress FILE (or standard input if FILE is '-').\n\n"
- "Options:\n"
- "\t-c\tWrite output to standard output\n"
- "\t-t\tTest compressed file integrity"
-#endif
- ;
-#endif
-
-#if defined BB_GZIP
-const char gzip_usage[] =
- "gzip [OPTION]... FILE"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nCompress FILE with maximum compression.\n"
- "When FILE is '-', reads standard input. Implies -c.\n\n"
- "Options:\n"
- "\t-c\tWrite output to standard output instead of FILE.gz\n"
- "\t-d\tdecompress"
-#endif
- ;
-#endif
-
-#if defined BB_HALT
-const char halt_usage[] =
- "halt"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nHalt the system."
-#endif
- ;
-#endif
-
-#if defined BB_HEAD
-const char head_usage[] =
- "head [OPTION] [FILE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrint first 10 lines of each FILE to standard output.\n"
- "With more than one FILE, precede each with a header giving the\n"
- "file name. With no FILE, or when FILE is -, read standard input.\n\n"
-
- "Options:\n" "\t-n NUM\t\tPrint first NUM lines instead of first 10"
-#endif
- ;
-#endif
-
-#if defined BB_HOSTID
-const char hostid_usage[] =
- "hostid"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrint out a unique 32-bit identifier for the machine."
-#endif
- ;
-#endif
-
-#if defined BB_HOSTNAME
-const char hostname_usage[] =
- "hostname [OPTION] {hostname | -F file}"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nGet or set the hostname or DNS domain name. If a hostname is given\n"
- "(or a file with the -F parameter), the host name will be set.\n\n"
-
- "Options:\n"
- "\t-s\t\tShort\n"
- "\t-i\t\tAddresses for the hostname\n"
- "\t-d\t\tDNS domain name\n"
- "\t-F, --file FILE\tUse the contents of FILE to specify the hostname"
-#endif
- ;
-#endif
-
-#if defined BB_ID
-const char id_usage[] =
- "id [OPTIONS]... [USERNAME]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrint information for USERNAME or the current user\n\n"
- "Options:\n"
- "\t-g\tprints only the group ID\n"
- "\t-u\tprints only the user ID\n"
- "\t-n\tprint a name instead of a number (with for -ug)\n"
- "\t-r\tprints the real user ID instead of the effective ID (with -ug)"
-#endif
- ;
-#endif
-
-#if defined BB_IFCONFIG
-const char ifconfig_usage[] =
- "ifconfig [-a] [-i] [-v] <interface> [<address>]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nconfigure a network interface\n\n"
- "Options:\n"
- " [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n"
- " [netmask <address>] [dstaddr <address>] [tunnel <adress>]\n"
-#ifdef SIOCSKEEPALIVE
- " [outfill <NN>] [keepalive <NN>]\n"
-#endif
- " [hw ether <address>] [metric <NN>] [mtu <NN>]\n"
- " [[-]trailers] [[-]arp] [[-]allmulti]\n"
- " [multicast] [[-]promisc]\n"
- " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <type>]\n"
- " [up|down] ..."
-#endif
- ;
-#endif
-
-#if defined BB_INSMOD
-const char insmod_usage[] =
- "insmod [OPTION]... MODULE [symbol=value]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nLoads the specified kernel modules into the kernel.\n\n"
- "Options:\n"
- "\t-f\tForce module to load into the wrong kernel version.\n"
- "\t-k\tMake module autoclean-able.\n"
- "\t-v\tverbose output\n"
- "\t-L\tLock to prevent simultaneous loads of a module\n"
- "\t-x\tdo not export externs"
-#endif
- ;
-#endif
-
-#if defined BB_KILL
-const char kill_usage[] =
- "kill [-signal] process-id [process-id ...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nSend a signal (default is SIGTERM) to the specified process(es).\n\n"
- "Options:\n" "\t-l\tList all signal names and numbers."
-#endif
- ;
-#endif
-
-#if defined BB_KILLALL
-const char killall_usage[] =
- "killall [-signal] process-name [process-name ...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nSend a signal (default is SIGTERM) to the specified process(es).\n\n"
- "Options:\n" "\t-l\tList all signal names and numbers."
-#endif
- ;
-#endif
-
-#if defined BB_LENGTH
-const char length_usage[] =
- "length STRING"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrints out the length of the specified STRING."
-#endif
- ;
-#endif
-
-#if defined BB_LN
-const char ln_usage[] =
- "ln [OPTION] TARGET... LINK_NAME|DIRECTORY"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nCreate a link named LINK_NAME or DIRECTORY to the specified TARGET\n"
- "\nYou may use '--' to indicate that all following arguments are non-options.\n\n"
- "Options:\n"
- "\t-s\tmake symbolic links instead of hard links\n"
- "\t-f\tremove existing destination files\n"
- "\t-n\tno dereference symlinks - treat like normal file"
-#endif
- ;
-#endif
-
-#if defined BB_LOADACM
-const char loadacm_usage[] =
- "loadacm < mapfile"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nLoads an acm from standard input."
-#endif
- ;
-#endif
-
-#if defined BB_LOADFONT
-const char loadfont_usage[] =
- "loadfont < font"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nLoads a console font from standard input."
-#endif
- ;
-#endif
-
-#if defined BB_LOADKMAP
-const char loadkmap_usage[] =
- "loadkmap < keymap"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nLoads a binary keyboard translation table from standard input."
-#endif
- ;
-#endif
-
-#if defined BB_LOGGER
-const char logger_usage[] =
- "logger [OPTION]... [MESSAGE]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nWrite MESSAGE to the system log. If MESSAGE is omitted, log stdin.\n\n"
- "Options:\n"
- "\t-s\tLog to stderr as well as the system log.\n"
- "\t-t\tLog using the specified tag (defaults to user name).\n"
- "\t-p\tEnter the message with the specified priority.\n"
- "\t\tThis may be numerical or a ``facility.level'' pair."
-#endif
- ;
-#endif
-
-#if defined BB_LOGNAME
-const char logname_usage[] =
- "logname"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrint the name of the current user."
-#endif
- ;
-#endif
-
-#if defined BB_LS
-const char ls_usage[] =
- "ls [-1Aa"
-#ifdef BB_FEATURE_LS_TIMESTAMPS
- "c"
-#endif
- "Cd"
-#ifdef BB_FEATURE_LS_TIMESTAMPS
- "e"
-#endif
-#ifdef BB_FEATURE_LS_FILETYPES
- "F"
-#endif
- "iln"
-#ifdef BB_FEATURE_LS_FILETYPES
- "p"
-#endif
-#ifdef BB_FEATURE_LS_FOLLOWLINKS
- "L"
-#endif
-#ifdef BB_FEATURE_LS_RECURSIVE
- "R"
-#endif
-#ifdef BB_FEATURE_LS_SORTFILES
- "rS"
-#endif
- "s"
-#ifdef BB_FEATURE_AUTOWIDTH
- "T"
-#endif
-#ifdef BB_FEATURE_LS_TIMESTAMPS
- "tu"
-#endif
-#ifdef BB_FEATURE_LS_SORTFILES
- "v"
-#endif
-#ifdef BB_FEATURE_AUTOWIDTH
- "w"
-#endif
- "x"
-#ifdef BB_FEATURE_LS_SORTFILES
- "X"
-#endif
-#ifdef BB_FEATURE_HUMAN_READABLE
- "h"
-#endif
- "k] [filenames...]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nList directory contents\n\n"
- "Options:\n"
- "\t-1\tlist files in a single column\n"
- "\t-A\tdo not list implied . and ..\n"
- "\t-a\tdo not hide entries starting with .\n"
- "\t-C\tlist entries by columns\n"
-#ifdef BB_FEATURE_LS_TIMESTAMPS
- "\t-c\twith -l: show ctime (the time of last\n"
- "\t\tmodification of file status information)\n"
-#endif
- "\t-d\tlist directory entries instead of contents\n"
-#ifdef BB_FEATURE_LS_TIMESTAMPS
- "\t-e\tlist both full date and full time\n"
-#endif
-#ifdef BB_FEATURE_LS_FILETYPES
- "\t-F\tappend indicator (one of */=@|) to entries\n"
-#endif
- "\t-i\tlist the i-node for each file\n"
- "\t-l\tuse a long listing format\n"
- "\t-n\tlist numeric UIDs and GIDs instead of names\n"
-#ifdef BB_FEATURE_LS_FILETYPES
- "\t-p\tappend indicator (one of /=@|) to entries\n"
-#endif
-#ifdef BB_FEATURE_LS_FOLLOWLINKS
- "\t-L\tlist entries pointed to by symbolic links\n"
-#endif
-#ifdef BB_FEATURE_LS_RECURSIVE
- "\t-R\tlist subdirectories recursively\n"
-#endif
-#ifdef BB_FEATURE_LS_SORTFILES
- "\t-r\tsort the listing in reverse order\n"
- "\t-S\tsort the listing by file size\n"
-#endif
- "\t-s\tlist the size of each file, in blocks\n"
-#ifdef BB_FEATURE_AUTOWIDTH
- "\t-T NUM\tassume Tabstop every NUM columns\n"
-#endif
-#ifdef BB_FEATURE_LS_TIMESTAMPS
- "\t-t\twith -l: show modification time (the time of last\n"
- "\t\tchange of the file)\n"
- "\t-u\twith -l: show access time (the time of last\n"
- "\t\taccess of the file)\n"
-#endif
-#ifdef BB_FEATURE_LS_SORTFILES
- "\t-v\tsort the listing by version\n"
-#endif
-#ifdef BB_FEATURE_AUTOWIDTH
- "\t-w NUM\tassume the terminal is NUM columns wide\n"
-#endif
- "\t-x\tlist entries by lines instead of by columns\n"
-#ifdef BB_FEATURE_LS_SORTFILES
- "\t-X\tsort the listing by extension\n"
-#endif
-
-#ifdef BB_FEATURE_HUMAN_READABLE
- "\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n"
- "\t-k\tprint sizes in kilobytes(default)\n"
-#else
- "\t-k\tprint sizes in kilobytes(compatability)"
-#endif
-
-#endif /* BB_FEATURE_TRIVIAL_HELP */
- ;
-#endif /* BB_LS */
-
-#if defined BB_LSMOD
-const char lsmod_usage[] =
- "lsmod"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nList the currently loaded kernel modules."
-#endif
- ;
-#endif
-
-#if defined BB_MAKEDEVS
-const char makedevs_usage[] =
- "makedevs NAME TYPE MAJOR MINOR FIRST LAST [s]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nCreates a range of block or character special files\n\n"
- "TYPEs include:\n"
- "\tb:\tMake a block (buffered) device.\n"
- "\tc or u:\tMake a character (un-buffered) device.\n"
- "\tp:\tMake a named pipe. MAJOR and MINOR are ignored for named pipes.\n\n"
- "FIRST specifies the number appended to NAME to create the first device.\n"
- "LAST specifies the number of the last item that should be created.\n"
- "If 's' is the last argument, the base device is created as well.\n\n"
- "For example:\n"
- "\tmakedevs /dev/ttyS c 4 66 2 63 -> ttyS2-ttyS63\n"
- "\tmakedevs /dev/hda b 3 0 0 8 s -> hda,hda1-hda8"
-#endif
- ;
-#endif
-
-#if defined BB_MD5SUM
-const char md5sum_usage[] =
- "md5sum [OPTION] [FILE]...\n"
- "or: md5sum [OPTION] -c [FILE]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrint or check MD5 checksums.\n\n"
- "Options:\n"
- "With no FILE, or when FILE is -, read standard input.\n\n"
- "\t-b\tread files in binary mode\n"
- "\t-c\tcheck MD5 sums against given list\n"
- "\t-t\tread files in text mode (default)\n"
- "\t-g\tread a string\n"
- "\nThe following two options are useful only when verifying checksums:\n"
- "\t-s,\tdon't output anything, status code shows success\n"
- "\t-w,\twarn about improperly formated MD5 checksum lines"
-#endif
- ;
-#endif
-
-#if defined BB_MKDIR
-const char mkdir_usage[] =
- "mkdir [OPTION] DIRECTORY..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nCreate the DIRECTORY(ies), if they do not already exist\n\n"
-
- "Options:\n"
- "\t-m\tset permission mode (as in chmod), not rwxrwxrwx - umask\n"
- "\t-p\tno error if existing, make parent directories as needed"
-#endif
- ;
-#endif
-
-#if defined BB_MKFIFO
-const char mkfifo_usage[] =
- "mkfifo [OPTIONS] name"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nCreates a named pipe (identical to 'mknod name p')\n\n"
- "Options:\n"
- "\t-m\tcreate the pipe using the specified mode (default a=rw)"
-#endif
- ;
-#endif
-
-#if defined BB_MKFS_MINIX
-const char mkfs_minix_usage[] =
- "mkfs.minix [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nMake a MINIX filesystem.\n\n"
- "Options:\n"
- "\t-c\t\tCheck the device for bad blocks\n"
- "\t-n [14|30]\tSpecify the maximum length of filenames\n"
- "\t-i INODES\tSpecify the number of inodes for the filesystem\n"
- "\t-l FILENAME\tRead the bad blocks list from FILENAME\n"
- "\t-v\t\tMake a Minix version 2 filesystem"
-#endif
- ;
-#endif
-
-#if defined BB_MKNOD
-const char mknod_usage[] =
- "mknod [OPTIONS] NAME TYPE MAJOR MINOR"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nCreate a special file (block, character, or pipe).\n\n"
- "Options:\n"
- "\t-m\tcreate the special file using the specified mode (default a=rw)\n\n"
- "TYPEs include:\n"
- "\tb:\tMake a block (buffered) device.\n"
- "\tc or u:\tMake a character (un-buffered) device.\n"
- "\tp:\tMake a named pipe. MAJOR and MINOR are ignored for named pipes."
-#endif
- ;
-#endif
-
-#if defined BB_MKSWAP
-const char mkswap_usage[] =
- "mkswap [-c] [-v0|-v1] device [block-count]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrepare a disk partition to be used as a swap partition.\n\n"
- "Options:\n" "\t-c\t\tCheck for read-ability.\n"
- "\t-v0\t\tMake version 0 swap [max 128 Megs].\n"
- "\t-v1\t\tMake version 1 swap [big!] (default for kernels > 2.1.117).\n"
- "\tblock-count\tNumber of block to use (default is entire partition)."
-#endif
- ;
-#endif
-
-#if defined BB_MKTEMP
-const char mktemp_usage[] =
- "mktemp [-q] TEMPLATE"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nCreates a temporary file with its name based on TEMPLATE.\n"
- "TEMPLATE is any name with six `Xs' (i.e. /tmp/temp.XXXXXX)."
-#endif
- ;
-#endif
-
-#if defined BB_MORE
-const char more_usage[] =
- "more [FILE ...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nMore is a filter for viewing FILE one screenful at a time."
-#endif
- ;
-#endif
-
-#if defined BB_MOUNT
-const char mount_usage[] =
- "mount [flags] device directory [-o options,more-options]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nMount a filesystem\n\n"
- "Flags:\n"
- "\t-a:\t\tMount all filesystems in fstab.\n"
-#ifdef BB_MTAB
- "\t-f:\t\t\"Fake\" mount. Add entry to mount table but don't mount it.\n"
- "\t-n:\t\tDon't write a mount table entry.\n"
-#endif
- "\t-o option:\tOne of many filesystem options, listed below.\n"
- "\t-r:\t\tMount the filesystem read-only.\n"
- "\t-t fs-type:\tSpecify the filesystem type.\n"
- "\t-w:\t\tMount for reading and writing (default).\n"
- "\n"
- "Options for use with the \"-o\" flag:\n"
- "\tasync/sync:\tWrites are asynchronous / synchronous.\n"
- "\tatime/noatime:\tEnable / disable updates to inode access times.\n"
- "\tdev/nodev:\tAllow use of special device files / disallow them.\n"
- "\texec/noexec:\tAllow use of executable files / disallow them.\n"
-#if defined BB_FEATURE_MOUNT_LOOP
- "\tloop:\t\tMounts a file via loop device.\n"
-#endif
- "\tsuid/nosuid:\tAllow set-user-id-root programs / disallow them.\n"
- "\tremount:\tRe-mount a currently-mounted filesystem, changing its flags.\n"
- "\tro/rw:\t\tMount for read-only / read-write.\n"
- "\nThere are EVEN MORE flags that are specific to each filesystem.\n"
- "You'll have to see the written documentation for those."
-#endif
- ;
-#endif
-
-#if defined BB_MT
-const char mt_usage[] =
- "mt [-f device] opcode value"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nControl magnetic tape drive operation\n"
- "\nAvailable 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 rew rewoffline seek setblk setdensity\n"
- "setpart tell unload unlock weof wset"
-#endif
- ;
-#endif
-
-#if defined BB_CP_MV
-const char mv_usage[] =
- "mv SOURCE DEST\n"
- " or: mv SOURCE... DIRECTORY"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nRename SOURCE to DEST, or move SOURCE(s) to DIRECTORY."
-#endif
- ;
-#endif
-
-#if defined BB_NC
-const char nc_usage[] =
- "nc [-p PORT] IP PORT\n"
- " or: nc -l -p PORT"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nNetcat opens a pipe to IP:PORT\n"
- "Options:\n"
- "\t-l\tListen on the socket.\n"
- "\t-p PORT\tBind the local port to PORT."
-#endif
- ;
-#endif
-
-#if defined BB_NSLOOKUP
-const char nslookup_usage[] =
- "nslookup [HOST]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nQueries the nameserver for the IP address of the given HOST"
-#endif
-;
-#endif
-
-#if defined BB_PING
-#if defined BB_FEATURE_SIMPLE_PING
-const char ping_usage[] =
- "ping host"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nSend ICMP ECHO_REQUEST packets to network hosts"
-#endif
- ;
-#else /* ! defined BB_FEATURE_SIMPLE_PING */
-const char ping_usage[] =
- "ping [OPTION]... host"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nSend ICMP ECHO_REQUEST packets to network hosts.\n\n"
- "Options:\n"
- "\t-c COUNT\tSend only COUNT pings.\n"
- "\t-s SIZE\t\tSend SIZE data bytes in packets (default=56).\n"
- "\t-q\t\tQuiet mode, only displays output at start\n"
- "\t\t\tand when finished."
-#endif
- ;
-#endif
-#endif
-
-#if defined BB_PIVOT_ROOT
-const char pivot_root_usage[] =
- "pivot_root new_root put_old"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nMove the current root file system to put_old and make new_root\n"
- "the new root file system."
-#endif
- ;
-#endif
-
-#if defined BB_POWEROFF
-const char poweroff_usage[] =
- "poweroff"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nHalt the system and request that the kernel shut off the power."
-#endif
- ;
-#endif
-
-#if defined BB_PRINTF
-const char printf_usage[] =
- "printf FORMAT [ARGUMENT...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nFormats and prints ARGUMENT(s) according to FORMAT,\n"
- "Where FORMAT controls the output exactly as in C printf."
-#endif
- ;
-#endif
-
-#if defined BB_PS
-const char ps_usage[] =
- "ps"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nReport process status\n"
- "\nThis version of ps accepts no options."
-#endif
- ;
-#endif
-
-#if defined BB_PWD
-const char pwd_usage[] =
- "pwd"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrint the full filename of the current working directory."
-#endif
- ;
-#endif
-
-#if defined BB_RDATE
-const char rdate_usage[] =
- "rdate [OPTION] HOST"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nGet and possibly set the system date and time from a remote HOST.\n"
- "Options:\n"
- "\t-s\tSet the system date and time (default).\n"
- "\t-p\tPrint the date and time."
-#endif
- ;
-#endif
-
-#if defined BB_READLINK
-const char readlink_usage[] =
- "readlink"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nRead a symbolic link."
-#endif
- ;
-#endif
-
-#if defined BB_REBOOT
-const char reboot_usage[] =
- "reboot"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nReboot the system."
-#endif
- ;
-#endif
-
-#if defined BB_RENICE
-const char renice_usage[] =
- "renice priority pid [pid ...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nChanges priority of running processes. Allowed priorities range\n"
- "from 20 (the process runs only when nothing else is running) to 0\n"
- "(default priority) to -20 (almost nothing else ever gets to run)."
-#endif
- ;
-#endif
-
-
-#if defined BB_RESET
-const char reset_usage[] =
- "reset"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nResets the screen."
-#endif
- ;
-#endif
-
-#if defined BB_RM
-const char rm_usage[] =
- "rm [OPTION]... FILE..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nRemove (unlink) the FILE(s). You may use '--' to\n"
- "indicate that all following arguments are non-options.\n\n"
- "Options:\n"
- "\t-f\t\tremove existing destinations, never prompt\n"
- "\t-r or -R\tremove the contents of directories recursively"
-#endif
- ;
-#endif
-
-#if defined BB_RMDIR
-const char rmdir_usage[] =
- "rmdir [OPTION]... DIRECTORY..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nRemove the DIRECTORY(ies), if they are empty."
-#endif
- ;
-#endif
-
-#if defined BB_RMMOD
-const char rmmod_usage[] =
- "rmmod [OPTION]... [MODULE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nUnloads the specified kernel modules from the kernel.\n\n"
- "Options:\n"
- "\t-a\tTry to remove all unused kernel modules."
-#endif
- ;
-#endif
-
-#if defined BB_ROUTE
-const char route_usage[] =
- "route [{add|del|flush}]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nEdit the kernel's routing tables"
-#endif
- ;
-#endif
-
-#if defined BB_RPMUNPACK
-const char rpmunpack_usage[] =
- "rpmunpack < package.rpm | gunzip | cpio -idmuv"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nExtracts an rpm archive."
-#endif
- ;
-#endif
-
-#if defined BB_SED
-const char sed_usage[] =
- "sed [-Vhnef] pattern [files...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\n"
- "-n\t\tsuppress automatic printing of pattern space\n"
- "-e script\tadd the script to the commands to be executed\n"
- "-f scriptfile\tadd the contents of script-file to the commands to be executed\n"
- "-h\t\tdisplay this help message\n"
- "\n"
- "If no -e or -f is given, the first non-option argument is taken as the\n"
- "sed script to interpret. All remaining arguments are names of input\n"
- "files; if no input files are specified, then the standard input is read."
-#endif
- ;
-#endif
-
-#if defined BB_SETKEYCODES
-const char setkeycodes_usage[] =
- "setkeycodes SCANCODE KEYCODE ..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nSet 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"
-#endif
- ;
-#endif
-
-#if defined BB_SH
-const char shell_usage[] =
- "sh [FILE]...\n"
- " or: sh -c command [args]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nlash: The BusyBox command interpreter (shell)."
-#endif
- ;
-#endif
-
-#if defined BB_SLEEP
-const char sleep_usage[] =
- "sleep N"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPause for N seconds."
-#endif
- ;
-#endif
-
-#if defined BB_SORT
-const char sort_usage[] =
- "sort [-n]"
-#ifdef BB_FEATURE_SORT_REVERSE
- " [-r]"
-#endif
- " [FILE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nSorts lines of text in the specified files"
-#endif
- ;
-#endif
-
-#if defined BB_STTY
-const char stty_usage[] =
- "stty [-a|g] [-F device] [SETTING]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nWithout arguments, prints baud rate, line discipline,"
- "\nand deviations from stty sane."
- "\n -F device open and use the specified device instead of stdin"
- "\n -a print all current settings in human-readable form. Or"
- "\n -g print in a stty-readable form"
- "\n [SETTING] see in documentation"
-#endif
- ;
-#endif
-
-#if defined BB_SWAPONOFF
-const char swapoff_usage[] =
- "swapoff [OPTION] [device]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nStop swapping virtual memory pages on the given device.\n\n"
- "Options:\n"
- "\t-a\tStop swapping on all swap devices"
-#endif
- ;
-#endif
-
-#if defined BB_SWAPONOFF
-const char swapon_usage[] =
- "swapon [OPTION] [device]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nStart swapping virtual memory pages on the given device.\n\n"
- "Options:\n"
- "\t-a\tStart swapping on all swap devices"
-#endif
- ;
-#endif
-
-#if defined BB_SYNC
-const char sync_usage[] =
- "sync"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nWrite all buffered filesystem blocks to disk."
-#endif
- ;
-#endif
-
-#if defined BB_SYSLOGD
-const char syslogd_usage[] =
- "syslogd [OPTION]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nLinux system and kernel (provides klogd) logging utility.\n"
- "Note that this version of syslogd/klogd ignores /etc/syslog.conf.\n\n"
- "Options:\n"
- "\t-m NUM\t\tInterval between MARK lines (default=20min, 0=off)\n"
- "\t-n\t\tRun as a foreground process\n"
-#ifdef BB_FEATURE_KLOGD
- "\t-K\t\tDo not start up the klogd process\n"
-#endif
- "\t-O FILE\t\tUse an alternate log file (default=/var/log/messages)"
-#ifdef BB_FEATURE_REMOTE_LOG
- "\n\t-R HOST[:PORT]\t\tLog remotely to IP or hostname on PORT (default PORT=514/UDP)\n"
- "\t-L\t\tLog locally as well as network logging (default is network only)"
-#endif
-#endif
- ;
-#endif
-
-#if defined BB_TAIL
-const char tail_usage[] =
- "tail [OPTION]... [FILE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrint last 10 lines of each FILE to standard output.\n"
- "With more than one FILE, precede each with a header giving the\n"
- "file name. With no FILE, or when FILE is -, read standard input.\n\n"
- "Options:\n"
-#ifndef BB_FEATURE_SIMPLE_TAIL
- "\t-c N[kbm]\toutput the last N bytes\n"
-#endif
- "\t-n N[kbm]\tprint last N lines instead of last 10\n"
- "\t-f\t\toutput data as the file grows"
-#ifndef BB_FEATURE_SIMPLE_TAIL
- "\n\t-q\t\tnever output headers giving file names\n"
- "\t-s SEC\t\twait SEC seconds between reads with -f\n"
- "\t-v\t\talways output headers giving file names\n\n"
- "If the first character of N (bytes or lines) is a `+', output begins with \n"
- "the Nth item from the start of each file, otherwise, print the last N items\n"
- "in the file. N bytes may be suffixed by k (x1024), b (x512), or m (1024^2)."
-//#else
-// "\nIf the first character of N (bytes or lines) is a `+', output begins with \n"
-// "the Nth item from the start of each file."
-#endif
-#endif
- ;
-#endif
-
-#if defined BB_TAR
-const char tar_usage[] =
-#ifdef BB_FEATURE_TAR_CREATE
- "tar -[cxtvO] "
-#else
- "tar -[xtvO] "
-#endif
-#if defined BB_FEATURE_TAR_EXCLUDE
- "[--exclude File] "
- "[-X File]"
-#endif
- "[-f tarFile] [FILE(s)] ..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nCreate, extract, or list files from a tar file.\n\n"
- "Main operation mode:\n"
-#ifdef BB_FEATURE_TAR_CREATE
- "\tc\t\tcreate\n"
-#endif
- "\tx\t\textract\n"
- "\tt\t\tlist\n"
- "\nFile selection:\n"
- "\tf\t\tname of tarfile or \"-\" for stdin\n"
- "\tO\t\textract to stdout\n"
-#if defined BB_FEATURE_TAR_EXCLUDE
- "\texclude\t\tfile to exclude\n"
- "\tX\t\tfile with names to exclude\n"
-#endif
- "\nInformative output:\n"
- "\tv\t\tverbosely list files processed"
-#endif
- ;
-#endif
-
-#if defined BB_TEE
-const char tee_usage[] =
- "tee [OPTION]... [FILE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nCopy standard input to each FILE, and also to standard output.\n\n"
- "Options:\n" "\t-a\tappend to the given FILEs, do not overwrite"
-#endif
- ;
-#endif
-
-#if defined BB_TELNET
-const char telnet_usage[] =
- "telnet host [port]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nTelnet is used to establish interactive communication with another\n"
- "computer over a network using the TELNET protocol."
-#endif
- ;
-#endif
-
-#if defined BB_TEST
-const char test_usage[] =
- "test EXPRESSION\n"
- "or [ EXPRESSION ]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nChecks file types and compares values returning an exit\n"
- "code determined by the value of EXPRESSION."
-#endif
- ;
-#endif
-
-#if defined BB_TOUCH
-const char touch_usage[] =
- "touch [-c] file [file ...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nUpdate the last-modified date on the given file[s].\n\n"
- "Options:\n"
- "\t-c\tDo not create any files"
-#endif
- ;
-#endif
-
-#if defined BB_TR
-const char tr_usage[] =
- "tr [-cds] STRING1 [STRING2]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nTranslate, squeeze, and/or delete characters from\n"
- "standard input, writing to standard output.\n\n"
- "Options:\n"
- "\t-c\ttake complement of STRING1\n"
- "\t-d\tdelete input characters coded STRING1\n"
- "\t-s\tsqueeze multiple output characters of STRING2 into one character"
-#endif
- ;
-#endif
-
-#if defined BB_TRUE_FALSE
-const char true_usage[] =
- "true"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nReturn an exit code of TRUE (0)."
-#endif
- ;
-#endif
-
-#if defined BB_TTY
-const char tty_usage[] =
- "tty"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrint the file name of the terminal connected to standard input.\n\n"
- "Options:\n"
- "\t-s\tprint nothing, only return an exit status"
-#endif
- ;
-#endif
-
-#if defined BB_UMOUNT
-const char umount_usage[] =
- "umount [flags] filesystem|directory"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\nUnmount file systems\n"
- "\nFlags:\n" "\t-a:\tUnmount all file systems"
-#ifdef BB_MTAB
- " in /etc/mtab\n\t-n:\tDon't erase /etc/mtab entries\n"
-#else
- "\n"
-#endif
- "\t-r:\tTry to remount devices as read-only if mount is busy"
-#if defined BB_FEATURE_MOUNT_FORCE
- "\n\t-f:\tForce filesystem umount (i.e. unreachable NFS server)"
-#endif
-#if defined BB_FEATURE_MOUNT_LOOP
- "\n\t-l:\tDo not free loop device (if a loop device has been used)"
-#endif
-#endif
- ;
-#endif
-
-#if defined BB_UNAME
-const char uname_usage[] =
- "uname [OPTION]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrint certain system information. With no OPTION, same as -s.\n\n"
- "Options:\n"
- "\t-a\tprint all information\n"
- "\t-m\tthe machine (hardware) type\n"
- "\t-n\tprint the machine's network node hostname\n"
- "\t-r\tprint the operating system release\n"
- "\t-s\tprint the operating system name\n"
-
- "\t-p\tprint the host processor type\n"
- "\t-v\tprint the operating system version"
-#endif
- ;
-#endif
-
-#if defined BB_UNIQ
-const char uniq_usage[] =
- "uniq [OPTION]... [INPUT [OUTPUT]]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nDiscard all but one of successive identical lines from INPUT\n"
- "(or standard input), writing to OUTPUT (or standard output).\n"
- "Options:\n"
- "\t-c\tprefix lines by the number of occurrences\n"
- "\t-d\tonly print duplicate lines\n"
- "\t-u\tonly print unique lines"
-#endif
- ;
-#endif
-
-#if defined BB_UNIX2DOS
-const char unix2dos_usage[] =
- "unix2dos < unixfile > dosfile"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nConverts a text file from unix format to dos format."
-#endif
- ;
-#endif
-
-#if defined BB_UPDATE
-const char update_usage[] =
- "update [options]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPeriodically flushes filesystem buffers.\n\n"
- "Options:\n"
- "\t-S\tforce use of sync(2) instead of flushing\n"
- "\t-s SECS\tcall sync this often (default 30)\n"
- "\t-f SECS\tflush some buffers this often (default 5)"
-#endif
- ;
-#endif
-
-#if defined BB_UPTIME
-const char uptime_usage[] =
- "uptime"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nDisplay the time since the last boot."
-#endif
- ;
-#endif
-
-#if defined BB_USLEEP
-const char usleep_usage[] =
- "usleep N"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPause for N microseconds."
-#endif
- ;
-#endif
-
-#if defined BB_UUDECODE
-const char uudecode_usage[] =
- "uudecode [FILE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nUudecode a file that is uuencoded.\n\n"
- "Options:\n"
- "\t-o FILE\tdirect output to FILE"
-#endif
- ;
-#endif
-
-#if defined BB_UUENCODE
-const char uuencode_usage[] =
- "uuencode [OPTION] [INFILE] REMOTEFILE"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nUuencode a file.\n\n"
- "Options:\n"
- "\t-m\tuse base64 encoding as of RFC1521"
-#endif
- ;
-#endif
-
-#if defined BB_WATCHDOG
-const char watchdog_usage[] =
- "watchdog dev\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\nPeriodically write to watchdog device \"dev\".\n"
-#endif
- ;
-#endif
-
-#if defined BB_WC
-const char wc_usage[] =
- "wc [OPTION]... [FILE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrint line, word, and byte counts for each FILE, and a total line if\n"
- "more than one FILE is specified. With no FILE, read standard input.\n\n"
- "Options:\n"
- "\t-c\tprint the byte counts\n"
- "\t-l\tprint the newline counts\n"
-
- "\t-L\tprint the length of the longest line\n"
- "\t-w\tprint the word counts"
-#endif
- ;
-#endif
-
-#if defined BB_WGET
-const char wget_usage[] = "wget [-c] [-O file] url"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nwget retrieves files via HTTP\n\n"
- "Options:\n"
- "\t-c\tcontinue retrieval of aborted transfers\n"
- "\t-O\tsave to filename ('-' for stdout)"
-#endif
- ;
-#endif
-
-#if defined BB_WHICH
-const char which_usage[] =
- "which [COMMAND ...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nLocates a COMMAND."
-#endif
- ;
-#endif
-
-#if defined BB_WHOAMI
-const char whoami_usage[] =
- "whoami"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrints the user name associated with the current effective user id."
-#endif
- ;
-#endif
-
-#if defined BB_XARGS
-const char xargs_usage[] = "xargs [COMMAND] [ARGS...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nExecutes COMMAND on every item given by standard input."
-#endif
- ;
-#endif
-
-#if defined BB_YES
-const char yes_usage[] =
- "yes [OPTION]... [STRING]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nRepeatedly outputs a line with all specified STRING(s), or `y'."
-#endif
- ;
-#endif
-
+#define USAGE_MESSAGES
+#include <usage.h>
diff --git a/ar.c b/ar.c
index 7a5169e..59f5181 100644
--- a/ar.c
+++ b/ar.c
@@ -163,13 +163,13 @@
funct |= extract_to_file;
break;
default:
- usage(ar_usage);
+ show_usage();
}
}
/* check the src filename was specified */
if (optind == argc)
- usage(ar_usage);
+ show_usage();
if ( (srcFd = open(argv[optind], O_RDONLY)) < 0)
error_msg_and_die("Cannot read %s", argv[optind]);
diff --git a/archival/ar.c b/archival/ar.c
index 7a5169e..59f5181 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -163,13 +163,13 @@
funct |= extract_to_file;
break;
default:
- usage(ar_usage);
+ show_usage();
}
}
/* check the src filename was specified */
if (optind == argc)
- usage(ar_usage);
+ show_usage();
if ( (srcFd = open(argv[optind], O_RDONLY)) < 0)
error_msg_and_die("Cannot read %s", argv[optind]);
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 4a5c6f4..6e309eb 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -840,7 +840,7 @@
case 'c':
return dpkg_configure(packages, status);
default :
- usage(dpkg_usage);
+ show_usage();
return EXIT_FAILURE;
}
-}
\ No newline at end of file
+}
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index aed0ba3..c084381 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -141,14 +141,12 @@
break;
*/
default:
- usage(dpkg_deb_usage);
- return EXIT_FAILURE;
+ show_usage();
}
}
if (((optind + 1 ) > argc) || (optflag == 0)) {
- usage(dpkg_deb_usage);
- return(EXIT_FAILURE);
+ show_usage();
}
if ((optflag & dpkg_deb_control) || (optflag & dpkg_deb_extract) || (optflag & dpkg_deb_verbose_extract)) {
if ( (optind + 1) == argc ) {
diff --git a/archival/gunzip.c b/archival/gunzip.c
index 48a4608..bf8812d 100644
--- a/archival/gunzip.c
+++ b/archival/gunzip.c
@@ -1250,7 +1250,7 @@
force = 1;
break;
default:
- usage(gunzip_usage);
+ show_usage();
}
}
}
@@ -1275,7 +1275,7 @@
} else {
/* Open up the input file */
if (argc <= 0)
- usage(gunzip_usage);
+ show_usage();
if (strlen(*argv) > MAX_PATH_LEN) {
error_msg(name_too_long);
exit(WARNING);
diff --git a/archival/gzip.c b/archival/gzip.c
index 75f3caa..3cbef4e 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -1812,7 +1812,7 @@
case 'd':
exit(gunzip_main(argc, argv));
default:
- usage(gzip_usage);
+ show_usage();
}
}
}
@@ -1865,7 +1865,7 @@
} else {
/* Open up the input file */
if (argc <= 0)
- usage(gzip_usage);
+ show_usage();
strncpy(ifname, *argv, MAX_PATH_LEN);
/* Open input file */
diff --git a/archival/tar.c b/archival/tar.c
index fb0fcc6..62f1b1d 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -214,7 +214,7 @@
int opt;
if (argc <= 1)
- usage(tar_usage);
+ show_usage();
if (argv[1][0] != '-') {
char *tmp = xmalloc(strlen(argv[1]) + 2);
@@ -283,7 +283,7 @@
break;
#endif
default:
- usage(tar_usage);
+ show_usage();
}
}
diff --git a/basename.c b/basename.c
index cba003d..da59a86 100644
--- a/basename.c
+++ b/basename.c
@@ -31,7 +31,7 @@
char *s;
if ((argc < 2) || (**(argv + 1) == '-')) {
- usage(basename_usage);
+ show_usage();
}
argv++;
diff --git a/busybox.c b/busybox.c
index 1409efa..6c1070f 100644
--- a/busybox.c
+++ b/busybox.c
@@ -87,7 +87,6 @@
int main(int argc, char **argv)
{
- struct BB_applet *applet;
const char *s;
for (s = applet_name = argv[0]; *s != '\0';) {
@@ -103,13 +102,7 @@
}
#endif
- /* Do a binary search to find the applet entry given the name. */
- if ((applet = find_applet_by_name(applet_name)) != NULL) {
- if (applet->usage && argv[1] && strcmp(argv[1], "--help") == 0)
- usage(applet->usage);
- exit((*(applet->main)) (argc, argv));
- }
-
+ run_applet_by_name(applet_name, argc, argv);
error_msg_and_die("applet not found");
}
diff --git a/busybox.h b/busybox.h
index 39580b5..aef537b 100644
--- a/busybox.h
+++ b/busybox.h
@@ -72,7 +72,7 @@
const char* name;
int (*main)(int argc, char** argv);
enum Location location;
- const char* usage;
+ int usage_index;
};
/* From busybox.c */
extern const struct BB_applet applets[];
@@ -87,9 +87,15 @@
#include "applets.h"
#undef PROTOTYPES
+#define APPLET_ENUM
+enum APPLET_INDEX_NUMBERS {
+#include "applets.h"
+};
+#undef APPLET_ENUM
+
extern const char *applet_name;
-extern void usage(const char *usage) __attribute__ ((noreturn));
+extern void show_usage(void) __attribute__ ((noreturn));
extern void error_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
extern void error_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2)));
extern void perror_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
@@ -153,6 +159,7 @@
extern FILE *xfopen(const char *path, const char *mode);
extern void chomp(char *s);
extern struct BB_applet *find_applet_by_name(const char *name);
+void run_applet_by_name(const char *name, int argc, char **argv);
#ifndef DMALLOC
extern void *xmalloc (size_t size);
diff --git a/chmod_chown_chgrp.c b/chmod_chown_chgrp.c
index 81db101..9363bd7 100644
--- a/chmod_chown_chgrp.c
+++ b/chmod_chown_chgrp.c
@@ -81,17 +81,13 @@
int recursiveFlag = FALSE;
char *groupName=NULL;
char *p=NULL;
- const char *appUsage;
whichApp = (applet_name[2]=='o')? /* chown */
CHOWN_APP : (applet_name[2]=='m')? /* chmod */
CHMOD_APP : CHGRP_APP;
- appUsage = (whichApp == CHOWN_APP)?
- chown_usage : (whichApp == CHMOD_APP) ? chmod_usage : chgrp_usage;
-
if (argc < 2)
- usage(appUsage);
+ show_usage();
argv++;
/* Parse options */
diff --git a/chroot.c b/chroot.c
index cd8101e..e721e1f 100644
--- a/chroot.c
+++ b/chroot.c
@@ -33,7 +33,7 @@
char *prog;
if ((argc < 2) || (**(argv + 1) == '-')) {
- usage(chroot_usage);
+ show_usage();
}
argc--;
argv++;
diff --git a/chvt.c b/chvt.c
index c715e67..f2e6d5f 100644
--- a/chvt.c
+++ b/chvt.c
@@ -20,7 +20,7 @@
int fd, num;
if ((argc != 2) || (**(argv + 1) == '-'))
- usage (chvt_usage);
+ show_usage();
fd = get_console_fd("/dev/console");
num = atoi(argv[1]);
if (ioctl(fd, VT_ACTIVATE, num))
diff --git a/cmp.c b/cmp.c
index dd70261..c04b6e1 100644
--- a/cmp.c
+++ b/cmp.c
@@ -36,7 +36,7 @@
/* parse argv[] */
if (argc < 2 || 3 < argc)
- usage(cmp_usage);
+ show_usage();
fp1 = xfopen(argv[1], "r");
if (argv[2] != NULL) {
diff --git a/console-tools/chvt.c b/console-tools/chvt.c
index c715e67..f2e6d5f 100644
--- a/console-tools/chvt.c
+++ b/console-tools/chvt.c
@@ -20,7 +20,7 @@
int fd, num;
if ((argc != 2) || (**(argv + 1) == '-'))
- usage (chvt_usage);
+ show_usage();
fd = get_console_fd("/dev/console");
num = atoi(argv[1]);
if (ioctl(fd, VT_ACTIVATE, num))
diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c
index b51fbae..8c390c2 100644
--- a/console-tools/deallocvt.c
+++ b/console-tools/deallocvt.c
@@ -19,7 +19,7 @@
//if ((argc > 2) || ((argv == 2) && (**(argv + 1) == '-')))
if (argc > 2)
- usage(deallocvt_usage);
+ show_usage();
fd = get_console_fd("/dev/console");
diff --git a/console-tools/dumpkmap.c b/console-tools/dumpkmap.c
index 4ab711e..b9f1bd2 100644
--- a/console-tools/dumpkmap.c
+++ b/console-tools/dumpkmap.c
@@ -48,7 +48,7 @@
char flags[MAX_NR_KEYMAPS], magic[] = "bkeymap";
if (argc>=2 && *argv[1]=='-') {
- usage(dumpkmap_usage);
+ show_usage();
}
fd = open("/dev/tty0", O_RDWR);
diff --git a/console-tools/loadacm.c b/console-tools/loadacm.c
index 345a277..6422137 100644
--- a/console-tools/loadacm.c
+++ b/console-tools/loadacm.c
@@ -34,7 +34,7 @@
int fd;
if (argc>=2 && *argv[1]=='-') {
- usage(loadacm_usage);
+ show_usage();
}
fd = open("/dev/tty", O_RDWR);
diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index ec3e505..d7bd7e8 100644
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -44,7 +44,7 @@
int fd;
if (argc != 1)
- usage(loadfont_usage);
+ show_usage();
fd = open("/dev/tty0", O_RDWR);
if (fd < 0)
diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c
index a98601a..5ecd819 100644
--- a/console-tools/loadkmap.c
+++ b/console-tools/loadkmap.c
@@ -51,7 +51,7 @@
char flags[MAX_NR_KEYMAPS], buff[7];
if (argc != 1)
- usage(loadkmap_usage);
+ show_usage();
fd = open("/dev/tty0", O_RDWR);
if (fd < 0)
diff --git a/console-tools/setkeycodes.c b/console-tools/setkeycodes.c
index 3e511ad..0be4724 100644
--- a/console-tools/setkeycodes.c
+++ b/console-tools/setkeycodes.c
@@ -43,7 +43,7 @@
struct kbkeycode a;
if (argc % 2 != 1 || argc < 2) {
- usage(setkeycodes_usage);
+ show_usage();
}
fd = get_console_fd("/dev/console");
diff --git a/coreutils/basename.c b/coreutils/basename.c
index cba003d..da59a86 100644
--- a/coreutils/basename.c
+++ b/coreutils/basename.c
@@ -31,7 +31,7 @@
char *s;
if ((argc < 2) || (**(argv + 1) == '-')) {
- usage(basename_usage);
+ show_usage();
}
argv++;
diff --git a/coreutils/chroot.c b/coreutils/chroot.c
index cd8101e..e721e1f 100644
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -33,7 +33,7 @@
char *prog;
if ((argc < 2) || (**(argv + 1) == '-')) {
- usage(chroot_usage);
+ show_usage();
}
argc--;
argv++;
diff --git a/coreutils/cmp.c b/coreutils/cmp.c
index dd70261..c04b6e1 100644
--- a/coreutils/cmp.c
+++ b/coreutils/cmp.c
@@ -36,7 +36,7 @@
/* parse argv[] */
if (argc < 2 || 3 < argc)
- usage(cmp_usage);
+ show_usage();
fp1 = xfopen(argv[1], "r");
if (argv[2] != NULL) {
diff --git a/coreutils/date.c b/coreutils/date.c
index 8b6a062..21d31bb 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -151,7 +151,7 @@
case 's':
set_time = 1;
if ((date_str != NULL) || ((date_str = optarg) == NULL)) {
- usage(date_usage);
+ show_usage();
}
break;
case 'u':
@@ -162,10 +162,10 @@
case 'd':
use_arg = 1;
if ((date_str != NULL) || ((date_str = optarg) == NULL))
- usage(date_usage);
+ show_usage();
break;
default:
- usage(date_usage);
+ show_usage();
}
}
@@ -178,7 +178,7 @@
#if 0
else {
error_msg("date_str='%s' date_fmt='%s'\n", date_str, date_fmt);
- usage(date_usage);
+ show_usage();
}
#endif
diff --git a/coreutils/dd.c b/coreutils/dd.c
index 75bbfba..e445e04 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -84,7 +84,7 @@
buf++;
}
} else
- usage(dd_usage);
+ show_usage();
}
buf = xmalloc(bs);
diff --git a/coreutils/df.c b/coreutils/df.c
index 5591979..8b6726b 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -143,7 +143,7 @@
return status;
print_df_usage:
- usage(df_usage);
+ show_usage();
return(FALSE);
}
diff --git a/coreutils/dirname.c b/coreutils/dirname.c
index 2e11a69..e34ecf8 100644
--- a/coreutils/dirname.c
+++ b/coreutils/dirname.c
@@ -30,7 +30,7 @@
char* s;
if ((argc < 2) || (**(argv + 1) == '-'))
- usage(dirname_usage);
+ show_usage();
argv++;
s=*argv+strlen(*argv)-1;
diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c
index 9fd952c..3242361 100644
--- a/coreutils/dos2unix.c
+++ b/coreutils/dos2unix.c
@@ -31,7 +31,7 @@
if (argc > 1) {
c = *argv[1];
if (c == '-') {
- usage(dos2unix_usage);
+ show_usage();
}
}
c = getchar();
diff --git a/coreutils/du.c b/coreutils/du.c
index c56afbc..516f4c9 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -163,7 +163,7 @@
case 'k': break;
#endif
default:
- usage(du_usage);
+ show_usage();
}
}
@@ -187,7 +187,7 @@
return status;
}
-/* $Id: du.c,v 1.36 2001/01/27 09:33:38 andersen Exp $ */
+/* $Id: du.c,v 1.37 2001/02/14 21:23:05 andersen Exp $ */
/*
Local Variables:
c-file-style: "linux"
diff --git a/coreutils/head.c b/coreutils/head.c
index 7d87f32..a2d7744 100644
--- a/coreutils/head.c
+++ b/coreutils/head.c
@@ -57,7 +57,7 @@
break;
/* fallthrough */
default:
- usage(head_usage);
+ show_usage();
}
}
diff --git a/coreutils/id.c b/coreutils/id.c
index 650e3db..3667b32 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -53,11 +53,11 @@
name_not_number++;
break;
default:
- usage(id_usage);
+ show_usage();
}
}
- if (no_user && no_group) usage(id_usage);
+ if (no_user && no_group) show_usage();
if (argv[optind] == NULL) {
if (print_real) {
diff --git a/coreutils/length.c b/coreutils/length.c
index 1ab4e3a..9119adc 100644
--- a/coreutils/length.c
+++ b/coreutils/length.c
@@ -7,7 +7,7 @@
extern int length_main(int argc, char **argv)
{
if (argc != 2 || **(argv + 1) == '-')
- usage(length_usage);
+ show_usage();
printf("%lu\n", (long)strlen(argv[1]));
return EXIT_SUCCESS;
}
diff --git a/coreutils/ln.c b/coreutils/ln.c
index 54e81f4..9dc7f5d 100644
--- a/coreutils/ln.c
+++ b/coreutils/ln.c
@@ -101,7 +101,7 @@
flag |= LN_NODEREFERENCE;
break;
default:
- usage(ln_usage);
+ show_usage();
}
}
while(optind<(argc-1)) {
diff --git a/coreutils/logname.c b/coreutils/logname.c
index d9056c6..a1887aa 100644
--- a/coreutils/logname.c
+++ b/coreutils/logname.c
@@ -30,7 +30,7 @@
char user[9];
if (argc > 1)
- usage(logname_usage);
+ show_usage();
my_getpwuid(user, geteuid());
if (*user) {
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 42b2445..06e23e6 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -928,5 +928,5 @@
return(status);
print_usage_message:
- usage(ls_usage);
+ show_usage();
}
diff --git a/coreutils/md5sum.c b/coreutils/md5sum.c
index 97a9400..3decafd 100644
--- a/coreutils/md5sum.c
+++ b/coreutils/md5sum.c
@@ -850,7 +850,7 @@
break;
default:
- usage(md5sum_usage);
+ show_usage();
}
}
diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index 299f298..285d34f 100644
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -48,7 +48,7 @@
switch (**argv) {
case 'm':
if (--argc == 0)
- usage(mkdir_usage);
+ show_usage();
/* Find the specified modes */
mode = 0;
if (parse_mode(*(++argv), &mode) == FALSE) {
@@ -63,7 +63,7 @@
parentFlag = TRUE;
break;
default:
- usage(mkdir_usage);
+ show_usage();
}
}
argc--;
@@ -71,7 +71,7 @@
}
if (argc < 1) {
- usage(mkdir_usage);
+ show_usage();
}
while (argc > 0) {
diff --git a/coreutils/mkfifo.c b/coreutils/mkfifo.c
index b31e6f1..56a04f7 100644
--- a/coreutils/mkfifo.c
+++ b/coreutils/mkfifo.c
@@ -37,7 +37,7 @@
/* Parse any options */
while (argc > 1) {
if (**argv != '-')
- usage(mkfifo_usage);
+ show_usage();
thisarg = *argv;
thisarg++;
switch (*thisarg) {
@@ -47,13 +47,13 @@
parse_mode(*argv, &mode);
break;
default:
- usage(mkfifo_usage);
+ show_usage();
}
argc--;
argv++;
}
if (argc < 1 || *argv[0] == '-')
- usage(mkfifo_usage);
+ show_usage();
if (mkfifo(*argv, mode) < 0)
perror_msg_and_die("mkfifo");
return EXIT_SUCCESS;
diff --git a/coreutils/mknod.c b/coreutils/mknod.c
index c761aea..73f6e06 100644
--- a/coreutils/mknod.c
+++ b/coreutils/mknod.c
@@ -53,13 +53,13 @@
umask(0);
break;
default:
- usage(mknod_usage);
+ show_usage();
}
argc--;
argv++;
}
if (argc != 4 && argc != 2) {
- usage(mknod_usage);
+ show_usage();
}
switch (argv[1][0]) {
case 'c':
@@ -72,11 +72,11 @@
case 'p':
mode = S_IFIFO;
if (argc!=2) {
- usage(mknod_usage);
+ show_usage();
}
break;
default:
- usage(mknod_usage);
+ show_usage();
}
if (mode == S_IFCHR || mode == S_IFBLK) {
diff --git a/coreutils/printf.c b/coreutils/printf.c
index 72bc7ae..26a200e 100644
--- a/coreutils/printf.c
+++ b/coreutils/printf.c
@@ -143,7 +143,7 @@
exit_status = 0;
if (argc <= 1 || **(argv + 1) == '-') {
- usage(printf_usage);
+ show_usage();
}
format = argv[1];
diff --git a/coreutils/rm.c b/coreutils/rm.c
index ce293a2..5660767 100644
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -84,7 +84,7 @@
stopIt = TRUE;
break;
default:
- usage(rm_usage);
+ show_usage();
}
argc--;
argv++;
@@ -94,7 +94,7 @@
}
if (argc < 1 && forceFlag == FALSE) {
- usage(rm_usage);
+ show_usage();
}
while (argc-- > 0) {
diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c
index 86346dd..6266ce1 100644
--- a/coreutils/rmdir.c
+++ b/coreutils/rmdir.c
@@ -33,7 +33,7 @@
int status = EXIT_SUCCESS;
if (argc == 1 || **(argv + 1) == '-')
- usage(rmdir_usage);
+ show_usage();
while (--argc > 0) {
if (rmdir(*(++argv)) == -1) {
diff --git a/coreutils/sleep.c b/coreutils/sleep.c
index 61b7ce4..d21af19 100644
--- a/coreutils/sleep.c
+++ b/coreutils/sleep.c
@@ -29,7 +29,7 @@
extern int sleep_main(int argc, char **argv)
{
if ((argc < 2) || (**(argv + 1) == '-')) {
- usage(sleep_usage);
+ show_usage();
}
if (sleep(atoi(*(++argv))) != 0)
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 2aef2d9..4984f5d 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -56,7 +56,7 @@
break;
#endif
default:
- usage(sort_usage);
+ show_usage();
}
}
diff --git a/coreutils/sync.c b/coreutils/sync.c
index f95c24c..fc5a42b 100644
--- a/coreutils/sync.c
+++ b/coreutils/sync.c
@@ -28,6 +28,6 @@
extern int sync_main(int argc, char **argv)
{
if (argc > 1 && **(argv + 1) == '-')
- usage(sync_usage);
+ show_usage();
return(sync());
}
diff --git a/coreutils/tail.c b/coreutils/tail.c
index d45b29c..a3b8f6d 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -103,7 +103,7 @@
break;
#endif
default:
- usage(tail_usage);
+ show_usage();
}
}
diff --git a/coreutils/tee.c b/coreutils/tee.c
index aa3098c..439cf7d 100644
--- a/coreutils/tee.c
+++ b/coreutils/tee.c
@@ -38,7 +38,7 @@
mode = "a";
break;
default:
- usage(tee_usage);
+ show_usage();
}
}
diff --git a/coreutils/touch.c b/coreutils/touch.c
index e174baa..a3256d5 100644
--- a/coreutils/touch.c
+++ b/coreutils/touch.c
@@ -44,13 +44,13 @@
create = FALSE;
break;
default:
- usage(touch_usage);
+ show_usage();
}
}
}
if (argc < 1) {
- usage(touch_usage);
+ show_usage();
}
while (argc > 0) {
diff --git a/coreutils/tr.c b/coreutils/tr.c
index 36f29de..92f399e 100644
--- a/coreutils/tr.c
+++ b/coreutils/tr.c
@@ -170,7 +170,7 @@
sq_fl = TRUE;
break;
default:
- usage(tr_usage);
+ show_usage();
}
}
index++;
diff --git a/coreutils/tty.c b/coreutils/tty.c
index 2a64b14..d71d8de 100644
--- a/coreutils/tty.c
+++ b/coreutils/tty.c
@@ -32,7 +32,7 @@
if (argc > 1) {
if (argv[1][0] != '-' || argv[1][1] != 's')
- usage(tty_usage);
+ show_usage();
} else {
tty = ttyname(0);
if (tty)
diff --git a/coreutils/uname.c b/coreutils/uname.c
index deaffd7..899da77 100644
--- a/coreutils/uname.c
+++ b/coreutils/uname.c
@@ -106,7 +106,7 @@
PRINT_MACHINE);
break;
default:
- usage(uname_usage);
+ show_usage();
}
}
}
diff --git a/coreutils/usleep.c b/coreutils/usleep.c
index 86dc050..c67c365 100644
--- a/coreutils/usleep.c
+++ b/coreutils/usleep.c
@@ -28,7 +28,7 @@
extern int usleep_main(int argc, char **argv)
{
if ((argc < 2) || (**(argv + 1) == '-')) {
- usage(usleep_usage);
+ show_usage();
}
usleep(atoi(*(++argv))); /* return void */
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index cccc528..c0e8cea 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -292,7 +292,7 @@
break;
default:
- usage(uudecode_usage);
+ show_usage();
}
}
diff --git a/coreutils/uuencode.c b/coreutils/uuencode.c
index 73098ba..8d5af4a 100644
--- a/coreutils/uuencode.c
+++ b/coreutils/uuencode.c
@@ -167,7 +167,7 @@
break;
default:
- usage(uuencode_usage);
+ show_usage();
}
}
@@ -188,7 +188,7 @@
case 0:
default:
- usage(uuencode_usage);
+ show_usage();
}
printf("begin%s %o %s\n", trans_ptr == uu_std ? "" : "-base64",
diff --git a/coreutils/wc.c b/coreutils/wc.c
index 619c161..f416874 100644
--- a/coreutils/wc.c
+++ b/coreutils/wc.c
@@ -126,7 +126,7 @@
print_words = 1;
break;
default:
- usage(wc_usage);
+ show_usage();
}
}
diff --git a/coreutils/whoami.c b/coreutils/whoami.c
index 398e373..54df0bf 100644
--- a/coreutils/whoami.c
+++ b/coreutils/whoami.c
@@ -31,7 +31,7 @@
uid_t uid = geteuid();
if (argc > 1)
- usage(whoami_usage);
+ show_usage();
my_getpwuid(user, uid);
if (*user) {
diff --git a/coreutils/yes.c b/coreutils/yes.c
index 0ce4949..0a8ad83 100644
--- a/coreutils/yes.c
+++ b/coreutils/yes.c
@@ -29,7 +29,7 @@
int i;
if (argc >= 2 && *argv[1] == '-')
- usage(yes_usage);
+ show_usage();
if (argc == 1) {
while (1)
diff --git a/cp_mv.c b/cp_mv.c
index 9c109b5..8052b41 100644
--- a/cp_mv.c
+++ b/cp_mv.c
@@ -48,11 +48,6 @@
static const int is_mv = 1;
static int dz_i; /* index into cp_mv_usage */
-static const char *cp_mv_usage[] = /* .rodata */
-{
- cp_usage,
- mv_usage
-};
static int recursiveFlag;
static int followLinks;
@@ -184,7 +179,7 @@
else
dz_i = is_mv;
if (argc < 3)
- usage(cp_mv_usage[dz_i]);
+ show_usage();
if (dz_i == is_cp) {
recursiveFlag = preserveFlag = forceFlag = FALSE;
@@ -209,11 +204,11 @@
forceFlag = TRUE;
break;
default:
- usage(cp_mv_usage[is_cp]);
+ show_usage();
}
}
if ((argc - optind) < 2) {
- usage(cp_mv_usage[dz_i]);
+ show_usage();
}
} else { /* (dz_i == is_mv) */
/* Initialize optind to 1, since in libc5 optind
diff --git a/date.c b/date.c
index 8b6a062..21d31bb 100644
--- a/date.c
+++ b/date.c
@@ -151,7 +151,7 @@
case 's':
set_time = 1;
if ((date_str != NULL) || ((date_str = optarg) == NULL)) {
- usage(date_usage);
+ show_usage();
}
break;
case 'u':
@@ -162,10 +162,10 @@
case 'd':
use_arg = 1;
if ((date_str != NULL) || ((date_str = optarg) == NULL))
- usage(date_usage);
+ show_usage();
break;
default:
- usage(date_usage);
+ show_usage();
}
}
@@ -178,7 +178,7 @@
#if 0
else {
error_msg("date_str='%s' date_fmt='%s'\n", date_str, date_fmt);
- usage(date_usage);
+ show_usage();
}
#endif
diff --git a/dc.c b/dc.c
index 122673a..1e34574 100644
--- a/dc.c
+++ b/dc.c
@@ -169,7 +169,7 @@
}
} else {
if (*argv[1]=='-')
- usage(dc_usage);
+ show_usage();
while (argc >= 2) {
stack_machine(argv[1]);
argv++;
diff --git a/dd.c b/dd.c
index 75bbfba..e445e04 100644
--- a/dd.c
+++ b/dd.c
@@ -84,7 +84,7 @@
buf++;
}
} else
- usage(dd_usage);
+ show_usage();
}
buf = xmalloc(bs);
diff --git a/deallocvt.c b/deallocvt.c
index b51fbae..8c390c2 100644
--- a/deallocvt.c
+++ b/deallocvt.c
@@ -19,7 +19,7 @@
//if ((argc > 2) || ((argv == 2) && (**(argv + 1) == '-')))
if (argc > 2)
- usage(deallocvt_usage);
+ show_usage();
fd = get_console_fd("/dev/console");
diff --git a/df.c b/df.c
index 5591979..8b6726b 100644
--- a/df.c
+++ b/df.c
@@ -143,7 +143,7 @@
return status;
print_df_usage:
- usage(df_usage);
+ show_usage();
return(FALSE);
}
diff --git a/dirname.c b/dirname.c
index 2e11a69..e34ecf8 100644
--- a/dirname.c
+++ b/dirname.c
@@ -30,7 +30,7 @@
char* s;
if ((argc < 2) || (**(argv + 1) == '-'))
- usage(dirname_usage);
+ show_usage();
argv++;
s=*argv+strlen(*argv)-1;
diff --git a/dmesg.c b/dmesg.c
index c21f84c..47f9f44 100644
--- a/dmesg.c
+++ b/dmesg.c
@@ -53,21 +53,21 @@
case 'n':
cmd = 8;
if (optarg == NULL)
- usage(dmesg_usage);
+ show_usage();
level = atoi(optarg);
break;
case 's':
if (optarg == NULL)
- usage(dmesg_usage);
+ show_usage();
bufsize = atoi(optarg);
break;
default:
- usage(dmesg_usage);
+ show_usage();
}
}
if (optind < argc) {
- goto end;
+ show_usage();
}
if (cmd == 8) {
@@ -97,7 +97,4 @@
if (lastc != '\n')
putchar('\n');
return EXIT_SUCCESS;
- end:
- usage(dmesg_usage);
- return EXIT_FAILURE;
}
diff --git a/dos2unix.c b/dos2unix.c
index 9fd952c..3242361 100644
--- a/dos2unix.c
+++ b/dos2unix.c
@@ -31,7 +31,7 @@
if (argc > 1) {
c = *argv[1];
if (c == '-') {
- usage(dos2unix_usage);
+ show_usage();
}
}
c = getchar();
diff --git a/dpkg.c b/dpkg.c
index 4a5c6f4..6e309eb 100644
--- a/dpkg.c
+++ b/dpkg.c
@@ -840,7 +840,7 @@
case 'c':
return dpkg_configure(packages, status);
default :
- usage(dpkg_usage);
+ show_usage();
return EXIT_FAILURE;
}
-}
\ No newline at end of file
+}
diff --git a/dpkg_deb.c b/dpkg_deb.c
index aed0ba3..c084381 100644
--- a/dpkg_deb.c
+++ b/dpkg_deb.c
@@ -141,14 +141,12 @@
break;
*/
default:
- usage(dpkg_deb_usage);
- return EXIT_FAILURE;
+ show_usage();
}
}
if (((optind + 1 ) > argc) || (optflag == 0)) {
- usage(dpkg_deb_usage);
- return(EXIT_FAILURE);
+ show_usage();
}
if ((optflag & dpkg_deb_control) || (optflag & dpkg_deb_extract) || (optflag & dpkg_deb_verbose_extract)) {
if ( (optind + 1) == argc ) {
diff --git a/du.c b/du.c
index c56afbc..516f4c9 100644
--- a/du.c
+++ b/du.c
@@ -163,7 +163,7 @@
case 'k': break;
#endif
default:
- usage(du_usage);
+ show_usage();
}
}
@@ -187,7 +187,7 @@
return status;
}
-/* $Id: du.c,v 1.36 2001/01/27 09:33:38 andersen Exp $ */
+/* $Id: du.c,v 1.37 2001/02/14 21:23:05 andersen Exp $ */
/*
Local Variables:
c-file-style: "linux"
diff --git a/dumpkmap.c b/dumpkmap.c
index 4ab711e..b9f1bd2 100644
--- a/dumpkmap.c
+++ b/dumpkmap.c
@@ -48,7 +48,7 @@
char flags[MAX_NR_KEYMAPS], magic[] = "bkeymap";
if (argc>=2 && *argv[1]=='-') {
- usage(dumpkmap_usage);
+ show_usage();
}
fd = open("/dev/tty0", O_RDWR);
diff --git a/dutmp.c b/dutmp.c
index 7e1d2ee..2e6b3c0 100644
--- a/dutmp.c
+++ b/dutmp.c
@@ -33,7 +33,7 @@
if (argc<2) {
file = fileno(stdin);
} else if (*argv[1] == '-' ) {
- usage(dutmp_usage);
+ show_usage();
} else {
file = open(argv[1], O_RDONLY);
if (file < 0) {
@@ -45,7 +45,7 @@
* fact the stupid libc doesn't have a reliable #define to announce that libc5
* is being used. sigh.
*/
-#if ! defined __GLIBC__
+#if ! defined __GLIBC__ || defined __UCLIBC__
while (read(file, (void*)&ut, sizeof(struct utmp))) {
printf("%d|%d|%s|%s|%s|%s|%s|%lx\n",
ut.ut_type, ut.ut_pid, ut.ut_line,
diff --git a/editors/sed.c b/editors/sed.c
index 0ce9f45..3901813 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -673,7 +673,7 @@
while ((opt = getopt(argc, argv, "hne:f:")) > 0) {
switch (opt) {
case 'h':
- usage(sed_usage);
+ show_usage();
break;
case 'n':
be_quiet++;
@@ -691,7 +691,7 @@
* argv[optind] should be the pattern. no pattern, no worky */
if (ncmds == 0) {
if (argv[optind] == NULL)
- usage(sed_usage);
+ show_usage();
else {
add_cmd_str(argv[optind]);
optind++;
diff --git a/fdflush.c b/fdflush.c
index fcf8ddd..f10ccea 100644
--- a/fdflush.c
+++ b/fdflush.c
@@ -35,7 +35,7 @@
int fd;
if (argc <= 1 || **(++argv) == '-')
- usage(fdflush_usage);
+ show_usage();
if ((fd = open(*argv, 0)) < 0)
perror_msg_and_die("%s", *argv);
diff --git a/find.c b/find.c
index a4d056b..a07dc8e 100644
--- a/find.c
+++ b/find.c
@@ -178,7 +178,7 @@
mtime_days = -mtime_days;
#endif
} else
- usage(find_usage);
+ show_usage();
}
if (firstopt == 1) {
diff --git a/findutils/find.c b/findutils/find.c
index a4d056b..a07dc8e 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -178,7 +178,7 @@
mtime_days = -mtime_days;
#endif
} else
- usage(find_usage);
+ show_usage();
}
if (firstopt == 1) {
diff --git a/findutils/grep.c b/findutils/grep.c
index 3eea779..475b4ef 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -237,7 +237,7 @@
/* argv[optind] should be the regex pattern; no pattern, no worky */
if (argv[optind] == NULL)
- usage(grep_usage);
+ show_usage();
/* sanity check */
if (print_count_only || be_quiet) {
diff --git a/findutils/which.c b/findutils/which.c
index 981a8ac..1908db3 100644
--- a/findutils/which.c
+++ b/findutils/which.c
@@ -33,7 +33,7 @@
int i, count=1, found, status = EXIT_SUCCESS;
if (argc <= 1 || **(argv + 1) == '-')
- usage(which_usage);
+ show_usage();
argc--;
path_list = getenv("PATH");
diff --git a/free.c b/free.c
index 17dd386..d287c03 100644
--- a/free.c
+++ b/free.c
@@ -46,7 +46,7 @@
info.bufferram/=info.mem_unit;
if (argc > 1 && **(argv + 1) == '-')
- usage(free_usage);
+ show_usage();
printf("%6s%13s%13s%13s%13s%13s\n", "", "total", "used", "free",
"shared", "buffers");
diff --git a/freeramdisk.c b/freeramdisk.c
index 8f90f40..cf25fae 100644
--- a/freeramdisk.c
+++ b/freeramdisk.c
@@ -40,7 +40,7 @@
int f;
if (argc != 2 || *argv[1] == '-') {
- usage(freeramdisk_usage);
+ show_usage();
}
if ((f = open(argv[1], O_RDWR)) == -1) {
diff --git a/fsck_minix.c b/fsck_minix.c
index 9d76220..2b4c651 100644
--- a/fsck_minix.c
+++ b/fsck_minix.c
@@ -283,11 +283,6 @@
exit(status);
}
-static void show_usage(void)
-{
- usage(fsck_minix_usage);
-}
-
static void die(const char *str)
{
error_msg("%s", str);
diff --git a/getopt.c b/getopt.c
index 6252631..eb28d5d 100644
--- a/getopt.c
+++ b/getopt.c
@@ -372,7 +372,7 @@
quote=0;
break;
default:
- usage(getopt_usage);
+ show_usage();
}
if (!optstr) {
diff --git a/grep.c b/grep.c
index 3eea779..475b4ef 100644
--- a/grep.c
+++ b/grep.c
@@ -237,7 +237,7 @@
/* argv[optind] should be the regex pattern; no pattern, no worky */
if (argv[optind] == NULL)
- usage(grep_usage);
+ show_usage();
/* sanity check */
if (print_count_only || be_quiet) {
diff --git a/gunzip.c b/gunzip.c
index 48a4608..bf8812d 100644
--- a/gunzip.c
+++ b/gunzip.c
@@ -1250,7 +1250,7 @@
force = 1;
break;
default:
- usage(gunzip_usage);
+ show_usage();
}
}
}
@@ -1275,7 +1275,7 @@
} else {
/* Open up the input file */
if (argc <= 0)
- usage(gunzip_usage);
+ show_usage();
if (strlen(*argv) > MAX_PATH_LEN) {
error_msg(name_too_long);
exit(WARNING);
diff --git a/gzip.c b/gzip.c
index 75f3caa..3cbef4e 100644
--- a/gzip.c
+++ b/gzip.c
@@ -1812,7 +1812,7 @@
case 'd':
exit(gunzip_main(argc, argv));
default:
- usage(gzip_usage);
+ show_usage();
}
}
}
@@ -1865,7 +1865,7 @@
} else {
/* Open up the input file */
if (argc <= 0)
- usage(gzip_usage);
+ show_usage();
strncpy(ifname, *argv, MAX_PATH_LEN);
/* Open input file */
diff --git a/head.c b/head.c
index 7d87f32..a2d7744 100644
--- a/head.c
+++ b/head.c
@@ -57,7 +57,7 @@
break;
/* fallthrough */
default:
- usage(head_usage);
+ show_usage();
}
}
diff --git a/hostname.c b/hostname.c
index ce17ba9..e1486b3 100644
--- a/hostname.c
+++ b/hostname.c
@@ -1,6 +1,6 @@
/* vi: set sw=4 ts=4: */
/*
- * $Id: hostname.c,v 1.23 2001/02/01 16:49:29 kraai Exp $
+ * $Id: hostname.c,v 1.24 2001/02/14 21:23:06 andersen Exp $
* Mini hostname implementation for busybox
*
* Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -66,7 +66,7 @@
char *s = NULL;
if (argc < 1)
- usage(hostname_usage);
+ show_usage();
while (--argc > 0 && **(++argv) == '-') {
while (*(++(*argv))) {
@@ -82,18 +82,18 @@
break;
case 'F':
if (--argc == 0) {
- usage(hostname_usage);
+ show_usage();
}
filename = *(++argv);
break;
case '-':
if (strcmp(++(*argv), "file") || --argc ==0 ) {
- usage(hostname_usage);
+ show_usage();
}
filename = *(++argv);
break;
default:
- usage(hostname_usage);
+ show_usage();
}
if (filename != NULL)
break;
diff --git a/id.c b/id.c
index 650e3db..3667b32 100644
--- a/id.c
+++ b/id.c
@@ -53,11 +53,11 @@
name_not_number++;
break;
default:
- usage(id_usage);
+ show_usage();
}
}
- if (no_user && no_group) usage(id_usage);
+ if (no_user && no_group) show_usage();
if (argv[optind] == NULL) {
if (print_real) {
diff --git a/ifconfig.c b/ifconfig.c
index 2134f8a..66615a2 100644
--- a/ifconfig.c
+++ b/ifconfig.c
@@ -15,7 +15,7 @@
* Foundation; either version 2 of the License, or (at
* your option) any later version.
*
- * $Id: ifconfig.c,v 1.1 2001/02/14 08:11:27 andersen Exp $
+ * $Id: ifconfig.c,v 1.2 2001/02/14 21:23:06 andersen Exp $
*
*/
@@ -183,7 +183,7 @@
char host[128];
if(argc < 2) {
- usage(ifconfig_usage);
+ show_usage();
}
/* Create a channel to the NET kernel. */
@@ -269,7 +269,7 @@
if (!strcmp(*spp, "metric")) {
if (*++spp == NULL)
- usage(ifconfig_usage);
+ show_usage();
ifr.ifr_metric = atoi(*spp);
if (ioctl(sockfd, SIOCSIFMETRIC, &ifr) < 0) {
fprintf(stderr, "SIOCSIFMETRIC: %s\n", strerror(errno));
@@ -280,7 +280,7 @@
}
if (!strcmp(*spp, "mtu")) {
if (*++spp == NULL)
- usage(ifconfig_usage);
+ show_usage();
ifr.ifr_mtu = atoi(*spp);
if (ioctl(sockfd, SIOCSIFMTU, &ifr) < 0) {
fprintf(stderr, "SIOCSIFMTU: %s\n", strerror(errno));
@@ -292,7 +292,7 @@
#ifdef SIOCSKEEPALIVE
if (!strcmp(*spp, "keepalive")) {
if (*++spp == NULL)
- usage(ifconfig_usage);
+ show_usage();
ifr.ifr_data = (caddr_t) atoi(*spp);
if (ioctl(sockfd, SIOCSKEEPALIVE, &ifr) < 0) {
fprintf(stderr, "SIOCSKEEPALIVE: %s\n", strerror(errno));
@@ -306,7 +306,7 @@
#ifdef SIOCSOUTFILL
if (!strcmp(*spp, "outfill")) {
if (*++spp == NULL)
- usage(ifconfig_usage);
+ show_usage();
ifr.ifr_data = (caddr_t) atoi(*spp);
if (ioctl(sockfd, SIOCSOUTFILL, &ifr) < 0) {
fprintf(stderr, "SIOCSOUTFILL: %s\n", strerror(errno));
@@ -344,7 +344,7 @@
}
if (!strcmp(*spp, "dstaddr")) {
if (*++spp == NULL)
- usage(ifconfig_usage);
+ show_usage();
safe_strncpy(host, *spp, (sizeof host));
if (INET_resolve(host, &sa) < 0) {
goterr++;
@@ -363,7 +363,7 @@
}
if (!strcmp(*spp, "netmask")) {
if (*++spp == NULL || didnetmask)
- usage(ifconfig_usage);
+ show_usage();
safe_strncpy(host, *spp, (sizeof host));
if (INET_resolve(host, &sa) < 0) {
goterr++;
@@ -409,7 +409,7 @@
if (!strcmp(*spp, "hw")) {
if (*++spp == NULL || strcmp("ether", *spp)) {
- usage(ifconfig_usage);
+ show_usage();
}
if (*++spp == NULL) {
@@ -438,7 +438,7 @@
safe_strncpy(host, *spp, (sizeof host));
if (INET_resolve(host, &sa) < 0) {
- usage(ifconfig_usage);
+ show_usage();
}
memcpy((char *) &ifr.ifr_addr,
(char *) &sa, sizeof(struct sockaddr));
diff --git a/include/applets.h b/include/applets.h
index 0b70a61..cb74456 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -10,403 +10,417 @@
* file result in the listing remaining in ascii order. You have been warned.
*/
+#undef APPLET
+#undef APPLET_ODDNAME
+#undef APPLET_NOUSAGE
+
#if defined(PROTOTYPES)
-#define APPLET(a,b,c,d) \
- extern int b(int argc, char **argv); \
- extern const char d[];
+#define APPLET(a,b,c) \
+ extern int b(int argc, char **argv);
+#define APPLET_ODDNAME(a,b,c,d,e) APPLET(a,b,c)
#define APPLET_NOUSAGE(a,b,c) \
extern int b(int argc, char **argv);
#elif defined(MAKE_LINKS)
-#define APPLET(a,b,c,d) LINK c a
-#define APPLET_NOUSAGE(a,b,c) LINK c a
+#define APPLET(a,b,c) LINK c #a
+#define APPLET_ODDNAME(a,b,c,d,e) LINK c a
+#define APPLET_NOUSAGE(a,b,c) LINK c #a
+#elif defined(APPLET_ENUM)
+#define APPLET(a,b,c) a##_applet_number,
+#define APPLET_ODDNAME(a,b,c,d,e) e##_applet_number,
+#define APPLET_NOUSAGE(a,b,c) a##applet_number,
#else
+#define USAGE_ENUM
+#include "usage.h"
const struct BB_applet applets[] = {
-#define APPLET(a,b,c,d) {a,b,c,d},
-#define APPLET_NOUSAGE(a,b,c) {a,b,c,NULL},
+#define APPLET(a,b,c) {#a,b,c,a##_usage_index},
+#define APPLET_ODDNAME(a,b,c,d,e) {a,b,c,d},
+#define APPLET_NOUSAGE(a,b,c) {#a,b,c,-1},
+#define zcat_usage_index gunzip_usage_index
+#define sh_usage_index shell_usage_index
#endif
#ifdef BB_TEST
- APPLET("[", test_main, _BB_DIR_USR_BIN, test_usage)
+ APPLET_ODDNAME("[", test_main, _BB_DIR_USR_BIN, test_usage_index, open_bracket)
#endif
#ifdef BB_AR
- APPLET("ar", ar_main, _BB_DIR_USR_BIN, ar_usage)
+ APPLET(ar, ar_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_BASENAME
- APPLET("basename", basename_main, _BB_DIR_USR_BIN, basename_usage)
+ APPLET(basename, basename_main, _BB_DIR_USR_BIN)
#endif
- APPLET_NOUSAGE("busybox", busybox_main, _BB_DIR_BIN)
+ APPLET_NOUSAGE(busybox, busybox_main, _BB_DIR_BIN)
#ifdef BB_CAT
- APPLET("cat", cat_main, _BB_DIR_BIN, cat_usage)
+ APPLET(cat, cat_main, _BB_DIR_BIN)
#endif
#ifdef BB_CHMOD_CHOWN_CHGRP
- APPLET("chgrp", chmod_chown_chgrp_main, _BB_DIR_BIN, chgrp_usage)
+ APPLET(chgrp, chmod_chown_chgrp_main, _BB_DIR_BIN)
#endif
#ifdef BB_CHMOD_CHOWN_CHGRP
- APPLET("chmod", chmod_chown_chgrp_main, _BB_DIR_BIN, chmod_usage)
+ APPLET(chmod, chmod_chown_chgrp_main, _BB_DIR_BIN)
#endif
#ifdef BB_CHMOD_CHOWN_CHGRP
- APPLET("chown", chmod_chown_chgrp_main, _BB_DIR_BIN, chown_usage)
+ APPLET(chown, chmod_chown_chgrp_main, _BB_DIR_BIN)
#endif
#ifdef BB_CHROOT
- APPLET("chroot", chroot_main, _BB_DIR_USR_SBIN, chroot_usage)
+ APPLET(chroot, chroot_main, _BB_DIR_USR_SBIN)
#endif
#ifdef BB_CHVT
- APPLET("chvt", chvt_main, _BB_DIR_USR_BIN, chvt_usage)
+ APPLET(chvt, chvt_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_CLEAR
- APPLET("clear", clear_main, _BB_DIR_USR_BIN, clear_usage)
+ APPLET(clear, clear_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_CMP
- APPLET("cmp", cmp_main, _BB_DIR_USR_BIN, cmp_usage)
+ APPLET(cmp, cmp_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_CP_MV
- APPLET("cp", cp_mv_main, _BB_DIR_BIN, cp_usage)
+ APPLET(cp, cp_mv_main, _BB_DIR_BIN)
#endif
#ifdef BB_CUT
- APPLET("cut", cut_main, _BB_DIR_USR_BIN, cut_usage)
+ APPLET(cut, cut_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_DATE
- APPLET("date", date_main, _BB_DIR_BIN, date_usage)
+ APPLET(date, date_main, _BB_DIR_BIN)
#endif
#ifdef BB_DC
- APPLET("dc", dc_main, _BB_DIR_USR_BIN, dc_usage)
+ APPLET(dc, dc_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_DD
- APPLET("dd", dd_main, _BB_DIR_BIN, dd_usage)
+ APPLET(dd, dd_main, _BB_DIR_BIN)
#endif
#ifdef BB_DEALLOCVT
- APPLET("deallocvt", deallocvt_main, _BB_DIR_USR_BIN, deallocvt_usage)
+ APPLET(deallocvt, deallocvt_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_DF
- APPLET("df", df_main, _BB_DIR_BIN, df_usage)
+ APPLET(df, df_main, _BB_DIR_BIN)
#endif
#ifdef BB_DIRNAME
- APPLET("dirname", dirname_main, _BB_DIR_USR_BIN, dirname_usage)
+ APPLET(dirname, dirname_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_DMESG
- APPLET("dmesg", dmesg_main, _BB_DIR_BIN, dmesg_usage)
+ APPLET(dmesg, dmesg_main, _BB_DIR_BIN)
#endif
#ifdef BB_DOS2UNIX
- APPLET("dos2unix", dos2unix_main, _BB_DIR_USR_BIN, dos2unix_usage)
+ APPLET(dos2unix, dos2unix_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_DPKG
- APPLET("dpkg", dpkg_main, _BB_DIR_USR_BIN, dpkg_usage)
+ APPLET(dpkg, dpkg_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_DPKG_DEB
- APPLET("dpkg-deb", dpkg_deb_main, _BB_DIR_USR_BIN, dpkg_deb_usage)
+ APPLET_ODDNAME("dpkg-deb", dpkg_deb_main, _BB_DIR_USR_BIN, dpkg_deb_usage_index, dpkg_deb)
#endif
#ifdef BB_DU
- APPLET("du", du_main, _BB_DIR_USR_BIN, du_usage)
+ APPLET(du, du_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_DUMPKMAP
- APPLET("dumpkmap", dumpkmap_main, _BB_DIR_BIN, dumpkmap_usage)
+ APPLET(dumpkmap, dumpkmap_main, _BB_DIR_BIN)
#endif
#ifdef BB_DUTMP
- APPLET("dutmp", dutmp_main, _BB_DIR_USR_SBIN, dutmp_usage)
+ APPLET(dutmp, dutmp_main, _BB_DIR_USR_SBIN)
#endif
#ifdef BB_ECHO
- APPLET("echo", echo_main, _BB_DIR_BIN, echo_usage)
+ APPLET(echo, echo_main, _BB_DIR_BIN)
#endif
#ifdef BB_EXPR
- APPLET("expr", expr_main, _BB_DIR_USR_BIN, expr_usage)
+ APPLET(expr, expr_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_TRUE_FALSE
- APPLET("false", false_main, _BB_DIR_BIN, false_usage)
+ APPLET(false, false_main, _BB_DIR_BIN)
#endif
#ifdef BB_FBSET
- APPLET_NOUSAGE("fbset", fbset_main, _BB_DIR_USR_SBIN)
+ APPLET_NOUSAGE(fbset, fbset_main, _BB_DIR_USR_SBIN)
#endif
#ifdef BB_FDFLUSH
- APPLET("fdflush", fdflush_main, _BB_DIR_BIN, fdflush_usage)
+ APPLET(fdflush, fdflush_main, _BB_DIR_BIN)
#endif
#ifdef BB_FIND
- APPLET("find", find_main, _BB_DIR_USR_BIN, find_usage)
+ APPLET(find, find_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_FREE
- APPLET("free", free_main, _BB_DIR_USR_BIN, free_usage)
+ APPLET(free, free_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_FREERAMDISK
- APPLET("freeramdisk", freeramdisk_main, _BB_DIR_SBIN, freeramdisk_usage)
+ APPLET(freeramdisk, freeramdisk_main, _BB_DIR_SBIN)
#endif
#ifdef BB_FSCK_MINIX
- APPLET("fsck.minix", fsck_minix_main, _BB_DIR_SBIN, fsck_minix_usage)
+ APPLET_ODDNAME("fsck.minix", fsck_minix_main, _BB_DIR_SBIN, fsck_minix_usage_index, fsck_minix)
#endif
#ifdef BB_GETOPT
- APPLET("getopt", getopt_main, _BB_DIR_BIN, getopt_usage)
+ APPLET(getopt, getopt_main, _BB_DIR_BIN)
#endif
#ifdef BB_GREP
- APPLET("grep", grep_main, _BB_DIR_BIN, grep_usage)
+ APPLET(grep, grep_main, _BB_DIR_BIN)
#endif
#ifdef BB_GUNZIP
- APPLET("gunzip", gunzip_main, _BB_DIR_BIN, gunzip_usage)
+ APPLET(gunzip, gunzip_main, _BB_DIR_BIN)
#endif
#ifdef BB_GZIP
- APPLET("gzip", gzip_main, _BB_DIR_BIN, gzip_usage)
+ APPLET(gzip, gzip_main, _BB_DIR_BIN)
#endif
#ifdef BB_HALT
- APPLET("halt", halt_main, _BB_DIR_SBIN, halt_usage)
+ APPLET(halt, halt_main, _BB_DIR_SBIN)
#endif
#ifdef BB_HEAD
- APPLET("head", head_main, _BB_DIR_USR_BIN, head_usage)
+ APPLET(head, head_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_HOSTID
- APPLET("hostid", hostid_main, _BB_DIR_USR_BIN, hostid_usage)
+ APPLET(hostid, hostid_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_HOSTNAME
- APPLET("hostname", hostname_main, _BB_DIR_BIN, hostname_usage)
+ APPLET(hostname, hostname_main, _BB_DIR_BIN)
#endif
#ifdef BB_ID
- APPLET("id", id_main, _BB_DIR_USR_BIN, id_usage)
+ APPLET(id, id_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_IFCONFIG
- APPLET("ifconfig", ifconfig_main, _BB_DIR_SBIN, ifconfig_usage)
+ APPLET(ifconfig, ifconfig_main, _BB_DIR_SBIN)
#endif
#ifdef BB_INIT
- APPLET_NOUSAGE("init", init_main, _BB_DIR_SBIN)
+ APPLET(init, init_main, _BB_DIR_SBIN)
#endif
#ifdef BB_INSMOD
- APPLET("insmod", insmod_main, _BB_DIR_SBIN, insmod_usage)
+ APPLET(insmod, insmod_main, _BB_DIR_SBIN)
#endif
#ifdef BB_KILL
- APPLET("kill", kill_main, _BB_DIR_BIN, kill_usage)
+ APPLET(kill, kill_main, _BB_DIR_BIN)
#endif
#ifdef BB_KILLALL
- APPLET("killall", kill_main, _BB_DIR_USR_BIN, killall_usage)
+ APPLET(killall, kill_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_LENGTH
- APPLET("length", length_main, _BB_DIR_USR_BIN, length_usage)
+ APPLET(length, length_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_LINUXRC
- APPLET_NOUSAGE("linuxrc", init_main, _BB_DIR_ROOT)
+ APPLET_NOUSAGE(linuxrc, init_main, _BB_DIR_ROOT)
#endif
#ifdef BB_LN
- APPLET("ln", ln_main, _BB_DIR_BIN, ln_usage)
+ APPLET(ln, ln_main, _BB_DIR_BIN)
#endif
#ifdef BB_LOADACM
- APPLET("loadacm", loadacm_main, _BB_DIR_USR_BIN, loadacm_usage)
+ APPLET(loadacm, loadacm_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_LOADFONT
- APPLET("loadfont", loadfont_main, _BB_DIR_USR_BIN, loadfont_usage)
+ APPLET(loadfont, loadfont_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_LOADKMAP
- APPLET("loadkmap", loadkmap_main, _BB_DIR_SBIN, loadkmap_usage)
+ APPLET(loadkmap, loadkmap_main, _BB_DIR_SBIN)
#endif
#ifdef BB_LOGGER
- APPLET("logger", logger_main, _BB_DIR_USR_BIN, logger_usage)
+ APPLET(logger, logger_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_LOGNAME
- APPLET("logname", logname_main, _BB_DIR_USR_BIN, logname_usage)
+ APPLET(logname, logname_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_LS
- APPLET("ls", ls_main, _BB_DIR_BIN, ls_usage)
+ APPLET(ls, ls_main, _BB_DIR_BIN)
#endif
#ifdef BB_LSMOD
- APPLET("lsmod", lsmod_main, _BB_DIR_SBIN, lsmod_usage)
+ APPLET(lsmod, lsmod_main, _BB_DIR_SBIN)
#endif
#ifdef BB_MAKEDEVS
- APPLET("makedevs", makedevs_main, _BB_DIR_SBIN, makedevs_usage)
+ APPLET(makedevs, makedevs_main, _BB_DIR_SBIN)
#endif
#ifdef BB_MD5SUM
- APPLET("md5sum", md5sum_main, _BB_DIR_USR_BIN, md5sum_usage)
+ APPLET(md5sum, md5sum_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_MKDIR
- APPLET("mkdir", mkdir_main, _BB_DIR_BIN, mkdir_usage)
+ APPLET(mkdir, mkdir_main, _BB_DIR_BIN)
#endif
#ifdef BB_MKFIFO
- APPLET("mkfifo", mkfifo_main, _BB_DIR_USR_BIN, mkfifo_usage)
+ APPLET(mkfifo, mkfifo_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_MKFS_MINIX
- APPLET("mkfs.minix", mkfs_minix_main, _BB_DIR_SBIN, mkfs_minix_usage)
+ APPLET_ODDNAME("mkfs.minix", mkfs_minix_main, _BB_DIR_SBIN, mkfs_minix_usage_index, mkfs_minix)
#endif
#ifdef BB_MKNOD
- APPLET("mknod", mknod_main, _BB_DIR_BIN, mknod_usage)
+ APPLET(mknod, mknod_main, _BB_DIR_BIN)
#endif
#ifdef BB_MKSWAP
- APPLET("mkswap", mkswap_main, _BB_DIR_SBIN, mkswap_usage)
+ APPLET(mkswap, mkswap_main, _BB_DIR_SBIN)
#endif
#ifdef BB_MKTEMP
- APPLET("mktemp", mktemp_main, _BB_DIR_BIN, mktemp_usage)
+ APPLET(mktemp, mktemp_main, _BB_DIR_BIN)
#endif
#ifdef BB_MORE
- APPLET("more", more_main, _BB_DIR_BIN, more_usage)
+ APPLET(more, more_main, _BB_DIR_BIN)
#endif
#ifdef BB_MOUNT
- APPLET("mount", mount_main, _BB_DIR_BIN, mount_usage)
+ APPLET(mount, mount_main, _BB_DIR_BIN)
#endif
#ifdef BB_MT
- APPLET("mt", mt_main, _BB_DIR_BIN, mt_usage)
+ APPLET(mt, mt_main, _BB_DIR_BIN)
#endif
#ifdef BB_CP_MV
- APPLET("mv", cp_mv_main, _BB_DIR_BIN, mv_usage)
+ APPLET(mv, cp_mv_main, _BB_DIR_BIN)
#endif
#ifdef BB_NC
- APPLET("nc", nc_main, _BB_DIR_USR_BIN, nc_usage)
+ APPLET(nc, nc_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_NSLOOKUP
- APPLET("nslookup", nslookup_main, _BB_DIR_USR_BIN, nslookup_usage)
+ APPLET(nslookup, nslookup_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_PING
- APPLET("ping", ping_main, _BB_DIR_BIN, ping_usage)
+ APPLET(ping, ping_main, _BB_DIR_BIN)
#endif
#ifdef BB_PIVOT_ROOT
- APPLET("pivot_root", pivot_root_main, _BB_DIR_SBIN, pivot_root_usage)
+ APPLET(pivot_root, pivot_root_main, _BB_DIR_SBIN)
#endif
#ifdef BB_POWEROFF
- APPLET("poweroff", poweroff_main, _BB_DIR_SBIN, poweroff_usage)
+ APPLET(poweroff, poweroff_main, _BB_DIR_SBIN)
#endif
#ifdef BB_PRINTF
- APPLET("printf", printf_main, _BB_DIR_USR_BIN, printf_usage)
+ APPLET(printf, printf_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_PS
- APPLET("ps", ps_main, _BB_DIR_BIN, ps_usage)
+ APPLET(ps, ps_main, _BB_DIR_BIN)
#endif
#ifdef BB_PWD
- APPLET("pwd", pwd_main, _BB_DIR_BIN, pwd_usage)
+ APPLET(pwd, pwd_main, _BB_DIR_BIN)
#endif
#ifdef BB_RDATE
- APPLET("rdate", rdate_main, _BB_DIR_USR_BIN, rdate_usage)
+ APPLET(rdate, rdate_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_READLINK
- APPLET("readlink", readlink_main, _BB_DIR_USR_BIN, readlink_usage)
+ APPLET(readlink, readlink_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_REBOOT
- APPLET("reboot", reboot_main, _BB_DIR_SBIN, reboot_usage)
+ APPLET(reboot, reboot_main, _BB_DIR_SBIN)
#endif
#ifdef BB_RENICE
- APPLET("renice", renice_main, _BB_DIR_USR_BIN, renice_usage)
+ APPLET(renice, renice_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_RESET
- APPLET("reset", reset_main, _BB_DIR_USR_BIN, reset_usage)
+ APPLET(reset, reset_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_RM
- APPLET("rm", rm_main, _BB_DIR_BIN, rm_usage)
+ APPLET(rm, rm_main, _BB_DIR_BIN)
#endif
#ifdef BB_RMDIR
- APPLET("rmdir", rmdir_main, _BB_DIR_BIN, rmdir_usage)
+ APPLET(rmdir, rmdir_main, _BB_DIR_BIN)
#endif
#ifdef BB_RMMOD
- APPLET("rmmod", rmmod_main, _BB_DIR_SBIN, rmmod_usage)
+ APPLET(rmmod, rmmod_main, _BB_DIR_SBIN)
#endif
#ifdef BB_ROUTE
- APPLET("route", route_main, _BB_DIR_USR_BIN, route_usage)
+ APPLET(route, route_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_RPMUNPACK
- APPLET("rpmunpack", rpmunpack_main, _BB_DIR_USR_BIN, rpmunpack_usage)
+ APPLET(rpmunpack, rpmunpack_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_SED
- APPLET("sed", sed_main, _BB_DIR_BIN, sed_usage)
+ APPLET(sed, sed_main, _BB_DIR_BIN)
#endif
#ifdef BB_SETKEYCODES
- APPLET("setkeycodes", setkeycodes_main, _BB_DIR_USR_BIN, setkeycodes_usage)
+ APPLET(setkeycodes, setkeycodes_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_SH
- APPLET("sh", shell_main, _BB_DIR_BIN, shell_usage)
+ APPLET(sh, shell_main, _BB_DIR_BIN)
#endif
#ifdef BB_SLEEP
- APPLET("sleep", sleep_main, _BB_DIR_BIN, sleep_usage)
+ APPLET(sleep, sleep_main, _BB_DIR_BIN)
#endif
#ifdef BB_SORT
- APPLET("sort", sort_main, _BB_DIR_USR_BIN, sort_usage)
+ APPLET(sort, sort_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_STTY
- APPLET("stty", stty_main, _BB_DIR_BIN, stty_usage)
+ APPLET(stty, stty_main, _BB_DIR_BIN)
#endif
#ifdef BB_SWAPONOFF
- APPLET("swapoff", swap_on_off_main, _BB_DIR_SBIN, swapoff_usage)
+ APPLET(swapoff, swap_on_off_main, _BB_DIR_SBIN)
#endif
#ifdef BB_SWAPONOFF
- APPLET("swapon", swap_on_off_main, _BB_DIR_SBIN, swapon_usage)
+ APPLET(swapon, swap_on_off_main, _BB_DIR_SBIN)
#endif
#ifdef BB_SYNC
- APPLET("sync", sync_main, _BB_DIR_BIN, sync_usage)
+ APPLET(sync, sync_main, _BB_DIR_BIN)
#endif
#ifdef BB_SYSLOGD
- APPLET("syslogd", syslogd_main, _BB_DIR_SBIN, syslogd_usage)
+ APPLET(syslogd, syslogd_main, _BB_DIR_SBIN)
#endif
#ifdef BB_TAIL
- APPLET("tail", tail_main, _BB_DIR_USR_BIN, tail_usage)
+ APPLET(tail, tail_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_TAR
- APPLET("tar", tar_main, _BB_DIR_BIN, tar_usage)
+ APPLET(tar, tar_main, _BB_DIR_BIN)
#endif
#ifdef BB_TEE
- APPLET("tee", tee_main, _BB_DIR_USR_BIN, tee_usage)
+ APPLET(tee, tee_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_TELNET
- APPLET("telnet", telnet_main, _BB_DIR_USR_BIN, telnet_usage)
+ APPLET(telnet, telnet_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_TEST
- APPLET("test", test_main, _BB_DIR_USR_BIN, test_usage)
+ APPLET(test, test_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_TOUCH
- APPLET("touch", touch_main, _BB_DIR_BIN, touch_usage)
+ APPLET(touch, touch_main, _BB_DIR_BIN)
#endif
#ifdef BB_TR
- APPLET("tr", tr_main, _BB_DIR_USR_BIN, tr_usage)
+ APPLET(tr, tr_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_TRUE_FALSE
- APPLET("true", true_main, _BB_DIR_BIN, true_usage)
+ APPLET(true, true_main, _BB_DIR_BIN)
#endif
#ifdef BB_TTY
- APPLET("tty", tty_main, _BB_DIR_USR_BIN, tty_usage)
+ APPLET(tty, tty_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_UMOUNT
- APPLET("umount", umount_main, _BB_DIR_BIN, umount_usage)
+ APPLET(umount, umount_main, _BB_DIR_BIN)
#endif
#ifdef BB_UNAME
- APPLET("uname", uname_main, _BB_DIR_BIN, uname_usage)
+ APPLET(uname, uname_main, _BB_DIR_BIN)
#endif
#ifdef BB_UNIQ
- APPLET("uniq", uniq_main, _BB_DIR_USR_BIN, uniq_usage)
+ APPLET(uniq, uniq_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_UNIX2DOS
- APPLET("unix2dos", unix2dos_main, _BB_DIR_USR_BIN, unix2dos_usage)
+ APPLET(unix2dos, unix2dos_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_UPDATE
- APPLET("update", update_main, _BB_DIR_SBIN, update_usage)
+ APPLET(update, update_main, _BB_DIR_SBIN)
#endif
#ifdef BB_UPTIME
- APPLET("uptime", uptime_main, _BB_DIR_USR_BIN, uptime_usage)
+ APPLET(uptime, uptime_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_USLEEP
- APPLET("usleep", usleep_main, _BB_DIR_BIN, usleep_usage)
+ APPLET(usleep, usleep_main, _BB_DIR_BIN)
#endif
#ifdef BB_UUDECODE
- APPLET("uudecode", uudecode_main, _BB_DIR_USR_BIN, uudecode_usage)
+ APPLET(uudecode, uudecode_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_UUENCODE
- APPLET("uuencode", uuencode_main, _BB_DIR_USR_BIN, uuencode_usage)
+ APPLET(uuencode, uuencode_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_WATCHDOG
- APPLET("watchdog", watchdog_main, _BB_DIR_SBIN, watchdog_usage)
+ APPLET(watchdog, watchdog_main, _BB_DIR_SBIN)
#endif
#ifdef BB_WC
- APPLET("wc", wc_main, _BB_DIR_USR_BIN, wc_usage)
+ APPLET(wc, wc_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_WGET
- APPLET("wget", wget_main, _BB_DIR_USR_BIN, wget_usage)
+ APPLET(wget, wget_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_WHICH
- APPLET("which", which_main, _BB_DIR_USR_BIN, which_usage)
+ APPLET(which, which_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_WHOAMI
- APPLET("whoami", whoami_main, _BB_DIR_USR_BIN, whoami_usage)
+ APPLET(whoami, whoami_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_XARGS
- APPLET("xargs", xargs_main, _BB_DIR_USR_BIN, xargs_usage)
+ APPLET(xargs, xargs_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_YES
- APPLET("yes", yes_main, _BB_DIR_USR_BIN, yes_usage)
+ APPLET(yes, yes_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_GUNZIP
- APPLET("zcat", gunzip_main, _BB_DIR_BIN, gunzip_usage)
+ APPLET(zcat, gunzip_main, _BB_DIR_BIN)
#endif
-#if !defined(PROTOTYPES) && !defined(MAKE_LINKS)
- { 0,NULL,0,NULL}
+#if !defined(PROTOTYPES) && !defined(MAKE_LINKS) && !defined(APPLET_ENUM)
+ { 0,NULL,0,-1}
};
-/* The -1 arises because of the {0,NULL,0,NULL} entry above. */
+/* The -1 arises because of the {0,NULL,0,-1} entry above. */
size_t NUM_APPLETS = (sizeof (applets) / sizeof (struct BB_applet) - 1);
#endif
diff --git a/include/busybox.h b/include/busybox.h
index 39580b5..aef537b 100644
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -72,7 +72,7 @@
const char* name;
int (*main)(int argc, char** argv);
enum Location location;
- const char* usage;
+ int usage_index;
};
/* From busybox.c */
extern const struct BB_applet applets[];
@@ -87,9 +87,15 @@
#include "applets.h"
#undef PROTOTYPES
+#define APPLET_ENUM
+enum APPLET_INDEX_NUMBERS {
+#include "applets.h"
+};
+#undef APPLET_ENUM
+
extern const char *applet_name;
-extern void usage(const char *usage) __attribute__ ((noreturn));
+extern void show_usage(void) __attribute__ ((noreturn));
extern void error_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
extern void error_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2)));
extern void perror_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
@@ -153,6 +159,7 @@
extern FILE *xfopen(const char *path, const char *mode);
extern void chomp(char *s);
extern struct BB_applet *find_applet_by_name(const char *name);
+void run_applet_by_name(const char *name, int argc, char **argv);
#ifndef DMALLOC
extern void *xmalloc (size_t size);
diff --git a/init.c b/init.c
index a1c6aec..9c96726 100644
--- a/init.c
+++ b/init.c
@@ -937,9 +937,7 @@
#endif
)
{
- usage("init\n\nInit is the parent of all processes.\n\n"
- "This version of init is designed to be run only "
- "by the kernel.");
+ show_usage();
}
/* Set up sig handlers -- be sure to
* clear all of these in run() */
diff --git a/init/init.c b/init/init.c
index a1c6aec..9c96726 100644
--- a/init/init.c
+++ b/init/init.c
@@ -937,9 +937,7 @@
#endif
)
{
- usage("init\n\nInit is the parent of all processes.\n\n"
- "This version of init is designed to be run only "
- "by the kernel.");
+ show_usage();
}
/* Set up sig handlers -- be sure to
* clear all of these in run() */
diff --git a/insmod.c b/insmod.c
index e55d9fa..0da0a39 100644
--- a/insmod.c
+++ b/insmod.c
@@ -81,7 +81,7 @@
#ifndef MODUTILS_MODULE_H
static const int MODUTILS_MODULE_H = 1;
-#ident "$Id: insmod.c,v 1.45 2001/01/31 19:00:21 kraai Exp $"
+#ident "$Id: insmod.c,v 1.46 2001/02/14 21:23:06 andersen Exp $"
/* This file contains the structures used by the 2.0 and 2.1 kernels.
We do not use the kernel headers directly because we do not wish
@@ -287,7 +287,7 @@
#ifndef MODUTILS_OBJ_H
static const int MODUTILS_OBJ_H = 1;
-#ident "$Id: insmod.c,v 1.45 2001/01/31 19:00:21 kraai Exp $"
+#ident "$Id: insmod.c,v 1.46 2001/02/14 21:23:06 andersen Exp $"
/* The relocatable object is manipulated using elfin types. */
@@ -2916,12 +2916,12 @@
* loading the same module 50 times concurrently. */
break;
default:
- usage(insmod_usage);
+ show_usage();
}
}
if (argv[optind] == NULL) {
- usage(insmod_usage);
+ show_usage();
}
/* Grab the module name */
diff --git a/kill.c b/kill.c
index 00a4d5c..bdd22b5 100644
--- a/kill.c
+++ b/kill.c
@@ -124,22 +124,19 @@
extern int kill_main(int argc, char **argv)
{
int whichApp, sig = SIGTERM;
- const char *appUsage;
#ifdef BB_KILLALL
/* Figure out what we are trying to do here */
whichApp = (strcmp(applet_name, "killall") == 0)? KILLALL : KILL;
- appUsage = (whichApp == KILLALL)? killall_usage : kill_usage;
#else
whichApp = KILL;
- appUsage = kill_usage;
#endif
argc--;
argv++;
/* Parse any options */
if (argc < 1)
- usage(appUsage);
+ show_usage();
while (argc > 0 && **argv == '-') {
while (*++(*argv)) {
@@ -163,7 +160,7 @@
}
break;
case '-':
- usage(appUsage);
+ show_usage();
default:
{
if (isdigit(**argv)) {
diff --git a/lash.c b/lash.c
index b1a7b93..9519538 100644
--- a/lash.c
+++ b/lash.c
@@ -1370,7 +1370,6 @@
{
struct built_in_command *x;
#ifdef BB_FEATURE_SH_STANDALONE_SHELL
- struct BB_applet *applet;
char *name;
#endif
@@ -1415,14 +1414,12 @@
name = get_last_path_component(name);
#endif
- /* Do a binary search to find the applet entry given the name. */
- if ((applet = find_applet_by_name(name)) != NULL) {
- int argc_l;
- char** argv=child->argv;
- for(argc_l=0;*argv!=NULL; argv++, argc_l++);
- applet_name=applet->name;
- optind = 1;
- exit((*(applet->main)) (argc_l, child->argv));
+ {
+ char** argv=child->argv;
+ int argc_l;
+ for(argc_l=0;*argv!=NULL; argv++, argc_l++);
+ optind = 1;
+ run_applet_by_name(name, argc_l, child->argv);
}
#endif
@@ -1750,7 +1747,7 @@
interactive = TRUE;
break;
default:
- usage(shell_usage);
+ show_usage();
}
}
/* A shell is interactive if the `-i' flag was given, or if all of
diff --git a/length.c b/length.c
index 1ab4e3a..9119adc 100644
--- a/length.c
+++ b/length.c
@@ -7,7 +7,7 @@
extern int length_main(int argc, char **argv)
{
if (argc != 2 || **(argv + 1) == '-')
- usage(length_usage);
+ show_usage();
printf("%lu\n", (long)strlen(argv[1]));
return EXIT_SUCCESS;
}
diff --git a/ln.c b/ln.c
index 54e81f4..9dc7f5d 100644
--- a/ln.c
+++ b/ln.c
@@ -101,7 +101,7 @@
flag |= LN_NODEREFERENCE;
break;
default:
- usage(ln_usage);
+ show_usage();
}
}
while(optind<(argc-1)) {
diff --git a/loadacm.c b/loadacm.c
index 345a277..6422137 100644
--- a/loadacm.c
+++ b/loadacm.c
@@ -34,7 +34,7 @@
int fd;
if (argc>=2 && *argv[1]=='-') {
- usage(loadacm_usage);
+ show_usage();
}
fd = open("/dev/tty", O_RDWR);
diff --git a/loadfont.c b/loadfont.c
index ec3e505..d7bd7e8 100644
--- a/loadfont.c
+++ b/loadfont.c
@@ -44,7 +44,7 @@
int fd;
if (argc != 1)
- usage(loadfont_usage);
+ show_usage();
fd = open("/dev/tty0", O_RDWR);
if (fd < 0)
diff --git a/loadkmap.c b/loadkmap.c
index a98601a..5ecd819 100644
--- a/loadkmap.c
+++ b/loadkmap.c
@@ -51,7 +51,7 @@
char flags[MAX_NR_KEYMAPS], buff[7];
if (argc != 1)
- usage(loadkmap_usage);
+ show_usage();
fd = open("/dev/tty0", O_RDWR);
if (fd < 0)
diff --git a/logger.c b/logger.c
index 85c63b8..352bde1 100644
--- a/logger.c
+++ b/logger.c
@@ -122,7 +122,7 @@
strncpy(name, optarg, sizeof(name));
break;
default:
- usage(logger_usage);
+ show_usage();
}
}
diff --git a/logname.c b/logname.c
index d9056c6..a1887aa 100644
--- a/logname.c
+++ b/logname.c
@@ -30,7 +30,7 @@
char user[9];
if (argc > 1)
- usage(logname_usage);
+ show_usage();
my_getpwuid(user, geteuid());
if (*user) {
diff --git a/ls.c b/ls.c
index 42b2445..06e23e6 100644
--- a/ls.c
+++ b/ls.c
@@ -928,5 +928,5 @@
return(status);
print_usage_message:
- usage(ls_usage);
+ show_usage();
}
diff --git a/makedevs.c b/makedevs.c
index f979871..eed3968 100644
--- a/makedevs.c
+++ b/makedevs.c
@@ -32,7 +32,7 @@
char buf[255];
if (argc < 7 || *argv[1]=='-')
- usage(makedevs_usage);
+ show_usage();
switch (type[0]) {
case 'c':
@@ -45,7 +45,7 @@
mode = S_IFIFO;
break;
default:
- usage(makedevs_usage);
+ show_usage();
}
mode |= 0660;
diff --git a/md5sum.c b/md5sum.c
index 97a9400..3decafd 100644
--- a/md5sum.c
+++ b/md5sum.c
@@ -850,7 +850,7 @@
break;
default:
- usage(md5sum_usage);
+ show_usage();
}
}
diff --git a/miscutils/dc.c b/miscutils/dc.c
index 122673a..1e34574 100644
--- a/miscutils/dc.c
+++ b/miscutils/dc.c
@@ -169,7 +169,7 @@
}
} else {
if (*argv[1]=='-')
- usage(dc_usage);
+ show_usage();
while (argc >= 2) {
stack_machine(argv[1]);
argv++;
diff --git a/miscutils/dutmp.c b/miscutils/dutmp.c
index 7e1d2ee..2e6b3c0 100644
--- a/miscutils/dutmp.c
+++ b/miscutils/dutmp.c
@@ -33,7 +33,7 @@
if (argc<2) {
file = fileno(stdin);
} else if (*argv[1] == '-' ) {
- usage(dutmp_usage);
+ show_usage();
} else {
file = open(argv[1], O_RDONLY);
if (file < 0) {
@@ -45,7 +45,7 @@
* fact the stupid libc doesn't have a reliable #define to announce that libc5
* is being used. sigh.
*/
-#if ! defined __GLIBC__
+#if ! defined __GLIBC__ || defined __UCLIBC__
while (read(file, (void*)&ut, sizeof(struct utmp))) {
printf("%d|%d|%s|%s|%s|%s|%s|%lx\n",
ut.ut_type, ut.ut_pid, ut.ut_line,
diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c
index f979871..eed3968 100644
--- a/miscutils/makedevs.c
+++ b/miscutils/makedevs.c
@@ -32,7 +32,7 @@
char buf[255];
if (argc < 7 || *argv[1]=='-')
- usage(makedevs_usage);
+ show_usage();
switch (type[0]) {
case 'c':
@@ -45,7 +45,7 @@
mode = S_IFIFO;
break;
default:
- usage(makedevs_usage);
+ show_usage();
}
mode |= 0660;
diff --git a/miscutils/mktemp.c b/miscutils/mktemp.c
index 3b9f2b2..b352202 100644
--- a/miscutils/mktemp.c
+++ b/miscutils/mktemp.c
@@ -31,7 +31,7 @@
extern int mktemp_main(int argc, char **argv)
{
if (argc != 2 && (argc != 3 || strcmp(argv[1], "-q")))
- usage(mktemp_usage);
+ show_usage();
if(mkstemp(argv[argc-1]) < 0)
return EXIT_FAILURE;
(void) puts(argv[argc-1]);
diff --git a/miscutils/mt.c b/miscutils/mt.c
index 683804b..eb93cb2 100644
--- a/miscutils/mt.c
+++ b/miscutils/mt.c
@@ -57,12 +57,12 @@
int fd;
if (argc < 2) {
- usage(mt_usage);
+ show_usage();
}
if (strcmp(argv[1], "-f") == 0) {
if (argc < 4) {
- usage(mt_usage);
+ show_usage();
}
file = argv[2];
argv += 2;
diff --git a/miscutils/readlink.c b/miscutils/readlink.c
index 57f43d1..c82f640 100644
--- a/miscutils/readlink.c
+++ b/miscutils/readlink.c
@@ -33,7 +33,7 @@
int bufsize = 128, size = 128;
if (argc != 2)
- usage(readlink_usage);
+ show_usage();
while (bufsize < size + 1) {
bufsize *= 2;
diff --git a/miscutils/update.c b/miscutils/update.c
index 309ce0c..2cf4a98 100644
--- a/miscutils/update.c
+++ b/miscutils/update.c
@@ -64,7 +64,7 @@
flush_duration = atoi(optarg);
break;
default:
- usage(update_usage);
+ show_usage();
}
}
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index 7026cc0..65d0fc3 100644
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -31,7 +31,7 @@
int fd;
if (argc != 2) {
- usage(watchdog_usage);
+ show_usage();
}
if ((fd=open(argv[1], O_WRONLY)) == -1) {
diff --git a/mkdir.c b/mkdir.c
index 299f298..285d34f 100644
--- a/mkdir.c
+++ b/mkdir.c
@@ -48,7 +48,7 @@
switch (**argv) {
case 'm':
if (--argc == 0)
- usage(mkdir_usage);
+ show_usage();
/* Find the specified modes */
mode = 0;
if (parse_mode(*(++argv), &mode) == FALSE) {
@@ -63,7 +63,7 @@
parentFlag = TRUE;
break;
default:
- usage(mkdir_usage);
+ show_usage();
}
}
argc--;
@@ -71,7 +71,7 @@
}
if (argc < 1) {
- usage(mkdir_usage);
+ show_usage();
}
while (argc > 0) {
diff --git a/mkfifo.c b/mkfifo.c
index b31e6f1..56a04f7 100644
--- a/mkfifo.c
+++ b/mkfifo.c
@@ -37,7 +37,7 @@
/* Parse any options */
while (argc > 1) {
if (**argv != '-')
- usage(mkfifo_usage);
+ show_usage();
thisarg = *argv;
thisarg++;
switch (*thisarg) {
@@ -47,13 +47,13 @@
parse_mode(*argv, &mode);
break;
default:
- usage(mkfifo_usage);
+ show_usage();
}
argc--;
argv++;
}
if (argc < 1 || *argv[0] == '-')
- usage(mkfifo_usage);
+ show_usage();
if (mkfifo(*argv, mode) < 0)
perror_msg_and_die("mkfifo");
return EXIT_SUCCESS;
diff --git a/mkfs_minix.c b/mkfs_minix.c
index 9b40faa..6b4a3e2 100644
--- a/mkfs_minix.c
+++ b/mkfs_minix.c
@@ -255,13 +255,6 @@
#define mark_zone(x) (setbit(zone_map,(x)-FIRSTZONE+1))
#define unmark_zone(x) (clrbit(zone_map,(x)-FIRSTZONE+1))
-static void show_usage() __attribute__ ((noreturn));
-
-static void show_usage()
-{
- usage(mkfs_minix_usage);
-}
-
/*
* Check to make certain that our new filesystem won't be created on
* an already mounted partition. Code adapted from mke2fs, Copyright
diff --git a/mknod.c b/mknod.c
index c761aea..73f6e06 100644
--- a/mknod.c
+++ b/mknod.c
@@ -53,13 +53,13 @@
umask(0);
break;
default:
- usage(mknod_usage);
+ show_usage();
}
argc--;
argv++;
}
if (argc != 4 && argc != 2) {
- usage(mknod_usage);
+ show_usage();
}
switch (argv[1][0]) {
case 'c':
@@ -72,11 +72,11 @@
case 'p':
mode = S_IFIFO;
if (argc!=2) {
- usage(mknod_usage);
+ show_usage();
}
break;
default:
- usage(mknod_usage);
+ show_usage();
}
if (mode == S_IFCHR || mode == S_IFBLK) {
diff --git a/mkswap.c b/mkswap.c
index 7d690ad..48637e8 100644
--- a/mkswap.c
+++ b/mkswap.c
@@ -287,7 +287,7 @@
PAGES = strtol(argv[0], &tmp, 0) / blocks_per_page;
if (*tmp)
- usage(mkswap_usage);
+ show_usage();
} else
device_name = argv[0];
} else {
@@ -302,13 +302,13 @@
version = atoi(argv[0] + 2);
break;
default:
- usage(mkswap_usage);
+ show_usage();
}
}
}
if (!device_name) {
error_msg("error: Nowhere to set up swap on?");
- usage(mkswap_usage);
+ show_usage();
}
sz = get_size(device_name);
if (!PAGES) {
@@ -331,12 +331,12 @@
}
if (version != 0 && version != 1) {
error_msg("error: unknown version %d", version);
- usage(mkswap_usage);
+ show_usage();
}
if (PAGES < 10) {
error_msg("error: swap area needs to be at least %ldkB",
(long) (10 * pagesize / 1024));
- usage(mkswap_usage);
+ show_usage();
}
#if 0
maxpages = ((version == 0) ? V0_MAX_PAGES : V1_MAX_PAGES);
diff --git a/mktemp.c b/mktemp.c
index 3b9f2b2..b352202 100644
--- a/mktemp.c
+++ b/mktemp.c
@@ -31,7 +31,7 @@
extern int mktemp_main(int argc, char **argv)
{
if (argc != 2 && (argc != 3 || strcmp(argv[1], "-q")))
- usage(mktemp_usage);
+ show_usage();
if(mkstemp(argv[argc-1]) < 0)
return EXIT_FAILURE;
(void) puts(argv[argc-1]);
diff --git a/modutils/insmod.c b/modutils/insmod.c
index e55d9fa..0da0a39 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -81,7 +81,7 @@
#ifndef MODUTILS_MODULE_H
static const int MODUTILS_MODULE_H = 1;
-#ident "$Id: insmod.c,v 1.45 2001/01/31 19:00:21 kraai Exp $"
+#ident "$Id: insmod.c,v 1.46 2001/02/14 21:23:06 andersen Exp $"
/* This file contains the structures used by the 2.0 and 2.1 kernels.
We do not use the kernel headers directly because we do not wish
@@ -287,7 +287,7 @@
#ifndef MODUTILS_OBJ_H
static const int MODUTILS_OBJ_H = 1;
-#ident "$Id: insmod.c,v 1.45 2001/01/31 19:00:21 kraai Exp $"
+#ident "$Id: insmod.c,v 1.46 2001/02/14 21:23:06 andersen Exp $"
/* The relocatable object is manipulated using elfin types. */
@@ -2916,12 +2916,12 @@
* loading the same module 50 times concurrently. */
break;
default:
- usage(insmod_usage);
+ show_usage();
}
}
if (argv[optind] == NULL) {
- usage(insmod_usage);
+ show_usage();
}
/* Grab the module name */
diff --git a/modutils/rmmod.c b/modutils/rmmod.c
index 3a66af8..7d4538e 100644
--- a/modutils/rmmod.c
+++ b/modutils/rmmod.c
@@ -39,7 +39,7 @@
{
int ret = EXIT_SUCCESS;
if (argc <= 1) {
- usage(rmmod_usage);
+ show_usage();
}
/* Parse any options */
@@ -52,7 +52,7 @@
perror_msg_and_die("rmmod");
return EXIT_SUCCESS;
default:
- usage(rmmod_usage);
+ show_usage();
}
}
}
diff --git a/mount.c b/mount.c
index 79813ba..2f5bba5 100644
--- a/mount.c
+++ b/mount.c
@@ -505,5 +505,5 @@
goto singlemount;
goodbye:
- usage(mount_usage);
+ show_usage();
}
diff --git a/mt.c b/mt.c
index 683804b..eb93cb2 100644
--- a/mt.c
+++ b/mt.c
@@ -57,12 +57,12 @@
int fd;
if (argc < 2) {
- usage(mt_usage);
+ show_usage();
}
if (strcmp(argv[1], "-f") == 0) {
if (argc < 4) {
- usage(mt_usage);
+ show_usage();
}
file = argv[2];
argv += 2;
diff --git a/nc.c b/nc.c
index 3f512d1..8927103 100644
--- a/nc.c
+++ b/nc.c
@@ -58,12 +58,12 @@
lport = atoi(optarg);
break;
default:
- usage(nc_usage);
+ show_usage();
}
}
if ((do_listen && optind != argc) || (!do_listen && optind + 2 != argc))
- usage(nc_usage);
+ show_usage();
if ((sfd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
perror_msg_and_die("socket");
diff --git a/networking/hostname.c b/networking/hostname.c
index ce17ba9..e1486b3 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -1,6 +1,6 @@
/* vi: set sw=4 ts=4: */
/*
- * $Id: hostname.c,v 1.23 2001/02/01 16:49:29 kraai Exp $
+ * $Id: hostname.c,v 1.24 2001/02/14 21:23:06 andersen Exp $
* Mini hostname implementation for busybox
*
* Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -66,7 +66,7 @@
char *s = NULL;
if (argc < 1)
- usage(hostname_usage);
+ show_usage();
while (--argc > 0 && **(++argv) == '-') {
while (*(++(*argv))) {
@@ -82,18 +82,18 @@
break;
case 'F':
if (--argc == 0) {
- usage(hostname_usage);
+ show_usage();
}
filename = *(++argv);
break;
case '-':
if (strcmp(++(*argv), "file") || --argc ==0 ) {
- usage(hostname_usage);
+ show_usage();
}
filename = *(++argv);
break;
default:
- usage(hostname_usage);
+ show_usage();
}
if (filename != NULL)
break;
diff --git a/networking/ifconfig.c b/networking/ifconfig.c
index 2134f8a..66615a2 100644
--- a/networking/ifconfig.c
+++ b/networking/ifconfig.c
@@ -15,7 +15,7 @@
* Foundation; either version 2 of the License, or (at
* your option) any later version.
*
- * $Id: ifconfig.c,v 1.1 2001/02/14 08:11:27 andersen Exp $
+ * $Id: ifconfig.c,v 1.2 2001/02/14 21:23:06 andersen Exp $
*
*/
@@ -183,7 +183,7 @@
char host[128];
if(argc < 2) {
- usage(ifconfig_usage);
+ show_usage();
}
/* Create a channel to the NET kernel. */
@@ -269,7 +269,7 @@
if (!strcmp(*spp, "metric")) {
if (*++spp == NULL)
- usage(ifconfig_usage);
+ show_usage();
ifr.ifr_metric = atoi(*spp);
if (ioctl(sockfd, SIOCSIFMETRIC, &ifr) < 0) {
fprintf(stderr, "SIOCSIFMETRIC: %s\n", strerror(errno));
@@ -280,7 +280,7 @@
}
if (!strcmp(*spp, "mtu")) {
if (*++spp == NULL)
- usage(ifconfig_usage);
+ show_usage();
ifr.ifr_mtu = atoi(*spp);
if (ioctl(sockfd, SIOCSIFMTU, &ifr) < 0) {
fprintf(stderr, "SIOCSIFMTU: %s\n", strerror(errno));
@@ -292,7 +292,7 @@
#ifdef SIOCSKEEPALIVE
if (!strcmp(*spp, "keepalive")) {
if (*++spp == NULL)
- usage(ifconfig_usage);
+ show_usage();
ifr.ifr_data = (caddr_t) atoi(*spp);
if (ioctl(sockfd, SIOCSKEEPALIVE, &ifr) < 0) {
fprintf(stderr, "SIOCSKEEPALIVE: %s\n", strerror(errno));
@@ -306,7 +306,7 @@
#ifdef SIOCSOUTFILL
if (!strcmp(*spp, "outfill")) {
if (*++spp == NULL)
- usage(ifconfig_usage);
+ show_usage();
ifr.ifr_data = (caddr_t) atoi(*spp);
if (ioctl(sockfd, SIOCSOUTFILL, &ifr) < 0) {
fprintf(stderr, "SIOCSOUTFILL: %s\n", strerror(errno));
@@ -344,7 +344,7 @@
}
if (!strcmp(*spp, "dstaddr")) {
if (*++spp == NULL)
- usage(ifconfig_usage);
+ show_usage();
safe_strncpy(host, *spp, (sizeof host));
if (INET_resolve(host, &sa) < 0) {
goterr++;
@@ -363,7 +363,7 @@
}
if (!strcmp(*spp, "netmask")) {
if (*++spp == NULL || didnetmask)
- usage(ifconfig_usage);
+ show_usage();
safe_strncpy(host, *spp, (sizeof host));
if (INET_resolve(host, &sa) < 0) {
goterr++;
@@ -409,7 +409,7 @@
if (!strcmp(*spp, "hw")) {
if (*++spp == NULL || strcmp("ether", *spp)) {
- usage(ifconfig_usage);
+ show_usage();
}
if (*++spp == NULL) {
@@ -438,7 +438,7 @@
safe_strncpy(host, *spp, (sizeof host));
if (INET_resolve(host, &sa) < 0) {
- usage(ifconfig_usage);
+ show_usage();
}
memcpy((char *) &ifr.ifr_addr,
(char *) &sa, sizeof(struct sockaddr));
diff --git a/networking/nc.c b/networking/nc.c
index 3f512d1..8927103 100644
--- a/networking/nc.c
+++ b/networking/nc.c
@@ -58,12 +58,12 @@
lport = atoi(optarg);
break;
default:
- usage(nc_usage);
+ show_usage();
}
}
if ((do_listen && optind != argc) || (!do_listen && optind + 2 != argc))
- usage(nc_usage);
+ show_usage();
if ((sfd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
perror_msg_and_die("socket");
diff --git a/networking/nslookup.c b/networking/nslookup.c
index 8bfcd57..33732de 100644
--- a/networking/nslookup.c
+++ b/networking/nslookup.c
@@ -157,7 +157,7 @@
struct hostent *host;
if (argc < 2 || *argv[1]=='-') {
- usage(nslookup_usage);
+ show_usage();
}
server_print();
@@ -170,4 +170,4 @@
return EXIT_SUCCESS;
}
-/* $Id: nslookup.c,v 1.20 2001/01/27 09:33:38 andersen Exp $ */
+/* $Id: nslookup.c,v 1.21 2001/02/14 21:23:06 andersen Exp $ */
diff --git a/networking/ping.c b/networking/ping.c
index 15611ba..c114fb0 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -1,6 +1,6 @@
/* vi: set sw=4 ts=4: */
/*
- * $Id: ping.c,v 1.36 2001/01/31 19:00:21 kraai Exp $
+ * $Id: ping.c,v 1.37 2001/02/14 21:23:06 andersen Exp $
* Mini ping implementation for busybox
*
* Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -251,7 +251,7 @@
argc--;
argv++;
if (argc < 1)
- usage(ping_usage);
+ show_usage();
ping(*argv);
return EXIT_SUCCESS;
}
@@ -522,24 +522,24 @@
break;
case 'c':
if (--argc <= 0)
- usage(ping_usage);
+ show_usage();
argv++;
pingcount = atoi(*argv);
break;
case 's':
if (--argc <= 0)
- usage(ping_usage);
+ show_usage();
argv++;
datalen = atoi(*argv);
break;
default:
- usage(ping_usage);
+ show_usage();
}
argc--;
argv++;
}
if (argc < 1)
- usage(ping_usage);
+ show_usage();
myid = getpid() & 0xFFFF;
ping(*argv);
diff --git a/networking/route.c b/networking/route.c
index 83a0be2..3fad81a 100644
--- a/networking/route.c
+++ b/networking/route.c
@@ -15,7 +15,7 @@
* Foundation; either version 2 of the License, or (at
* your option) any later version.
*
- * $Id: route.c,v 1.2 2001/02/14 19:26:39 andersen Exp $
+ * $Id: route.c,v 1.3 2001/02/14 21:23:06 andersen Exp $
*
* displayroute() code added by Vladimir N. Oleynik <dzo@simtreas.ru>
*/
@@ -115,7 +115,7 @@
args++;
}
if (*args == NULL)
- usage(route_usage);
+ show_usage();
safe_strncpy(target, *args++, (sizeof target));
@@ -152,7 +152,7 @@
args++;
if (!*args || !isdigit(**args))
- usage(route_usage);
+ show_usage();
metric = atoi(*args);
#if HAVE_NEW_ADDRT
rt.rt_metric = metric + 1;
@@ -168,7 +168,7 @@
args++;
if (!*args || mask_in_addr(rt))
- usage(route_usage);
+ show_usage();
safe_strncpy(netmask, *args, (sizeof netmask));
if ((isnet = INET_resolve(netmask, &mask)) < 0) {
fprintf(stderr, "cant resolve netmask %s\n", netmask);
@@ -182,9 +182,9 @@
if (!strcmp(*args, "gw") || !strcmp(*args, "gateway")) {
args++;
if (!*args)
- usage(route_usage);
+ show_usage();
if (rt.rt_flags & RTF_GATEWAY)
- usage(route_usage);
+ show_usage();
safe_strncpy(gateway, *args, (sizeof gateway));
if ((isnet = INET_resolve(gateway, &rt.rt_gateway)) < 0) {
fprintf(stderr, "cant resolve gw %s\n", gateway);
@@ -205,7 +205,7 @@
args++;
rt.rt_flags |= RTF_MSS;
if (!*args)
- usage(route_usage);
+ show_usage();
rt.rt_mss = atoi(*args);
args++;
if (rt.rt_mss < 64 || rt.rt_mss > 32768) {
@@ -218,7 +218,7 @@
if (!strcmp(*args, "window")) {
args++;
if (!*args)
- usage(route_usage);
+ show_usage();
rt.rt_flags |= RTF_WINDOW;
rt.rt_window = atoi(*args);
args++;
@@ -232,7 +232,7 @@
if (!strcmp(*args, "irtt")) {
args++;
if (!*args)
- usage(route_usage);
+ show_usage();
args++;
#if HAVE_RTF_IRTT
rt.rt_flags |= RTF_IRTT;
@@ -277,7 +277,7 @@
if (!strcmp(*args, "device") || !strcmp(*args, "dev")) {
args++;
if (rt.rt_dev || *args == NULL)
- usage(route_usage);
+ show_usage();
rt.rt_dev = *args++;
continue;
}
@@ -285,9 +285,9 @@
if (!rt.rt_dev) {
rt.rt_dev = *args++;
if (*args)
- usage(route_usage); /* must be last to catch typos */
+ show_usage(); /* must be last to catch typos */
} else
- usage(route_usage);
+ show_usage();
}
#if HAVE_RTF_REJECT
@@ -420,7 +420,7 @@
else if (!strcmp(*argv, "flush"))
what = RTACTION_FLUSH;
else
- usage(route_usage);
+ show_usage();
}
INET_setroute(what, 0, ++argv);
diff --git a/networking/telnet.c b/networking/telnet.c
index b08effe..ed92a84 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -498,7 +498,7 @@
cfmakeraw(&G.termios_raw);
- if (argc < 2) usage(telnet_usage);
+ if (argc < 2) show_usage();
port = (argc > 2)? getport(argv[2]): 23;
G.buf = xmalloc(DATABUFSIZE);
diff --git a/networking/wget.c b/networking/wget.c
index c134427..d1aacef 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -105,12 +105,12 @@
fname_out = (strcmp(optarg, "-") == 0 ? (char *)1 : optarg);
break;
default:
- usage(wget_usage);
+ show_usage();
}
}
if (argc - optind != 1)
- usage(wget_usage);
+ show_usage();
/*
* Use the proxy if necessary.
@@ -533,7 +533,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: wget.c,v 1.26 2001/02/01 16:49:30 kraai Exp $
+ * $Id: wget.c,v 1.27 2001/02/14 21:23:06 andersen Exp $
*/
diff --git a/nslookup.c b/nslookup.c
index 8bfcd57..33732de 100644
--- a/nslookup.c
+++ b/nslookup.c
@@ -157,7 +157,7 @@
struct hostent *host;
if (argc < 2 || *argv[1]=='-') {
- usage(nslookup_usage);
+ show_usage();
}
server_print();
@@ -170,4 +170,4 @@
return EXIT_SUCCESS;
}
-/* $Id: nslookup.c,v 1.20 2001/01/27 09:33:38 andersen Exp $ */
+/* $Id: nslookup.c,v 1.21 2001/02/14 21:23:06 andersen Exp $ */
diff --git a/ping.c b/ping.c
index 15611ba..c114fb0 100644
--- a/ping.c
+++ b/ping.c
@@ -1,6 +1,6 @@
/* vi: set sw=4 ts=4: */
/*
- * $Id: ping.c,v 1.36 2001/01/31 19:00:21 kraai Exp $
+ * $Id: ping.c,v 1.37 2001/02/14 21:23:06 andersen Exp $
* Mini ping implementation for busybox
*
* Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -251,7 +251,7 @@
argc--;
argv++;
if (argc < 1)
- usage(ping_usage);
+ show_usage();
ping(*argv);
return EXIT_SUCCESS;
}
@@ -522,24 +522,24 @@
break;
case 'c':
if (--argc <= 0)
- usage(ping_usage);
+ show_usage();
argv++;
pingcount = atoi(*argv);
break;
case 's':
if (--argc <= 0)
- usage(ping_usage);
+ show_usage();
argv++;
datalen = atoi(*argv);
break;
default:
- usage(ping_usage);
+ show_usage();
}
argc--;
argv++;
}
if (argc < 1)
- usage(ping_usage);
+ show_usage();
myid = getpid() & 0xFFFF;
ping(*argv);
diff --git a/pivot_root.c b/pivot_root.c
index 92fe4ae..e007101 100644
--- a/pivot_root.c
+++ b/pivot_root.c
@@ -20,7 +20,7 @@
int pivot_root_main(int argc, char **argv)
{
if (argc != 3)
- usage(pivot_root_usage);
+ show_usage();
if (pivot_root(argv[1],argv[2]) < 0)
perror_msg_and_die("pivot_root");
diff --git a/printf.c b/printf.c
index 72bc7ae..26a200e 100644
--- a/printf.c
+++ b/printf.c
@@ -143,7 +143,7 @@
exit_status = 0;
if (argc <= 1 || **(argv + 1) == '-') {
- usage(printf_usage);
+ show_usage();
}
format = argv[1];
diff --git a/procps/free.c b/procps/free.c
index 17dd386..d287c03 100644
--- a/procps/free.c
+++ b/procps/free.c
@@ -46,7 +46,7 @@
info.bufferram/=info.mem_unit;
if (argc > 1 && **(argv + 1) == '-')
- usage(free_usage);
+ show_usage();
printf("%6s%13s%13s%13s%13s%13s\n", "", "total", "used", "free",
"shared", "buffers");
diff --git a/procps/kill.c b/procps/kill.c
index 00a4d5c..bdd22b5 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -124,22 +124,19 @@
extern int kill_main(int argc, char **argv)
{
int whichApp, sig = SIGTERM;
- const char *appUsage;
#ifdef BB_KILLALL
/* Figure out what we are trying to do here */
whichApp = (strcmp(applet_name, "killall") == 0)? KILLALL : KILL;
- appUsage = (whichApp == KILLALL)? killall_usage : kill_usage;
#else
whichApp = KILL;
- appUsage = kill_usage;
#endif
argc--;
argv++;
/* Parse any options */
if (argc < 1)
- usage(appUsage);
+ show_usage();
while (argc > 0 && **argv == '-') {
while (*++(*argv)) {
@@ -163,7 +160,7 @@
}
break;
case '-':
- usage(appUsage);
+ show_usage();
default:
{
if (isdigit(**argv)) {
diff --git a/procps/ps.c b/procps/ps.c
index eabdef4..dd154af 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -207,7 +207,7 @@
#endif
if (argc > 1 && **(argv + 1) == '-')
- usage(ps_usage);
+ show_usage();
/* open device */
fd = open(device, O_RDONLY);
diff --git a/procps/renice.c b/procps/renice.c
index 9d85ba0..9180ebf 100644
--- a/procps/renice.c
+++ b/procps/renice.c
@@ -32,7 +32,7 @@
{
int prio, status = EXIT_SUCCESS;
- if (argc < 3) usage(renice_usage);
+ if (argc < 3) show_usage();
prio = atoi(*++argv);
if (prio > 20) prio = 20;
diff --git a/ps.c b/ps.c
index eabdef4..dd154af 100644
--- a/ps.c
+++ b/ps.c
@@ -207,7 +207,7 @@
#endif
if (argc > 1 && **(argv + 1) == '-')
- usage(ps_usage);
+ show_usage();
/* open device */
fd = open(device, O_RDONLY);
diff --git a/rdate.c b/rdate.c
index d350be8..38a7689 100644
--- a/rdate.c
+++ b/rdate.c
@@ -95,14 +95,14 @@
/* Interpret command line args */
/* do special-case option parsing */
if (argv[1] && (strcmp(argv[1], "--help") == 0))
- usage(rdate_usage);
+ show_usage();
/* do normal option parsing */
while ((opt = getopt(argc, argv, "Hsp")) > 0) {
switch (opt) {
default:
case 'H':
- usage(rdate_usage);
+ show_usage();
break;
case 's':
setdate++;
@@ -117,7 +117,7 @@
if (printdate==0 && setdate==0) setdate++;
if (optind == argc) {
- usage(rdate_usage);
+ show_usage();
}
if ((time= askremotedate(argv[optind])) == (time_t)-1) {
diff --git a/readlink.c b/readlink.c
index 57f43d1..c82f640 100644
--- a/readlink.c
+++ b/readlink.c
@@ -33,7 +33,7 @@
int bufsize = 128, size = 128;
if (argc != 2)
- usage(readlink_usage);
+ show_usage();
while (bufsize < size + 1) {
bufsize *= 2;
diff --git a/renice.c b/renice.c
index 9d85ba0..9180ebf 100644
--- a/renice.c
+++ b/renice.c
@@ -32,7 +32,7 @@
{
int prio, status = EXIT_SUCCESS;
- if (argc < 3) usage(renice_usage);
+ if (argc < 3) show_usage();
prio = atoi(*++argv);
if (prio > 20) prio = 20;
diff --git a/rm.c b/rm.c
index ce293a2..5660767 100644
--- a/rm.c
+++ b/rm.c
@@ -84,7 +84,7 @@
stopIt = TRUE;
break;
default:
- usage(rm_usage);
+ show_usage();
}
argc--;
argv++;
@@ -94,7 +94,7 @@
}
if (argc < 1 && forceFlag == FALSE) {
- usage(rm_usage);
+ show_usage();
}
while (argc-- > 0) {
diff --git a/rmdir.c b/rmdir.c
index 86346dd..6266ce1 100644
--- a/rmdir.c
+++ b/rmdir.c
@@ -33,7 +33,7 @@
int status = EXIT_SUCCESS;
if (argc == 1 || **(argv + 1) == '-')
- usage(rmdir_usage);
+ show_usage();
while (--argc > 0) {
if (rmdir(*(++argv)) == -1) {
diff --git a/rmmod.c b/rmmod.c
index 3a66af8..7d4538e 100644
--- a/rmmod.c
+++ b/rmmod.c
@@ -39,7 +39,7 @@
{
int ret = EXIT_SUCCESS;
if (argc <= 1) {
- usage(rmmod_usage);
+ show_usage();
}
/* Parse any options */
@@ -52,7 +52,7 @@
perror_msg_and_die("rmmod");
return EXIT_SUCCESS;
default:
- usage(rmmod_usage);
+ show_usage();
}
}
}
diff --git a/route.c b/route.c
index 83a0be2..3fad81a 100644
--- a/route.c
+++ b/route.c
@@ -15,7 +15,7 @@
* Foundation; either version 2 of the License, or (at
* your option) any later version.
*
- * $Id: route.c,v 1.2 2001/02/14 19:26:39 andersen Exp $
+ * $Id: route.c,v 1.3 2001/02/14 21:23:06 andersen Exp $
*
* displayroute() code added by Vladimir N. Oleynik <dzo@simtreas.ru>
*/
@@ -115,7 +115,7 @@
args++;
}
if (*args == NULL)
- usage(route_usage);
+ show_usage();
safe_strncpy(target, *args++, (sizeof target));
@@ -152,7 +152,7 @@
args++;
if (!*args || !isdigit(**args))
- usage(route_usage);
+ show_usage();
metric = atoi(*args);
#if HAVE_NEW_ADDRT
rt.rt_metric = metric + 1;
@@ -168,7 +168,7 @@
args++;
if (!*args || mask_in_addr(rt))
- usage(route_usage);
+ show_usage();
safe_strncpy(netmask, *args, (sizeof netmask));
if ((isnet = INET_resolve(netmask, &mask)) < 0) {
fprintf(stderr, "cant resolve netmask %s\n", netmask);
@@ -182,9 +182,9 @@
if (!strcmp(*args, "gw") || !strcmp(*args, "gateway")) {
args++;
if (!*args)
- usage(route_usage);
+ show_usage();
if (rt.rt_flags & RTF_GATEWAY)
- usage(route_usage);
+ show_usage();
safe_strncpy(gateway, *args, (sizeof gateway));
if ((isnet = INET_resolve(gateway, &rt.rt_gateway)) < 0) {
fprintf(stderr, "cant resolve gw %s\n", gateway);
@@ -205,7 +205,7 @@
args++;
rt.rt_flags |= RTF_MSS;
if (!*args)
- usage(route_usage);
+ show_usage();
rt.rt_mss = atoi(*args);
args++;
if (rt.rt_mss < 64 || rt.rt_mss > 32768) {
@@ -218,7 +218,7 @@
if (!strcmp(*args, "window")) {
args++;
if (!*args)
- usage(route_usage);
+ show_usage();
rt.rt_flags |= RTF_WINDOW;
rt.rt_window = atoi(*args);
args++;
@@ -232,7 +232,7 @@
if (!strcmp(*args, "irtt")) {
args++;
if (!*args)
- usage(route_usage);
+ show_usage();
args++;
#if HAVE_RTF_IRTT
rt.rt_flags |= RTF_IRTT;
@@ -277,7 +277,7 @@
if (!strcmp(*args, "device") || !strcmp(*args, "dev")) {
args++;
if (rt.rt_dev || *args == NULL)
- usage(route_usage);
+ show_usage();
rt.rt_dev = *args++;
continue;
}
@@ -285,9 +285,9 @@
if (!rt.rt_dev) {
rt.rt_dev = *args++;
if (*args)
- usage(route_usage); /* must be last to catch typos */
+ show_usage(); /* must be last to catch typos */
} else
- usage(route_usage);
+ show_usage();
}
#if HAVE_RTF_REJECT
@@ -420,7 +420,7 @@
else if (!strcmp(*argv, "flush"))
what = RTACTION_FLUSH;
else
- usage(route_usage);
+ show_usage();
}
INET_setroute(what, 0, ++argv);
diff --git a/rpmunpack.c b/rpmunpack.c
index e37ac2c..79971fa 100644
--- a/rpmunpack.c
+++ b/rpmunpack.c
@@ -64,7 +64,7 @@
/* Check for command line parameters */
if (argc>=2 && *argv[1]=='-') {
- usage(rpmunpack_usage);
+ show_usage();
}
/* Open input file */
diff --git a/sed.c b/sed.c
index 0ce9f45..3901813 100644
--- a/sed.c
+++ b/sed.c
@@ -673,7 +673,7 @@
while ((opt = getopt(argc, argv, "hne:f:")) > 0) {
switch (opt) {
case 'h':
- usage(sed_usage);
+ show_usage();
break;
case 'n':
be_quiet++;
@@ -691,7 +691,7 @@
* argv[optind] should be the pattern. no pattern, no worky */
if (ncmds == 0) {
if (argv[optind] == NULL)
- usage(sed_usage);
+ show_usage();
else {
add_cmd_str(argv[optind]);
optind++;
diff --git a/setkeycodes.c b/setkeycodes.c
index 3e511ad..0be4724 100644
--- a/setkeycodes.c
+++ b/setkeycodes.c
@@ -43,7 +43,7 @@
struct kbkeycode a;
if (argc % 2 != 1 || argc < 2) {
- usage(setkeycodes_usage);
+ show_usage();
}
fd = get_console_fd("/dev/console");
diff --git a/sh.c b/sh.c
index b1a7b93..9519538 100644
--- a/sh.c
+++ b/sh.c
@@ -1370,7 +1370,6 @@
{
struct built_in_command *x;
#ifdef BB_FEATURE_SH_STANDALONE_SHELL
- struct BB_applet *applet;
char *name;
#endif
@@ -1415,14 +1414,12 @@
name = get_last_path_component(name);
#endif
- /* Do a binary search to find the applet entry given the name. */
- if ((applet = find_applet_by_name(name)) != NULL) {
- int argc_l;
- char** argv=child->argv;
- for(argc_l=0;*argv!=NULL; argv++, argc_l++);
- applet_name=applet->name;
- optind = 1;
- exit((*(applet->main)) (argc_l, child->argv));
+ {
+ char** argv=child->argv;
+ int argc_l;
+ for(argc_l=0;*argv!=NULL; argv++, argc_l++);
+ optind = 1;
+ run_applet_by_name(name, argc_l, child->argv);
}
#endif
@@ -1750,7 +1747,7 @@
interactive = TRUE;
break;
default:
- usage(shell_usage);
+ show_usage();
}
}
/* A shell is interactive if the `-i' flag was given, or if all of
diff --git a/shell/lash.c b/shell/lash.c
index b1a7b93..9519538 100644
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -1370,7 +1370,6 @@
{
struct built_in_command *x;
#ifdef BB_FEATURE_SH_STANDALONE_SHELL
- struct BB_applet *applet;
char *name;
#endif
@@ -1415,14 +1414,12 @@
name = get_last_path_component(name);
#endif
- /* Do a binary search to find the applet entry given the name. */
- if ((applet = find_applet_by_name(name)) != NULL) {
- int argc_l;
- char** argv=child->argv;
- for(argc_l=0;*argv!=NULL; argv++, argc_l++);
- applet_name=applet->name;
- optind = 1;
- exit((*(applet->main)) (argc_l, child->argv));
+ {
+ char** argv=child->argv;
+ int argc_l;
+ for(argc_l=0;*argv!=NULL; argv++, argc_l++);
+ optind = 1;
+ run_applet_by_name(name, argc_l, child->argv);
}
#endif
@@ -1750,7 +1747,7 @@
interactive = TRUE;
break;
default:
- usage(shell_usage);
+ show_usage();
}
}
/* A shell is interactive if the `-i' flag was given, or if all of
diff --git a/sleep.c b/sleep.c
index 61b7ce4..d21af19 100644
--- a/sleep.c
+++ b/sleep.c
@@ -29,7 +29,7 @@
extern int sleep_main(int argc, char **argv)
{
if ((argc < 2) || (**(argv + 1) == '-')) {
- usage(sleep_usage);
+ show_usage();
}
if (sleep(atoi(*(++argv))) != 0)
diff --git a/sort.c b/sort.c
index 2aef2d9..4984f5d 100644
--- a/sort.c
+++ b/sort.c
@@ -56,7 +56,7 @@
break;
#endif
default:
- usage(sort_usage);
+ show_usage();
}
}
diff --git a/swaponoff.c b/swaponoff.c
index 74f6ec3..8dda097 100644
--- a/swaponoff.c
+++ b/swaponoff.c
@@ -107,5 +107,5 @@
return EXIT_SUCCESS;
usage_and_exit:
- usage((whichApp == SWAPON_APP) ? swapon_usage : swapoff_usage);
+ show_usage();
}
diff --git a/sync.c b/sync.c
index f95c24c..fc5a42b 100644
--- a/sync.c
+++ b/sync.c
@@ -28,6 +28,6 @@
extern int sync_main(int argc, char **argv)
{
if (argc > 1 && **(argv + 1) == '-')
- usage(sync_usage);
+ show_usage();
return(sync());
}
diff --git a/sysklogd/logger.c b/sysklogd/logger.c
index 85c63b8..352bde1 100644
--- a/sysklogd/logger.c
+++ b/sysklogd/logger.c
@@ -122,7 +122,7 @@
strncpy(name, optarg, sizeof(name));
break;
default:
- usage(logger_usage);
+ show_usage();
}
}
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 7bd4bdc..872728b 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -519,7 +519,7 @@
break;
#endif
default:
- usage(syslogd_usage);
+ show_usage();
}
}
diff --git a/syslogd.c b/syslogd.c
index 7bd4bdc..872728b 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -519,7 +519,7 @@
break;
#endif
default:
- usage(syslogd_usage);
+ show_usage();
}
}
diff --git a/tail.c b/tail.c
index d45b29c..a3b8f6d 100644
--- a/tail.c
+++ b/tail.c
@@ -103,7 +103,7 @@
break;
#endif
default:
- usage(tail_usage);
+ show_usage();
}
}
diff --git a/tar.c b/tar.c
index fb0fcc6..62f1b1d 100644
--- a/tar.c
+++ b/tar.c
@@ -214,7 +214,7 @@
int opt;
if (argc <= 1)
- usage(tar_usage);
+ show_usage();
if (argv[1][0] != '-') {
char *tmp = xmalloc(strlen(argv[1]) + 2);
@@ -283,7 +283,7 @@
break;
#endif
default:
- usage(tar_usage);
+ show_usage();
}
}
diff --git a/tee.c b/tee.c
index aa3098c..439cf7d 100644
--- a/tee.c
+++ b/tee.c
@@ -38,7 +38,7 @@
mode = "a";
break;
default:
- usage(tee_usage);
+ show_usage();
}
}
diff --git a/telnet.c b/telnet.c
index b08effe..ed92a84 100644
--- a/telnet.c
+++ b/telnet.c
@@ -498,7 +498,7 @@
cfmakeraw(&G.termios_raw);
- if (argc < 2) usage(telnet_usage);
+ if (argc < 2) show_usage();
port = (argc > 2)? getport(argv[2]): 23;
G.buf = xmalloc(DATABUFSIZE);
diff --git a/touch.c b/touch.c
index e174baa..a3256d5 100644
--- a/touch.c
+++ b/touch.c
@@ -44,13 +44,13 @@
create = FALSE;
break;
default:
- usage(touch_usage);
+ show_usage();
}
}
}
if (argc < 1) {
- usage(touch_usage);
+ show_usage();
}
while (argc > 0) {
diff --git a/tr.c b/tr.c
index 36f29de..92f399e 100644
--- a/tr.c
+++ b/tr.c
@@ -170,7 +170,7 @@
sq_fl = TRUE;
break;
default:
- usage(tr_usage);
+ show_usage();
}
}
index++;
diff --git a/tty.c b/tty.c
index 2a64b14..d71d8de 100644
--- a/tty.c
+++ b/tty.c
@@ -32,7 +32,7 @@
if (argc > 1) {
if (argv[1][0] != '-' || argv[1][1] != 's')
- usage(tty_usage);
+ show_usage();
} else {
tty = ttyname(0);
if (tty)
diff --git a/umount.c b/umount.c
index 39842d2..c160ec2 100644
--- a/umount.c
+++ b/umount.c
@@ -235,7 +235,7 @@
extern int umount_main(int argc, char **argv)
{
if (argc < 2) {
- usage(umount_usage);
+ show_usage();
}
#ifdef BB_FEATURE_CLEAN_UP
atexit(mtab_free);
@@ -269,7 +269,7 @@
case 'v':
break; /* ignore -v */
default:
- usage(umount_usage);
+ show_usage();
}
}
diff --git a/uname.c b/uname.c
index deaffd7..899da77 100644
--- a/uname.c
+++ b/uname.c
@@ -106,7 +106,7 @@
PRINT_MACHINE);
break;
default:
- usage(uname_usage);
+ show_usage();
}
}
}
diff --git a/unix2dos.c b/unix2dos.c
index 553ad0c..37da9a9 100644
--- a/unix2dos.c
+++ b/unix2dos.c
@@ -30,7 +30,7 @@
if (argc > 1) {
c = *argv[1];
if (c == '-') {
- usage(unix2dos_usage);
+ show_usage();
}
}
c = getchar();
diff --git a/update.c b/update.c
index 309ce0c..2cf4a98 100644
--- a/update.c
+++ b/update.c
@@ -64,7 +64,7 @@
flush_duration = atoi(optarg);
break;
default:
- usage(update_usage);
+ show_usage();
}
}
diff --git a/usage.c b/usage.c
index 7f99808..1515c08 100644
--- a/usage.c
+++ b/usage.c
@@ -1,1635 +1,2 @@
-#include "busybox.h"
-
-#if defined BB_AR
-const char ar_usage[] =
- "ar -[ovR]{ptx} archive filenames"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nExtract or list files from an ar archive.\n\n"
- "Options:\n"
- "\t-o\t\tpreserve original dates\n"
- "\t-p\t\textract to stdout\n"
- "\t-t\t\tlist\n"
- "\t-x\t\textract\n"
- "\t-v\t\tverbosely list files processed\n"
- "\t-R\t\trecursive action"
-#endif
- ;
-#endif
-
-#if defined BB_BASENAME
-const char basename_usage[] =
- "basename FILE [SUFFIX]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nStrips directory path and suffixes from FILE.\n"
- "If specified, also removes any trailing SUFFIX."
-#endif
- ;
-#endif
-
-#if defined BB_CAT
-const char cat_usage[] =
- "cat [FILE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nConcatenates FILE(s) and prints them to stdout."
-#endif
- ;
-#endif
-
-#if defined BB_CHMOD_CHOWN_CHGRP
-const char chgrp_usage[] =
- "chgrp [OPTION]... GROUP FILE..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nChange the group membership of each FILE to GROUP.\n"
- "\nOptions:\n\t-R\tChanges files and directories recursively."
-#endif
- ;
-#endif
-
-#if defined BB_CHMOD_CHOWN_CHGRP
-const char chmod_usage[] =
- "chmod [-R] MODE[,MODE]... FILE..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nEach MODE is one or more of the letters ugoa, one of the symbols +-= and\n"
- "one or more of the letters rwxst.\n\n"
- "\nOptions:\n\t-R\tChanges files and directories recursively."
-#endif
- ;
-#endif
-
-#if defined BB_CHMOD_CHOWN_CHGRP
-const char chown_usage[] =
- "chown [OPTION]... OWNER[<.|:>[GROUP] FILE..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nChange the owner and/or group of each FILE to OWNER and/or GROUP.\n"
- "\nOptions:\n\t-R\tChanges files and directories recursively."
-#endif
- ;
-#endif
-
-#if defined BB_CHROOT
-const char chroot_usage[] =
- "chroot NEWROOT [COMMAND...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nRun COMMAND with root directory set to NEWROOT."
-#endif
- ;
-#endif
-
-#if defined BB_CHVT
-const char chvt_usage[] =
- "chvt N"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nChanges the foreground virtual terminal to /dev/ttyN"
-#endif
- ;
-#endif
-
-#if defined BB_CLEAR
-const char clear_usage[] =
- "clear"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nClear screen."
-#endif
- ;
-#endif
-
-#if defined BB_CMP
-const char cmp_usage[] =
- "cmp FILE1 [FILE2]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nCompare files."
-#endif
- ;
-#endif
-
-#if defined BB_CP_MV
-const char cp_usage[] =
- "cp [OPTION]... SOURCE DEST\n"
- " or: cp [OPTION]... SOURCE... DIRECTORY"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nCopies SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
- "\n"
- "\t-a\tSame as -dpR\n"
- "\t-d\tPreserves links\n"
- "\t-p\tPreserves file attributes if possible\n"
- "\t-f\tforce (implied; ignored) - always set\n"
- "\t-R\tCopies directories recursively"
-#endif
- ;
-#endif
-
-#if defined BB_CUT
-const char cut_usage[] =
- "cut [OPTION]... [FILE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrints selected fields from each input FILE to standard output.\n\n"
- "Options:\n"
- "\t-b LIST\tOutput only bytes from LIST\n"
- "\t-c LIST\tOutput only characters from LIST\n"
- "\t-d CHAR\tUse CHAR instead of tab as the field delimiter\n"
- "\t-s\tOutput only the lines containing delimiter\n"
- "\t-f N\tPrint only these fields\n"
- "\t-n\tIgnored"
-#endif
- ;
-#endif
-
-#if defined BB_DATE
-const char date_usage[] =
- "date [OPTION]... [+FORMAT]\n"
- " or: date [OPTION] [MMDDhhmm[[CC]YY][.ss]]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nDisplays the current time in the given FORMAT, or sets the system date.\n"
- "\nOptions:\n\t-R\t\tOutputs RFC-822 compliant date string\n"
- "\t-d STRING\tdisplay time described by STRING, not `now'\n"
- "\t-s\t\tSets time described by STRING\n"
- "\t-u\t\tPrints or sets Coordinated Universal Time"
-#endif
- ;
-#endif
-
-#if defined BB_DC
-const char dc_usage[] =
- "dc expression ..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nThis is a Tiny RPN calculator that understands the\n"
- "following operations: +, -, /, *, and, or, not, eor.\n"
- "i.e. 'dc 2 2 add' -> 4, and 'dc 8 8 \\* 2 2 + /' -> 16"
-#endif
- ;
-#endif
-
-#if defined BB_DD
-const char dd_usage[] =
- "dd [if=FILE] [of=FILE] [bs=N] [count=N] [skip=N] [seek=N] [conv=notrunc|sync]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nCopy a file, converting and formatting according to options\n\n"
- "\tif=FILE\tread from FILE instead of stdin\n"
- "\tof=FILE\twrite to FILE instead of stdout\n"
- "\tbs=N\tread and write N bytes at a time\n"
- "\tcount=N\tcopy only N input blocks\n"
- "\tskip=N\tskip N input blocks\n"
- "\tseek=N\tskip N output blocks\n"
- "\tconv=notrunc\tdon't truncate output file\n"
- "\tconv=sync\tpad blocks with zeros\n"
- "\n"
- "Numbers may be suffixed by c (x1), w (x2), b (x512), kD (x1000), k (x1024),\n"
- "MD (x1000000), M (x1048576), GD (x1000000000) or G (x1073741824)."
-#endif
- ;
-#endif
-
-#if defined BB_DEALLOCVT
-const char deallocvt_usage[] =
- "deallocvt N"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nDeallocate unused virtual terminal /dev/ttyN"
-#endif
- ;
-#endif
-
-#if defined BB_DF
-const char df_usage[] =
- "df [-?"
-#ifdef BB_FEATURE_HUMAN_READABLE
- "hm"
-#endif
- "k] [filesystem ...]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrint the filesystem space used and space available."
- "Options:\n"
- "\t-?\tshow usage information\n"
-#ifdef BB_FEATURE_HUMAN_READABLE
- "\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n"
- "\t-m\tprint sizes in megabytes\n"
- "\t-k\tprint sizes in kilobytes(default)\n"
-#else
- "\t-k\tprint sizes in kilobytes(compatability)\n"
-#endif
-#endif
- ;
-#endif
-
-#if defined BB_DIRNAME
-const char dirname_usage[] =
- "dirname [FILENAME ...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nStrips non-directory suffix from FILENAME"
-#endif
- ;
-#endif
-
-#if defined BB_DMESG
-const char dmesg_usage[] =
- "dmesg [-c] [-n LEVEL] [-s SIZE]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrints or controls the kernel ring buffer\n\n"
- "Options:\n"
- "\t-c\t\tClears the ring buffer's contents after printing\n"
- "\t-n LEVEL\tSets console logging level\n"
- "\t-s SIZE\t\tUse a buffer of size SIZE"
-#endif
- ;
-#endif
-
-#if defined BB_DOS2UNIX
-const char dos2unix_usage[] =
- "dos2unix < dosfile > unixfile"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nConverts a text file from dos format to unix format."
-#endif
- ;
-#endif
-
-#if defined BB_DPKG
-const char dpkg_usage[] =
- "udpkg <-i|-r|--unpack|--configure> my.deb\n"
- "WORK IN PROGRESS, only usefull for debian-installer\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-#endif
- ;
-#endif
-
-#if defined BB_DPKG_DEB
-const char dpkg_deb_usage[] =
- "dpkg-deb [-cexX] file directory"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPerform actions on debian packages (.debs)\n\n"
- "Options:\n"
- "\t-c\tList contents of filesystem tree (verbose)\n"
- "\t-l\tList contents of filesystem tree (.list format)\n"
- "\t-e\tExtract control files to directory\n"
- "\t-x\tExctract packages filesystem tree to directory\n"
- "\t-X\tVerbose extract"
-#endif
- ;
-#endif
-
-#if defined BB_DU
-const char du_usage[] =
- "du [-?ls"
-#ifdef BB_FEATURE_HUMAN_READABLE
- "hm"
-#endif
- "k] [FILE]...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nSummarizes disk space used for each FILE and/or directory.\n"
- "Disk space is printed in units of 1024 bytes.\n\n"
- "Options:\n"
- "\t-?\tshow usage information\n"
- "\t-l\tcount sizes many times if hard linked\n"
- "\t-s\tdisplay only a total for each argument"
-#ifdef BB_FEATURE_HUMAN_READABLE
- "\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n"
- "\t-m\tprint sizes in megabytes\n"
- "\t-k\tprint sizes in kilobytes(default)\n"
-#else
- "\t-k\tprint sizes in kilobytes(compatability)\n"
-#endif
-#endif
- ;
-#endif
-
-#if defined BB_DUMPKMAP
-const char dumpkmap_usage[] =
- "dumpkmap > keymap"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrints out a binary keyboard translation table to standard input."
-#endif
- ;
-#endif
-
-#if defined BB_DUTMP
-const char dutmp_usage[] =
- "dutmp [FILE]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nDump utmp file format (pipe delimited) from FILE\n"
- "or stdin to stdout. (i.e. 'dutmp /var/run/utmp')"
-#endif
- ;
-#endif
-
-#if defined BB_ECHO
-const char echo_usage[] =
- "echo [-neE] [ARG ...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrints the specified ARGs to stdout\n\n"
- "Options:\n"
- "\t-n\tsuppress trailing newline\n"
- "\t-e\tinterpret backslash-escaped characters (i.e. \\t=tab etc)\n"
- "\t-E\tdisable interpretation of backslash-escaped characters"
-#endif
- ;
-#endif
-
-#if defined BB_EXPR
-const char expr_usage[] =
- "expr EXPRESSION"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-"\n\nPrints the value of EXPRESSION to standard output.\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 ARG1 is less than ARG2\n"
-"ARG1 <= ARG2 ARG1 is less than or equal to ARG2\n"
-"ARG1 = ARG2 ARG1 is equal to ARG2\n"
-"ARG1 != ARG2 ARG1 is unequal to ARG2\n"
-"ARG1 >= ARG2 ARG1 is greater than or equal to ARG2\n"
-"ARG1 > ARG2 ARG1 is greater than ARG2\n"
-"ARG1 + ARG2 arithmetic sum of ARG1 and ARG2\n"
-"ARG1 - ARG2 arithmetic difference of ARG1 and ARG2\n"
-"ARG1 * ARG2 arithmetic product of ARG1 and ARG2\n"
-"ARG1 / ARG2 arithmetic quotient of ARG1 divided by ARG2\n"
-"ARG1 % ARG2 arithmetic remainder of ARG1 divided by 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 it is a \n"
-" keyword like `match' or an 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."
-
-#endif
- ;
-#endif
-
-
-#if defined BB_TRUE_FALSE
-const char false_usage[] =
- "false"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nReturn an exit code of FALSE (1)."
-#endif
- ;
-#endif
-
-#if defined BB_FDFLUSH
-const char fdflush_usage[] =
- "fdflush DEVICE"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nForces floppy disk drive to detect disk change"
-#endif
- ;
-#endif
-
-#if defined BB_FIND
-const char find_usage[] =
- "find [PATH...] [EXPRESSION]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nSearch for files in a directory hierarchy. The default PATH is\n"
- "the current directory; default EXPRESSION is '-print'\n\n"
- "\nEXPRESSION may consist of:\n"
- "\t-follow\t\tDereference symbolic links.\n"
- "\t-name PATTERN\tFile name (leading directories removed) matches PATTERN.\n"
-#ifdef BB_FEATURE_FIND_TYPE
- "\t-type X\t\tFiletype matches X (where X is one of: f,d,l,b,c,...)\n"
-#endif
-#ifdef BB_FEATURE_FIND_PERM
- "\t-perm PERMS\tPermissions match any of (+NNN); all of (-NNN); or exactly (NNN)\n"
-#endif
-#ifdef BB_FEATURE_FIND_MTIME
- "\t-mtime TIME\tModified time is greater than (+N); less than (-N); or exactly (N) days\n"
-#endif
-#endif
- ;
-#endif
-
-#if defined BB_FREE
-const char free_usage[] =
- "free"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nDisplays the amount of free and used system memory"
-#endif
- ;
-#endif
-
-#if defined BB_FREERAMDISK
-const char freeramdisk_usage[] =
- "freeramdisk DEVICE"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nFrees all memory used by the specified ramdisk."
-#endif
- ;
-#endif
-
-#if defined BB_FSCK_MINIX
-const char fsck_minix_usage[] =
- "Usage: fsck.minix [-larvsmf] /dev/name"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPerforms a consistency check for MINIX filesystems.\n\n"
- "Options:\n"
- "\t-l\tLists all filenames\n"
- "\t-r\tPerform interactive repairs\n"
- "\t-a\tPerform automatic repairs\n"
- "\t-v\tverbose\n"
- "\t-s\tOutputs super-block information\n"
- "\t-m\tActivates MINIX-like \"mode not cleared\" warnings\n"
- "\t-f\tForce file system check."
-#endif
- ;
-#endif
-
-#if defined BB_GETOPT
-const char getopt_usage[] =
-"getopt [OPTIONS]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
-"\nParse command options\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, --unqote Do not quote the output"
-#endif
-;
-#endif
-
-#if defined BB_GREP
-const char grep_usage[] =
- "grep [-ihHnqvs] pattern [files...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nSearch for PATTERN in each FILE or standard input.\n\n"
- "Options:\n"
- "\t-H\tprefix output lines with filename where match was found\n"
- "\t-h\tsuppress the prefixing filename on output\n"
- "\t-i\tignore case distinctions\n"
- "\t-n\tprint line number with output lines\n"
- "\t-q\tbe quiet. Returns 0 if result was found, 1 otherwise\n"
- "\t-v\tselect non-matching lines\n"
- "\t-s\tsuppress file open/read error messages"
-#endif
- ;
-#endif
-
-#if defined BB_GUNZIP
-const char gunzip_usage[] =
- "gunzip [OPTION]... FILE"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nUncompress FILE (or standard input if FILE is '-').\n\n"
- "Options:\n"
- "\t-c\tWrite output to standard output\n"
- "\t-t\tTest compressed file integrity"
-#endif
- ;
-#endif
-
-#if defined BB_GZIP
-const char gzip_usage[] =
- "gzip [OPTION]... FILE"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nCompress FILE with maximum compression.\n"
- "When FILE is '-', reads standard input. Implies -c.\n\n"
- "Options:\n"
- "\t-c\tWrite output to standard output instead of FILE.gz\n"
- "\t-d\tdecompress"
-#endif
- ;
-#endif
-
-#if defined BB_HALT
-const char halt_usage[] =
- "halt"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nHalt the system."
-#endif
- ;
-#endif
-
-#if defined BB_HEAD
-const char head_usage[] =
- "head [OPTION] [FILE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrint first 10 lines of each FILE to standard output.\n"
- "With more than one FILE, precede each with a header giving the\n"
- "file name. With no FILE, or when FILE is -, read standard input.\n\n"
-
- "Options:\n" "\t-n NUM\t\tPrint first NUM lines instead of first 10"
-#endif
- ;
-#endif
-
-#if defined BB_HOSTID
-const char hostid_usage[] =
- "hostid"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrint out a unique 32-bit identifier for the machine."
-#endif
- ;
-#endif
-
-#if defined BB_HOSTNAME
-const char hostname_usage[] =
- "hostname [OPTION] {hostname | -F file}"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nGet or set the hostname or DNS domain name. If a hostname is given\n"
- "(or a file with the -F parameter), the host name will be set.\n\n"
-
- "Options:\n"
- "\t-s\t\tShort\n"
- "\t-i\t\tAddresses for the hostname\n"
- "\t-d\t\tDNS domain name\n"
- "\t-F, --file FILE\tUse the contents of FILE to specify the hostname"
-#endif
- ;
-#endif
-
-#if defined BB_ID
-const char id_usage[] =
- "id [OPTIONS]... [USERNAME]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrint information for USERNAME or the current user\n\n"
- "Options:\n"
- "\t-g\tprints only the group ID\n"
- "\t-u\tprints only the user ID\n"
- "\t-n\tprint a name instead of a number (with for -ug)\n"
- "\t-r\tprints the real user ID instead of the effective ID (with -ug)"
-#endif
- ;
-#endif
-
-#if defined BB_IFCONFIG
-const char ifconfig_usage[] =
- "ifconfig [-a] [-i] [-v] <interface> [<address>]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nconfigure a network interface\n\n"
- "Options:\n"
- " [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n"
- " [netmask <address>] [dstaddr <address>] [tunnel <adress>]\n"
-#ifdef SIOCSKEEPALIVE
- " [outfill <NN>] [keepalive <NN>]\n"
-#endif
- " [hw ether <address>] [metric <NN>] [mtu <NN>]\n"
- " [[-]trailers] [[-]arp] [[-]allmulti]\n"
- " [multicast] [[-]promisc]\n"
- " [mem_start <NN>] [io_addr <NN>] [irq <NN>] [media <type>]\n"
- " [up|down] ..."
-#endif
- ;
-#endif
-
-#if defined BB_INSMOD
-const char insmod_usage[] =
- "insmod [OPTION]... MODULE [symbol=value]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nLoads the specified kernel modules into the kernel.\n\n"
- "Options:\n"
- "\t-f\tForce module to load into the wrong kernel version.\n"
- "\t-k\tMake module autoclean-able.\n"
- "\t-v\tverbose output\n"
- "\t-L\tLock to prevent simultaneous loads of a module\n"
- "\t-x\tdo not export externs"
-#endif
- ;
-#endif
-
-#if defined BB_KILL
-const char kill_usage[] =
- "kill [-signal] process-id [process-id ...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nSend a signal (default is SIGTERM) to the specified process(es).\n\n"
- "Options:\n" "\t-l\tList all signal names and numbers."
-#endif
- ;
-#endif
-
-#if defined BB_KILLALL
-const char killall_usage[] =
- "killall [-signal] process-name [process-name ...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nSend a signal (default is SIGTERM) to the specified process(es).\n\n"
- "Options:\n" "\t-l\tList all signal names and numbers."
-#endif
- ;
-#endif
-
-#if defined BB_LENGTH
-const char length_usage[] =
- "length STRING"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrints out the length of the specified STRING."
-#endif
- ;
-#endif
-
-#if defined BB_LN
-const char ln_usage[] =
- "ln [OPTION] TARGET... LINK_NAME|DIRECTORY"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nCreate a link named LINK_NAME or DIRECTORY to the specified TARGET\n"
- "\nYou may use '--' to indicate that all following arguments are non-options.\n\n"
- "Options:\n"
- "\t-s\tmake symbolic links instead of hard links\n"
- "\t-f\tremove existing destination files\n"
- "\t-n\tno dereference symlinks - treat like normal file"
-#endif
- ;
-#endif
-
-#if defined BB_LOADACM
-const char loadacm_usage[] =
- "loadacm < mapfile"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nLoads an acm from standard input."
-#endif
- ;
-#endif
-
-#if defined BB_LOADFONT
-const char loadfont_usage[] =
- "loadfont < font"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nLoads a console font from standard input."
-#endif
- ;
-#endif
-
-#if defined BB_LOADKMAP
-const char loadkmap_usage[] =
- "loadkmap < keymap"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nLoads a binary keyboard translation table from standard input."
-#endif
- ;
-#endif
-
-#if defined BB_LOGGER
-const char logger_usage[] =
- "logger [OPTION]... [MESSAGE]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nWrite MESSAGE to the system log. If MESSAGE is omitted, log stdin.\n\n"
- "Options:\n"
- "\t-s\tLog to stderr as well as the system log.\n"
- "\t-t\tLog using the specified tag (defaults to user name).\n"
- "\t-p\tEnter the message with the specified priority.\n"
- "\t\tThis may be numerical or a ``facility.level'' pair."
-#endif
- ;
-#endif
-
-#if defined BB_LOGNAME
-const char logname_usage[] =
- "logname"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrint the name of the current user."
-#endif
- ;
-#endif
-
-#if defined BB_LS
-const char ls_usage[] =
- "ls [-1Aa"
-#ifdef BB_FEATURE_LS_TIMESTAMPS
- "c"
-#endif
- "Cd"
-#ifdef BB_FEATURE_LS_TIMESTAMPS
- "e"
-#endif
-#ifdef BB_FEATURE_LS_FILETYPES
- "F"
-#endif
- "iln"
-#ifdef BB_FEATURE_LS_FILETYPES
- "p"
-#endif
-#ifdef BB_FEATURE_LS_FOLLOWLINKS
- "L"
-#endif
-#ifdef BB_FEATURE_LS_RECURSIVE
- "R"
-#endif
-#ifdef BB_FEATURE_LS_SORTFILES
- "rS"
-#endif
- "s"
-#ifdef BB_FEATURE_AUTOWIDTH
- "T"
-#endif
-#ifdef BB_FEATURE_LS_TIMESTAMPS
- "tu"
-#endif
-#ifdef BB_FEATURE_LS_SORTFILES
- "v"
-#endif
-#ifdef BB_FEATURE_AUTOWIDTH
- "w"
-#endif
- "x"
-#ifdef BB_FEATURE_LS_SORTFILES
- "X"
-#endif
-#ifdef BB_FEATURE_HUMAN_READABLE
- "h"
-#endif
- "k] [filenames...]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nList directory contents\n\n"
- "Options:\n"
- "\t-1\tlist files in a single column\n"
- "\t-A\tdo not list implied . and ..\n"
- "\t-a\tdo not hide entries starting with .\n"
- "\t-C\tlist entries by columns\n"
-#ifdef BB_FEATURE_LS_TIMESTAMPS
- "\t-c\twith -l: show ctime (the time of last\n"
- "\t\tmodification of file status information)\n"
-#endif
- "\t-d\tlist directory entries instead of contents\n"
-#ifdef BB_FEATURE_LS_TIMESTAMPS
- "\t-e\tlist both full date and full time\n"
-#endif
-#ifdef BB_FEATURE_LS_FILETYPES
- "\t-F\tappend indicator (one of */=@|) to entries\n"
-#endif
- "\t-i\tlist the i-node for each file\n"
- "\t-l\tuse a long listing format\n"
- "\t-n\tlist numeric UIDs and GIDs instead of names\n"
-#ifdef BB_FEATURE_LS_FILETYPES
- "\t-p\tappend indicator (one of /=@|) to entries\n"
-#endif
-#ifdef BB_FEATURE_LS_FOLLOWLINKS
- "\t-L\tlist entries pointed to by symbolic links\n"
-#endif
-#ifdef BB_FEATURE_LS_RECURSIVE
- "\t-R\tlist subdirectories recursively\n"
-#endif
-#ifdef BB_FEATURE_LS_SORTFILES
- "\t-r\tsort the listing in reverse order\n"
- "\t-S\tsort the listing by file size\n"
-#endif
- "\t-s\tlist the size of each file, in blocks\n"
-#ifdef BB_FEATURE_AUTOWIDTH
- "\t-T NUM\tassume Tabstop every NUM columns\n"
-#endif
-#ifdef BB_FEATURE_LS_TIMESTAMPS
- "\t-t\twith -l: show modification time (the time of last\n"
- "\t\tchange of the file)\n"
- "\t-u\twith -l: show access time (the time of last\n"
- "\t\taccess of the file)\n"
-#endif
-#ifdef BB_FEATURE_LS_SORTFILES
- "\t-v\tsort the listing by version\n"
-#endif
-#ifdef BB_FEATURE_AUTOWIDTH
- "\t-w NUM\tassume the terminal is NUM columns wide\n"
-#endif
- "\t-x\tlist entries by lines instead of by columns\n"
-#ifdef BB_FEATURE_LS_SORTFILES
- "\t-X\tsort the listing by extension\n"
-#endif
-
-#ifdef BB_FEATURE_HUMAN_READABLE
- "\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n"
- "\t-k\tprint sizes in kilobytes(default)\n"
-#else
- "\t-k\tprint sizes in kilobytes(compatability)"
-#endif
-
-#endif /* BB_FEATURE_TRIVIAL_HELP */
- ;
-#endif /* BB_LS */
-
-#if defined BB_LSMOD
-const char lsmod_usage[] =
- "lsmod"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nList the currently loaded kernel modules."
-#endif
- ;
-#endif
-
-#if defined BB_MAKEDEVS
-const char makedevs_usage[] =
- "makedevs NAME TYPE MAJOR MINOR FIRST LAST [s]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nCreates a range of block or character special files\n\n"
- "TYPEs include:\n"
- "\tb:\tMake a block (buffered) device.\n"
- "\tc or u:\tMake a character (un-buffered) device.\n"
- "\tp:\tMake a named pipe. MAJOR and MINOR are ignored for named pipes.\n\n"
- "FIRST specifies the number appended to NAME to create the first device.\n"
- "LAST specifies the number of the last item that should be created.\n"
- "If 's' is the last argument, the base device is created as well.\n\n"
- "For example:\n"
- "\tmakedevs /dev/ttyS c 4 66 2 63 -> ttyS2-ttyS63\n"
- "\tmakedevs /dev/hda b 3 0 0 8 s -> hda,hda1-hda8"
-#endif
- ;
-#endif
-
-#if defined BB_MD5SUM
-const char md5sum_usage[] =
- "md5sum [OPTION] [FILE]...\n"
- "or: md5sum [OPTION] -c [FILE]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrint or check MD5 checksums.\n\n"
- "Options:\n"
- "With no FILE, or when FILE is -, read standard input.\n\n"
- "\t-b\tread files in binary mode\n"
- "\t-c\tcheck MD5 sums against given list\n"
- "\t-t\tread files in text mode (default)\n"
- "\t-g\tread a string\n"
- "\nThe following two options are useful only when verifying checksums:\n"
- "\t-s,\tdon't output anything, status code shows success\n"
- "\t-w,\twarn about improperly formated MD5 checksum lines"
-#endif
- ;
-#endif
-
-#if defined BB_MKDIR
-const char mkdir_usage[] =
- "mkdir [OPTION] DIRECTORY..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nCreate the DIRECTORY(ies), if they do not already exist\n\n"
-
- "Options:\n"
- "\t-m\tset permission mode (as in chmod), not rwxrwxrwx - umask\n"
- "\t-p\tno error if existing, make parent directories as needed"
-#endif
- ;
-#endif
-
-#if defined BB_MKFIFO
-const char mkfifo_usage[] =
- "mkfifo [OPTIONS] name"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nCreates a named pipe (identical to 'mknod name p')\n\n"
- "Options:\n"
- "\t-m\tcreate the pipe using the specified mode (default a=rw)"
-#endif
- ;
-#endif
-
-#if defined BB_MKFS_MINIX
-const char mkfs_minix_usage[] =
- "mkfs.minix [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nMake a MINIX filesystem.\n\n"
- "Options:\n"
- "\t-c\t\tCheck the device for bad blocks\n"
- "\t-n [14|30]\tSpecify the maximum length of filenames\n"
- "\t-i INODES\tSpecify the number of inodes for the filesystem\n"
- "\t-l FILENAME\tRead the bad blocks list from FILENAME\n"
- "\t-v\t\tMake a Minix version 2 filesystem"
-#endif
- ;
-#endif
-
-#if defined BB_MKNOD
-const char mknod_usage[] =
- "mknod [OPTIONS] NAME TYPE MAJOR MINOR"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nCreate a special file (block, character, or pipe).\n\n"
- "Options:\n"
- "\t-m\tcreate the special file using the specified mode (default a=rw)\n\n"
- "TYPEs include:\n"
- "\tb:\tMake a block (buffered) device.\n"
- "\tc or u:\tMake a character (un-buffered) device.\n"
- "\tp:\tMake a named pipe. MAJOR and MINOR are ignored for named pipes."
-#endif
- ;
-#endif
-
-#if defined BB_MKSWAP
-const char mkswap_usage[] =
- "mkswap [-c] [-v0|-v1] device [block-count]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrepare a disk partition to be used as a swap partition.\n\n"
- "Options:\n" "\t-c\t\tCheck for read-ability.\n"
- "\t-v0\t\tMake version 0 swap [max 128 Megs].\n"
- "\t-v1\t\tMake version 1 swap [big!] (default for kernels > 2.1.117).\n"
- "\tblock-count\tNumber of block to use (default is entire partition)."
-#endif
- ;
-#endif
-
-#if defined BB_MKTEMP
-const char mktemp_usage[] =
- "mktemp [-q] TEMPLATE"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nCreates a temporary file with its name based on TEMPLATE.\n"
- "TEMPLATE is any name with six `Xs' (i.e. /tmp/temp.XXXXXX)."
-#endif
- ;
-#endif
-
-#if defined BB_MORE
-const char more_usage[] =
- "more [FILE ...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nMore is a filter for viewing FILE one screenful at a time."
-#endif
- ;
-#endif
-
-#if defined BB_MOUNT
-const char mount_usage[] =
- "mount [flags] device directory [-o options,more-options]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nMount a filesystem\n\n"
- "Flags:\n"
- "\t-a:\t\tMount all filesystems in fstab.\n"
-#ifdef BB_MTAB
- "\t-f:\t\t\"Fake\" mount. Add entry to mount table but don't mount it.\n"
- "\t-n:\t\tDon't write a mount table entry.\n"
-#endif
- "\t-o option:\tOne of many filesystem options, listed below.\n"
- "\t-r:\t\tMount the filesystem read-only.\n"
- "\t-t fs-type:\tSpecify the filesystem type.\n"
- "\t-w:\t\tMount for reading and writing (default).\n"
- "\n"
- "Options for use with the \"-o\" flag:\n"
- "\tasync/sync:\tWrites are asynchronous / synchronous.\n"
- "\tatime/noatime:\tEnable / disable updates to inode access times.\n"
- "\tdev/nodev:\tAllow use of special device files / disallow them.\n"
- "\texec/noexec:\tAllow use of executable files / disallow them.\n"
-#if defined BB_FEATURE_MOUNT_LOOP
- "\tloop:\t\tMounts a file via loop device.\n"
-#endif
- "\tsuid/nosuid:\tAllow set-user-id-root programs / disallow them.\n"
- "\tremount:\tRe-mount a currently-mounted filesystem, changing its flags.\n"
- "\tro/rw:\t\tMount for read-only / read-write.\n"
- "\nThere are EVEN MORE flags that are specific to each filesystem.\n"
- "You'll have to see the written documentation for those."
-#endif
- ;
-#endif
-
-#if defined BB_MT
-const char mt_usage[] =
- "mt [-f device] opcode value"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nControl magnetic tape drive operation\n"
- "\nAvailable 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 rew rewoffline seek setblk setdensity\n"
- "setpart tell unload unlock weof wset"
-#endif
- ;
-#endif
-
-#if defined BB_CP_MV
-const char mv_usage[] =
- "mv SOURCE DEST\n"
- " or: mv SOURCE... DIRECTORY"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nRename SOURCE to DEST, or move SOURCE(s) to DIRECTORY."
-#endif
- ;
-#endif
-
-#if defined BB_NC
-const char nc_usage[] =
- "nc [-p PORT] IP PORT\n"
- " or: nc -l -p PORT"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nNetcat opens a pipe to IP:PORT\n"
- "Options:\n"
- "\t-l\tListen on the socket.\n"
- "\t-p PORT\tBind the local port to PORT."
-#endif
- ;
-#endif
-
-#if defined BB_NSLOOKUP
-const char nslookup_usage[] =
- "nslookup [HOST]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nQueries the nameserver for the IP address of the given HOST"
-#endif
-;
-#endif
-
-#if defined BB_PING
-#if defined BB_FEATURE_SIMPLE_PING
-const char ping_usage[] =
- "ping host"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nSend ICMP ECHO_REQUEST packets to network hosts"
-#endif
- ;
-#else /* ! defined BB_FEATURE_SIMPLE_PING */
-const char ping_usage[] =
- "ping [OPTION]... host"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nSend ICMP ECHO_REQUEST packets to network hosts.\n\n"
- "Options:\n"
- "\t-c COUNT\tSend only COUNT pings.\n"
- "\t-s SIZE\t\tSend SIZE data bytes in packets (default=56).\n"
- "\t-q\t\tQuiet mode, only displays output at start\n"
- "\t\t\tand when finished."
-#endif
- ;
-#endif
-#endif
-
-#if defined BB_PIVOT_ROOT
-const char pivot_root_usage[] =
- "pivot_root new_root put_old"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nMove the current root file system to put_old and make new_root\n"
- "the new root file system."
-#endif
- ;
-#endif
-
-#if defined BB_POWEROFF
-const char poweroff_usage[] =
- "poweroff"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nHalt the system and request that the kernel shut off the power."
-#endif
- ;
-#endif
-
-#if defined BB_PRINTF
-const char printf_usage[] =
- "printf FORMAT [ARGUMENT...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nFormats and prints ARGUMENT(s) according to FORMAT,\n"
- "Where FORMAT controls the output exactly as in C printf."
-#endif
- ;
-#endif
-
-#if defined BB_PS
-const char ps_usage[] =
- "ps"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nReport process status\n"
- "\nThis version of ps accepts no options."
-#endif
- ;
-#endif
-
-#if defined BB_PWD
-const char pwd_usage[] =
- "pwd"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrint the full filename of the current working directory."
-#endif
- ;
-#endif
-
-#if defined BB_RDATE
-const char rdate_usage[] =
- "rdate [OPTION] HOST"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nGet and possibly set the system date and time from a remote HOST.\n"
- "Options:\n"
- "\t-s\tSet the system date and time (default).\n"
- "\t-p\tPrint the date and time."
-#endif
- ;
-#endif
-
-#if defined BB_READLINK
-const char readlink_usage[] =
- "readlink"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nRead a symbolic link."
-#endif
- ;
-#endif
-
-#if defined BB_REBOOT
-const char reboot_usage[] =
- "reboot"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nReboot the system."
-#endif
- ;
-#endif
-
-#if defined BB_RENICE
-const char renice_usage[] =
- "renice priority pid [pid ...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nChanges priority of running processes. Allowed priorities range\n"
- "from 20 (the process runs only when nothing else is running) to 0\n"
- "(default priority) to -20 (almost nothing else ever gets to run)."
-#endif
- ;
-#endif
-
-
-#if defined BB_RESET
-const char reset_usage[] =
- "reset"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nResets the screen."
-#endif
- ;
-#endif
-
-#if defined BB_RM
-const char rm_usage[] =
- "rm [OPTION]... FILE..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nRemove (unlink) the FILE(s). You may use '--' to\n"
- "indicate that all following arguments are non-options.\n\n"
- "Options:\n"
- "\t-f\t\tremove existing destinations, never prompt\n"
- "\t-r or -R\tremove the contents of directories recursively"
-#endif
- ;
-#endif
-
-#if defined BB_RMDIR
-const char rmdir_usage[] =
- "rmdir [OPTION]... DIRECTORY..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nRemove the DIRECTORY(ies), if they are empty."
-#endif
- ;
-#endif
-
-#if defined BB_RMMOD
-const char rmmod_usage[] =
- "rmmod [OPTION]... [MODULE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nUnloads the specified kernel modules from the kernel.\n\n"
- "Options:\n"
- "\t-a\tTry to remove all unused kernel modules."
-#endif
- ;
-#endif
-
-#if defined BB_ROUTE
-const char route_usage[] =
- "route [{add|del|flush}]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nEdit the kernel's routing tables"
-#endif
- ;
-#endif
-
-#if defined BB_RPMUNPACK
-const char rpmunpack_usage[] =
- "rpmunpack < package.rpm | gunzip | cpio -idmuv"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nExtracts an rpm archive."
-#endif
- ;
-#endif
-
-#if defined BB_SED
-const char sed_usage[] =
- "sed [-Vhnef] pattern [files...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\n"
- "-n\t\tsuppress automatic printing of pattern space\n"
- "-e script\tadd the script to the commands to be executed\n"
- "-f scriptfile\tadd the contents of script-file to the commands to be executed\n"
- "-h\t\tdisplay this help message\n"
- "\n"
- "If no -e or -f is given, the first non-option argument is taken as the\n"
- "sed script to interpret. All remaining arguments are names of input\n"
- "files; if no input files are specified, then the standard input is read."
-#endif
- ;
-#endif
-
-#if defined BB_SETKEYCODES
-const char setkeycodes_usage[] =
- "setkeycodes SCANCODE KEYCODE ..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nSet 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"
-#endif
- ;
-#endif
-
-#if defined BB_SH
-const char shell_usage[] =
- "sh [FILE]...\n"
- " or: sh -c command [args]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nlash: The BusyBox command interpreter (shell)."
-#endif
- ;
-#endif
-
-#if defined BB_SLEEP
-const char sleep_usage[] =
- "sleep N"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPause for N seconds."
-#endif
- ;
-#endif
-
-#if defined BB_SORT
-const char sort_usage[] =
- "sort [-n]"
-#ifdef BB_FEATURE_SORT_REVERSE
- " [-r]"
-#endif
- " [FILE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nSorts lines of text in the specified files"
-#endif
- ;
-#endif
-
-#if defined BB_STTY
-const char stty_usage[] =
- "stty [-a|g] [-F device] [SETTING]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nWithout arguments, prints baud rate, line discipline,"
- "\nand deviations from stty sane."
- "\n -F device open and use the specified device instead of stdin"
- "\n -a print all current settings in human-readable form. Or"
- "\n -g print in a stty-readable form"
- "\n [SETTING] see in documentation"
-#endif
- ;
-#endif
-
-#if defined BB_SWAPONOFF
-const char swapoff_usage[] =
- "swapoff [OPTION] [device]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nStop swapping virtual memory pages on the given device.\n\n"
- "Options:\n"
- "\t-a\tStop swapping on all swap devices"
-#endif
- ;
-#endif
-
-#if defined BB_SWAPONOFF
-const char swapon_usage[] =
- "swapon [OPTION] [device]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nStart swapping virtual memory pages on the given device.\n\n"
- "Options:\n"
- "\t-a\tStart swapping on all swap devices"
-#endif
- ;
-#endif
-
-#if defined BB_SYNC
-const char sync_usage[] =
- "sync"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nWrite all buffered filesystem blocks to disk."
-#endif
- ;
-#endif
-
-#if defined BB_SYSLOGD
-const char syslogd_usage[] =
- "syslogd [OPTION]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nLinux system and kernel (provides klogd) logging utility.\n"
- "Note that this version of syslogd/klogd ignores /etc/syslog.conf.\n\n"
- "Options:\n"
- "\t-m NUM\t\tInterval between MARK lines (default=20min, 0=off)\n"
- "\t-n\t\tRun as a foreground process\n"
-#ifdef BB_FEATURE_KLOGD
- "\t-K\t\tDo not start up the klogd process\n"
-#endif
- "\t-O FILE\t\tUse an alternate log file (default=/var/log/messages)"
-#ifdef BB_FEATURE_REMOTE_LOG
- "\n\t-R HOST[:PORT]\t\tLog remotely to IP or hostname on PORT (default PORT=514/UDP)\n"
- "\t-L\t\tLog locally as well as network logging (default is network only)"
-#endif
-#endif
- ;
-#endif
-
-#if defined BB_TAIL
-const char tail_usage[] =
- "tail [OPTION]... [FILE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrint last 10 lines of each FILE to standard output.\n"
- "With more than one FILE, precede each with a header giving the\n"
- "file name. With no FILE, or when FILE is -, read standard input.\n\n"
- "Options:\n"
-#ifndef BB_FEATURE_SIMPLE_TAIL
- "\t-c N[kbm]\toutput the last N bytes\n"
-#endif
- "\t-n N[kbm]\tprint last N lines instead of last 10\n"
- "\t-f\t\toutput data as the file grows"
-#ifndef BB_FEATURE_SIMPLE_TAIL
- "\n\t-q\t\tnever output headers giving file names\n"
- "\t-s SEC\t\twait SEC seconds between reads with -f\n"
- "\t-v\t\talways output headers giving file names\n\n"
- "If the first character of N (bytes or lines) is a `+', output begins with \n"
- "the Nth item from the start of each file, otherwise, print the last N items\n"
- "in the file. N bytes may be suffixed by k (x1024), b (x512), or m (1024^2)."
-//#else
-// "\nIf the first character of N (bytes or lines) is a `+', output begins with \n"
-// "the Nth item from the start of each file."
-#endif
-#endif
- ;
-#endif
-
-#if defined BB_TAR
-const char tar_usage[] =
-#ifdef BB_FEATURE_TAR_CREATE
- "tar -[cxtvO] "
-#else
- "tar -[xtvO] "
-#endif
-#if defined BB_FEATURE_TAR_EXCLUDE
- "[--exclude File] "
- "[-X File]"
-#endif
- "[-f tarFile] [FILE(s)] ..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nCreate, extract, or list files from a tar file.\n\n"
- "Main operation mode:\n"
-#ifdef BB_FEATURE_TAR_CREATE
- "\tc\t\tcreate\n"
-#endif
- "\tx\t\textract\n"
- "\tt\t\tlist\n"
- "\nFile selection:\n"
- "\tf\t\tname of tarfile or \"-\" for stdin\n"
- "\tO\t\textract to stdout\n"
-#if defined BB_FEATURE_TAR_EXCLUDE
- "\texclude\t\tfile to exclude\n"
- "\tX\t\tfile with names to exclude\n"
-#endif
- "\nInformative output:\n"
- "\tv\t\tverbosely list files processed"
-#endif
- ;
-#endif
-
-#if defined BB_TEE
-const char tee_usage[] =
- "tee [OPTION]... [FILE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nCopy standard input to each FILE, and also to standard output.\n\n"
- "Options:\n" "\t-a\tappend to the given FILEs, do not overwrite"
-#endif
- ;
-#endif
-
-#if defined BB_TELNET
-const char telnet_usage[] =
- "telnet host [port]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nTelnet is used to establish interactive communication with another\n"
- "computer over a network using the TELNET protocol."
-#endif
- ;
-#endif
-
-#if defined BB_TEST
-const char test_usage[] =
- "test EXPRESSION\n"
- "or [ EXPRESSION ]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nChecks file types and compares values returning an exit\n"
- "code determined by the value of EXPRESSION."
-#endif
- ;
-#endif
-
-#if defined BB_TOUCH
-const char touch_usage[] =
- "touch [-c] file [file ...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nUpdate the last-modified date on the given file[s].\n\n"
- "Options:\n"
- "\t-c\tDo not create any files"
-#endif
- ;
-#endif
-
-#if defined BB_TR
-const char tr_usage[] =
- "tr [-cds] STRING1 [STRING2]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nTranslate, squeeze, and/or delete characters from\n"
- "standard input, writing to standard output.\n\n"
- "Options:\n"
- "\t-c\ttake complement of STRING1\n"
- "\t-d\tdelete input characters coded STRING1\n"
- "\t-s\tsqueeze multiple output characters of STRING2 into one character"
-#endif
- ;
-#endif
-
-#if defined BB_TRUE_FALSE
-const char true_usage[] =
- "true"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nReturn an exit code of TRUE (0)."
-#endif
- ;
-#endif
-
-#if defined BB_TTY
-const char tty_usage[] =
- "tty"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrint the file name of the terminal connected to standard input.\n\n"
- "Options:\n"
- "\t-s\tprint nothing, only return an exit status"
-#endif
- ;
-#endif
-
-#if defined BB_UMOUNT
-const char umount_usage[] =
- "umount [flags] filesystem|directory"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\nUnmount file systems\n"
- "\nFlags:\n" "\t-a:\tUnmount all file systems"
-#ifdef BB_MTAB
- " in /etc/mtab\n\t-n:\tDon't erase /etc/mtab entries\n"
-#else
- "\n"
-#endif
- "\t-r:\tTry to remount devices as read-only if mount is busy"
-#if defined BB_FEATURE_MOUNT_FORCE
- "\n\t-f:\tForce filesystem umount (i.e. unreachable NFS server)"
-#endif
-#if defined BB_FEATURE_MOUNT_LOOP
- "\n\t-l:\tDo not free loop device (if a loop device has been used)"
-#endif
-#endif
- ;
-#endif
-
-#if defined BB_UNAME
-const char uname_usage[] =
- "uname [OPTION]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrint certain system information. With no OPTION, same as -s.\n\n"
- "Options:\n"
- "\t-a\tprint all information\n"
- "\t-m\tthe machine (hardware) type\n"
- "\t-n\tprint the machine's network node hostname\n"
- "\t-r\tprint the operating system release\n"
- "\t-s\tprint the operating system name\n"
-
- "\t-p\tprint the host processor type\n"
- "\t-v\tprint the operating system version"
-#endif
- ;
-#endif
-
-#if defined BB_UNIQ
-const char uniq_usage[] =
- "uniq [OPTION]... [INPUT [OUTPUT]]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nDiscard all but one of successive identical lines from INPUT\n"
- "(or standard input), writing to OUTPUT (or standard output).\n"
- "Options:\n"
- "\t-c\tprefix lines by the number of occurrences\n"
- "\t-d\tonly print duplicate lines\n"
- "\t-u\tonly print unique lines"
-#endif
- ;
-#endif
-
-#if defined BB_UNIX2DOS
-const char unix2dos_usage[] =
- "unix2dos < unixfile > dosfile"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nConverts a text file from unix format to dos format."
-#endif
- ;
-#endif
-
-#if defined BB_UPDATE
-const char update_usage[] =
- "update [options]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPeriodically flushes filesystem buffers.\n\n"
- "Options:\n"
- "\t-S\tforce use of sync(2) instead of flushing\n"
- "\t-s SECS\tcall sync this often (default 30)\n"
- "\t-f SECS\tflush some buffers this often (default 5)"
-#endif
- ;
-#endif
-
-#if defined BB_UPTIME
-const char uptime_usage[] =
- "uptime"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nDisplay the time since the last boot."
-#endif
- ;
-#endif
-
-#if defined BB_USLEEP
-const char usleep_usage[] =
- "usleep N"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPause for N microseconds."
-#endif
- ;
-#endif
-
-#if defined BB_UUDECODE
-const char uudecode_usage[] =
- "uudecode [FILE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nUudecode a file that is uuencoded.\n\n"
- "Options:\n"
- "\t-o FILE\tdirect output to FILE"
-#endif
- ;
-#endif
-
-#if defined BB_UUENCODE
-const char uuencode_usage[] =
- "uuencode [OPTION] [INFILE] REMOTEFILE"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nUuencode a file.\n\n"
- "Options:\n"
- "\t-m\tuse base64 encoding as of RFC1521"
-#endif
- ;
-#endif
-
-#if defined BB_WATCHDOG
-const char watchdog_usage[] =
- "watchdog dev\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\nPeriodically write to watchdog device \"dev\".\n"
-#endif
- ;
-#endif
-
-#if defined BB_WC
-const char wc_usage[] =
- "wc [OPTION]... [FILE]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrint line, word, and byte counts for each FILE, and a total line if\n"
- "more than one FILE is specified. With no FILE, read standard input.\n\n"
- "Options:\n"
- "\t-c\tprint the byte counts\n"
- "\t-l\tprint the newline counts\n"
-
- "\t-L\tprint the length of the longest line\n"
- "\t-w\tprint the word counts"
-#endif
- ;
-#endif
-
-#if defined BB_WGET
-const char wget_usage[] = "wget [-c] [-O file] url"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nwget retrieves files via HTTP\n\n"
- "Options:\n"
- "\t-c\tcontinue retrieval of aborted transfers\n"
- "\t-O\tsave to filename ('-' for stdout)"
-#endif
- ;
-#endif
-
-#if defined BB_WHICH
-const char which_usage[] =
- "which [COMMAND ...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nLocates a COMMAND."
-#endif
- ;
-#endif
-
-#if defined BB_WHOAMI
-const char whoami_usage[] =
- "whoami"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nPrints the user name associated with the current effective user id."
-#endif
- ;
-#endif
-
-#if defined BB_XARGS
-const char xargs_usage[] = "xargs [COMMAND] [ARGS...]"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nExecutes COMMAND on every item given by standard input."
-#endif
- ;
-#endif
-
-#if defined BB_YES
-const char yes_usage[] =
- "yes [OPTION]... [STRING]..."
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\n\nRepeatedly outputs a line with all specified STRING(s), or `y'."
-#endif
- ;
-#endif
-
+#define USAGE_MESSAGES
+#include <usage.h>
diff --git a/usleep.c b/usleep.c
index 86dc050..c67c365 100644
--- a/usleep.c
+++ b/usleep.c
@@ -28,7 +28,7 @@
extern int usleep_main(int argc, char **argv)
{
if ((argc < 2) || (**(argv + 1) == '-')) {
- usage(usleep_usage);
+ show_usage();
}
usleep(atoi(*(++argv))); /* return void */
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index c21f84c..47f9f44 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -53,21 +53,21 @@
case 'n':
cmd = 8;
if (optarg == NULL)
- usage(dmesg_usage);
+ show_usage();
level = atoi(optarg);
break;
case 's':
if (optarg == NULL)
- usage(dmesg_usage);
+ show_usage();
bufsize = atoi(optarg);
break;
default:
- usage(dmesg_usage);
+ show_usage();
}
}
if (optind < argc) {
- goto end;
+ show_usage();
}
if (cmd == 8) {
@@ -97,7 +97,4 @@
if (lastc != '\n')
putchar('\n');
return EXIT_SUCCESS;
- end:
- usage(dmesg_usage);
- return EXIT_FAILURE;
}
diff --git a/util-linux/fdflush.c b/util-linux/fdflush.c
index fcf8ddd..f10ccea 100644
--- a/util-linux/fdflush.c
+++ b/util-linux/fdflush.c
@@ -35,7 +35,7 @@
int fd;
if (argc <= 1 || **(++argv) == '-')
- usage(fdflush_usage);
+ show_usage();
if ((fd = open(*argv, 0)) < 0)
perror_msg_and_die("%s", *argv);
diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c
index 8f90f40..cf25fae 100644
--- a/util-linux/freeramdisk.c
+++ b/util-linux/freeramdisk.c
@@ -40,7 +40,7 @@
int f;
if (argc != 2 || *argv[1] == '-') {
- usage(freeramdisk_usage);
+ show_usage();
}
if ((f = open(argv[1], O_RDWR)) == -1) {
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c
index 9d76220..2b4c651 100644
--- a/util-linux/fsck_minix.c
+++ b/util-linux/fsck_minix.c
@@ -283,11 +283,6 @@
exit(status);
}
-static void show_usage(void)
-{
- usage(fsck_minix_usage);
-}
-
static void die(const char *str)
{
error_msg("%s", str);
diff --git a/util-linux/getopt.c b/util-linux/getopt.c
index 6252631..eb28d5d 100644
--- a/util-linux/getopt.c
+++ b/util-linux/getopt.c
@@ -372,7 +372,7 @@
quote=0;
break;
default:
- usage(getopt_usage);
+ show_usage();
}
if (!optstr) {
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index 9b40faa..6b4a3e2 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -255,13 +255,6 @@
#define mark_zone(x) (setbit(zone_map,(x)-FIRSTZONE+1))
#define unmark_zone(x) (clrbit(zone_map,(x)-FIRSTZONE+1))
-static void show_usage() __attribute__ ((noreturn));
-
-static void show_usage()
-{
- usage(mkfs_minix_usage);
-}
-
/*
* Check to make certain that our new filesystem won't be created on
* an already mounted partition. Code adapted from mke2fs, Copyright
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index 7d690ad..48637e8 100644
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -287,7 +287,7 @@
PAGES = strtol(argv[0], &tmp, 0) / blocks_per_page;
if (*tmp)
- usage(mkswap_usage);
+ show_usage();
} else
device_name = argv[0];
} else {
@@ -302,13 +302,13 @@
version = atoi(argv[0] + 2);
break;
default:
- usage(mkswap_usage);
+ show_usage();
}
}
}
if (!device_name) {
error_msg("error: Nowhere to set up swap on?");
- usage(mkswap_usage);
+ show_usage();
}
sz = get_size(device_name);
if (!PAGES) {
@@ -331,12 +331,12 @@
}
if (version != 0 && version != 1) {
error_msg("error: unknown version %d", version);
- usage(mkswap_usage);
+ show_usage();
}
if (PAGES < 10) {
error_msg("error: swap area needs to be at least %ldkB",
(long) (10 * pagesize / 1024));
- usage(mkswap_usage);
+ show_usage();
}
#if 0
maxpages = ((version == 0) ? V0_MAX_PAGES : V1_MAX_PAGES);
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 79813ba..2f5bba5 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -505,5 +505,5 @@
goto singlemount;
goodbye:
- usage(mount_usage);
+ show_usage();
}
diff --git a/util-linux/pivot_root.c b/util-linux/pivot_root.c
index 92fe4ae..e007101 100644
--- a/util-linux/pivot_root.c
+++ b/util-linux/pivot_root.c
@@ -20,7 +20,7 @@
int pivot_root_main(int argc, char **argv)
{
if (argc != 3)
- usage(pivot_root_usage);
+ show_usage();
if (pivot_root(argv[1],argv[2]) < 0)
perror_msg_and_die("pivot_root");
diff --git a/util-linux/rdate.c b/util-linux/rdate.c
index d350be8..38a7689 100644
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -95,14 +95,14 @@
/* Interpret command line args */
/* do special-case option parsing */
if (argv[1] && (strcmp(argv[1], "--help") == 0))
- usage(rdate_usage);
+ show_usage();
/* do normal option parsing */
while ((opt = getopt(argc, argv, "Hsp")) > 0) {
switch (opt) {
default:
case 'H':
- usage(rdate_usage);
+ show_usage();
break;
case 's':
setdate++;
@@ -117,7 +117,7 @@
if (printdate==0 && setdate==0) setdate++;
if (optind == argc) {
- usage(rdate_usage);
+ show_usage();
}
if ((time= askremotedate(argv[optind])) == (time_t)-1) {
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index 74f6ec3..8dda097 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -107,5 +107,5 @@
return EXIT_SUCCESS;
usage_and_exit:
- usage((whichApp == SWAPON_APP) ? swapon_usage : swapoff_usage);
+ show_usage();
}
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 39842d2..c160ec2 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -235,7 +235,7 @@
extern int umount_main(int argc, char **argv)
{
if (argc < 2) {
- usage(umount_usage);
+ show_usage();
}
#ifdef BB_FEATURE_CLEAN_UP
atexit(mtab_free);
@@ -269,7 +269,7 @@
case 'v':
break; /* ignore -v */
default:
- usage(umount_usage);
+ show_usage();
}
}
diff --git a/utility.c b/utility.c
index 368dfc5..818523c 100644
--- a/utility.c
+++ b/utility.c
@@ -40,6 +40,7 @@
#define bb_need_full_version
#define BB_DECLARE_EXTERN
#include "messages.c"
+#include "usage.h"
#include <stdio.h>
#include <string.h>
@@ -76,12 +77,23 @@
# endif
#endif
-extern void usage(const char *usage)
+static struct BB_applet *applet_using;
+
+extern void show_usage(void)
{
- fprintf(stderr, "%s\n\nUsage: %s\n\n", full_version, usage);
+ static const char no_help[] = "No help available.\n";
+
+ const char *usage_string = no_help;
+
+ if (applet_using->usage_index >= 0) {
+ usage_string = usage_messages[applet_using->usage_index];
+ }
+ fprintf(stderr, "%s\n\nUsage: %s %s\n", full_version,
+ applet_using->name, usage_string);
exit(EXIT_FAILURE);
}
+
static void verror_msg(const char *s, va_list p)
{
fflush(stdout);
@@ -1702,6 +1714,17 @@
applet_name_compare);
}
+void run_applet_by_name(const char *name, int argc, char **argv)
+{
+ /* Do a binary search to find the applet entry given the name. */
+ if ((applet_using = find_applet_by_name(name)) != NULL) {
+ applet_name = applet_using->name;
+ if (argv[1] && strcmp(argv[1], "--help") == 0)
+ show_usage();
+ exit((*(applet_using->main)) (argc, argv));
+ }
+}
+
#if defined BB_DD || defined BB_TAIL
unsigned long parse_number(const char *numstr,
const struct suffix_mult *suffixes)
diff --git a/uudecode.c b/uudecode.c
index cccc528..c0e8cea 100644
--- a/uudecode.c
+++ b/uudecode.c
@@ -292,7 +292,7 @@
break;
default:
- usage(uudecode_usage);
+ show_usage();
}
}
diff --git a/uuencode.c b/uuencode.c
index 73098ba..8d5af4a 100644
--- a/uuencode.c
+++ b/uuencode.c
@@ -167,7 +167,7 @@
break;
default:
- usage(uuencode_usage);
+ show_usage();
}
}
@@ -188,7 +188,7 @@
case 0:
default:
- usage(uuencode_usage);
+ show_usage();
}
printf("begin%s %o %s\n", trans_ptr == uu_std ? "" : "-base64",
diff --git a/watchdog.c b/watchdog.c
index 7026cc0..65d0fc3 100644
--- a/watchdog.c
+++ b/watchdog.c
@@ -31,7 +31,7 @@
int fd;
if (argc != 2) {
- usage(watchdog_usage);
+ show_usage();
}
if ((fd=open(argv[1], O_WRONLY)) == -1) {
diff --git a/wc.c b/wc.c
index 619c161..f416874 100644
--- a/wc.c
+++ b/wc.c
@@ -126,7 +126,7 @@
print_words = 1;
break;
default:
- usage(wc_usage);
+ show_usage();
}
}
diff --git a/wget.c b/wget.c
index c134427..d1aacef 100644
--- a/wget.c
+++ b/wget.c
@@ -105,12 +105,12 @@
fname_out = (strcmp(optarg, "-") == 0 ? (char *)1 : optarg);
break;
default:
- usage(wget_usage);
+ show_usage();
}
}
if (argc - optind != 1)
- usage(wget_usage);
+ show_usage();
/*
* Use the proxy if necessary.
@@ -533,7 +533,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: wget.c,v 1.26 2001/02/01 16:49:30 kraai Exp $
+ * $Id: wget.c,v 1.27 2001/02/14 21:23:06 andersen Exp $
*/
diff --git a/which.c b/which.c
index 981a8ac..1908db3 100644
--- a/which.c
+++ b/which.c
@@ -33,7 +33,7 @@
int i, count=1, found, status = EXIT_SUCCESS;
if (argc <= 1 || **(argv + 1) == '-')
- usage(which_usage);
+ show_usage();
argc--;
path_list = getenv("PATH");
diff --git a/whoami.c b/whoami.c
index 398e373..54df0bf 100644
--- a/whoami.c
+++ b/whoami.c
@@ -31,7 +31,7 @@
uid_t uid = geteuid();
if (argc > 1)
- usage(whoami_usage);
+ show_usage();
my_getpwuid(user, uid);
if (*user) {
diff --git a/yes.c b/yes.c
index 0ce4949..0a8ad83 100644
--- a/yes.c
+++ b/yes.c
@@ -29,7 +29,7 @@
int i;
if (argc >= 2 && *argv[1] == '-')
- usage(yes_usage);
+ show_usage();
if (argc == 1) {
while (1)