X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fapplets.h;h=0b65266f3dba7e72e7b1d0ce0c6a4a2c1a6efb66;hb=a6b7bdcf8caaf1fd36f522a795f1c4c5ff3c64ce;hp=a1084fcc662117643f247102ba5e4d0efda87b73;hpb=8eb0dc1d101029620f7ca75a77f04b091b61a212;p=oweals%2Fbusybox.git diff --git a/include/applets.h b/include/applets.h index a1084fcc6..0b65266f3 100644 --- a/include/applets.h +++ b/include/applets.h @@ -23,11 +23,11 @@ #elif defined(MAKE_USAGE) #ifdef CONFIG_FEATURE_VERBOSE_USAGE #define APPLET(a,b,c,d) a##_trivial_usage "\n\n" a##_full_usage "\0" - #define APPLET_NOUSAGE(a,b,c,d) "\0" + #define APPLET_NOUSAGE(a,b,c,d) "\b\0" #define APPLET_ODDNAME(a,b,c,d,e) e##_trivial_usage "\n\n" e##_full_usage "\0" #else #define APPLET(a,b,c,d) a##_trivial_usage "\0" - #define APPLET_NOUSAGE(a,b,c,d) "\0" + #define APPLET_NOUSAGE(a,b,c,d) "\b\0" #define APPLET_ODDNAME(a,b,c,d,e) e##_trivial_usage "\0" #endif #elif defined(MAKE_LINKS) @@ -41,6 +41,11 @@ #define APPLET_ODDNAME(a,b,c,d,e) {a,b,c,d}, #endif +#ifdef CONFIG_INSTALL_NO_USR +#define _BB_DIR_USR_BIN _BB_DIR_BIN +#define _BB_DIR_USR_SBIN _BB_DIR_SBIN +#endif + #ifdef CONFIG_TEST @@ -58,9 +63,15 @@ #ifdef CONFIG_AR APPLET(ar, ar_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) #endif +#ifdef CONFIG_ARPING + APPLET(arping, arping_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) +#endif #ifdef CONFIG_ASH APPLET_NOUSAGE("ash", ash_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif +#ifdef CONFIG_AWK + APPLET(awk, awk_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) +#endif #ifdef CONFIG_BASENAME APPLET(basename, basename_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) #endif @@ -104,6 +115,12 @@ #ifdef CONFIG_CPIO APPLET(cpio, cpio_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif +#ifdef CONFIG_CROND + APPLET(crond, crond_main, _BB_DIR_USR_SBIN, _BB_SUID_NEVER) +#endif +#ifdef CONFIG_CRONTAB + APPLET(crontab, crontab_main, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS) +#endif #ifdef CONFIG_CUT APPLET(cut, cut_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) #endif @@ -149,8 +166,8 @@ #ifdef CONFIG_DUMPKMAP APPLET(dumpkmap, dumpkmap_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif -#ifdef CONFIG_DUTMP - APPLET(dutmp, dutmp_main, _BB_DIR_USR_SBIN, _BB_SUID_NEVER) +#ifdef CONFIG_DUMPLEASES + APPLET(dumpleases, dumpleases_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) #endif #ifdef CONFIG_ECHO APPLET(echo, echo_main, _BB_DIR_BIN, _BB_SUID_NEVER) @@ -173,9 +190,21 @@ #ifdef CONFIG_FDFLUSH APPLET(fdflush, fdflush_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif +#ifdef CONFIG_FDFORMAT + APPLET(fdformat, fdformat_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) +#endif +#ifdef CONFIG_FDISK + APPLET(fdisk, fdisk_main, _BB_DIR_SBIN, _BB_SUID_NEVER) +#endif +#if defined(CONFIG_FEATURE_GREP_FGREP_ALIAS) + APPLET_NOUSAGE("fgrep", grep_main, _BB_DIR_BIN, _BB_SUID_NEVER) +#endif #ifdef CONFIG_FIND APPLET(find, find_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) #endif +#ifdef CONFIG_FOLD + APPLET(fold, fold_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) +#endif #ifdef CONFIG_FREE APPLET(free, free_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) #endif @@ -185,6 +214,12 @@ #ifdef CONFIG_FSCK_MINIX APPLET_ODDNAME("fsck.minix", fsck_minix_main, _BB_DIR_SBIN, _BB_SUID_NEVER, fsck_minix) #endif +#ifdef CONFIG_FTPGET + APPLET(ftpget, ftpgetput_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) +#endif +#ifdef CONFIG_FTPPUT + APPLET(ftpput, ftpgetput_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) +#endif #ifdef CONFIG_GETOPT APPLET(getopt, getopt_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif @@ -203,6 +238,9 @@ #ifdef CONFIG_HALT APPLET(halt, halt_main, _BB_DIR_SBIN, _BB_SUID_NEVER) #endif +#ifdef CONFIG_HDPARM + APPLET(hdparm, hdparm_main, _BB_DIR_SBIN, _BB_SUID_NEVER) +#endif #ifdef CONFIG_HEAD APPLET(head, head_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) #endif @@ -215,6 +253,9 @@ #ifdef CONFIG_HOSTNAME APPLET(hostname, hostname_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif +#ifdef CONFIG_HTTPD + APPLET(httpd, httpd_main, _BB_DIR_USR_SBIN, _BB_SUID_NEVER) +#endif #ifdef CONFIG_HUSH APPLET_NOUSAGE("hush", hush_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif @@ -227,12 +268,39 @@ #ifdef CONFIG_IFCONFIG APPLET(ifconfig, ifconfig_main, _BB_DIR_SBIN, _BB_SUID_NEVER) #endif +#ifdef CONFIG_IFUPDOWN + APPLET(ifdown, ifupdown_main, _BB_DIR_SBIN, _BB_SUID_NEVER) +#endif +#ifdef CONFIG_IFUPDOWN + APPLET(ifup, ifupdown_main, _BB_DIR_SBIN, _BB_SUID_NEVER) +#endif +#ifdef CONFIG_INETD + APPLET(inetd, inetd_main, _BB_DIR_USR_SBIN, _BB_SUID_NEVER) +#endif #ifdef CONFIG_INIT APPLET(init, init_main, _BB_DIR_SBIN, _BB_SUID_NEVER) #endif #ifdef CONFIG_INSMOD APPLET(insmod, insmod_main, _BB_DIR_SBIN, _BB_SUID_NEVER) #endif +#ifdef CONFIG_IP + APPLET(ip, ip_main, _BB_DIR_BIN, _BB_SUID_NEVER) +#endif +#ifdef CONFIG_IPADDRESS + APPLET(ipaddr, ipaddr_main, _BB_DIR_BIN, _BB_SUID_NEVER) +#endif +#ifdef CONFIG_IPCALC + APPLET(ipcalc, ipcalc_main, _BB_DIR_BIN, _BB_SUID_NEVER) +#endif +#ifdef CONFIG_IPLINK + APPLET(iplink, iplink_main, _BB_DIR_BIN, _BB_SUID_NEVER) +#endif +#ifdef CONFIG_IPROUTE + APPLET(iproute, iproute_main, _BB_DIR_BIN, _BB_SUID_NEVER) +#endif +#ifdef CONFIG_IPTUNNEL + APPLET(iptunnel, iptunnel_main, _BB_DIR_BIN, _BB_SUID_NEVER) +#endif #ifdef CONFIG_KILL APPLET(kill, kill_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif @@ -245,6 +313,9 @@ #ifdef CONFIG_LASH APPLET(lash, lash_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif +#ifdef CONFIG_LAST + APPLET(last, last_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) +#endif #ifdef CONFIG_LENGTH APPLET(length, length_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) #endif @@ -290,6 +361,12 @@ #ifdef CONFIG_MD5SUM APPLET(md5sum, md5sum_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) #endif +#ifdef CONFIG_MESG + APPLET(mesg, mesg_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) +#endif +#ifdef CONFIG_MINIT + APPLET(minit, minit_main, _BB_DIR_SBIN, _BB_SUID_NEVER) +#endif #ifdef CONFIG_MKDIR APPLET(mkdir, mkdir_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif @@ -320,12 +397,18 @@ #ifdef CONFIG_MSH APPLET_NOUSAGE("msh", msh_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif +#ifdef CONFIG_MSVC + APPLET(msvc, msvc_main, _BB_DIR_BIN, _BB_SUID_NEVER) +#endif #ifdef CONFIG_MT APPLET(mt, mt_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif #ifdef CONFIG_MV APPLET(mv, mv_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif +#ifdef CONFIG_NAMEIF + APPLET(nameif, nameif_main, _BB_DIR_SBIN, _BB_SUID_NEVER) +#endif #ifdef CONFIG_NC APPLET(nc, nc_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) #endif @@ -338,14 +421,23 @@ #ifdef CONFIG_OD APPLET(od, od_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) #endif +#ifdef CONFIG_OPENVT + APPLET(openvt, openvt_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) +#endif #ifdef CONFIG_PASSWD APPLET(passwd, passwd_main, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS) #endif +#ifdef CONFIG_PATCH + APPLET(patch, patch_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) +#endif +#ifdef CONFIG_PIDFILEHACK + APPLET(pidfilehack, pidfilehack_main, _BB_DIR_BIN, _BB_SUID_NEVER) +#endif #ifdef CONFIG_PIDOF APPLET(pidof, pidof_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif #ifdef CONFIG_PING - APPLET(ping, ping_main, _BB_DIR_BIN, _BB_SUID_NEVER) + APPLET(ping, ping_main, _BB_DIR_BIN, _BB_SUID_MAYBE) #endif #ifdef CONFIG_PING6 APPLET(ping6, ping6_main, _BB_DIR_BIN, _BB_SUID_NEVER) @@ -366,11 +458,14 @@ APPLET(pwd, pwd_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif #ifdef CONFIG_RDATE - APPLET(rdate, rdate_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) + APPLET(rdate, rdate_main, _BB_DIR_USR_SBIN, _BB_SUID_NEVER) #endif #ifdef CONFIG_READLINK APPLET(readlink, readlink_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) #endif +#ifdef CONFIG_REALPATH + APPLET(realpath, realpath_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) +#endif #ifdef CONFIG_REBOOT APPLET(reboot, reboot_main, _BB_DIR_SBIN, _BB_SUID_NEVER) #endif @@ -392,6 +487,9 @@ #ifdef CONFIG_ROUTE APPLET(route, route_main, _BB_DIR_SBIN, _BB_SUID_NEVER) #endif +#ifdef CONFIG_RPM + APPLET(rpm, rpm_main, _BB_DIR_BIN, _BB_SUID_NEVER) +#endif #ifdef CONFIG_RPM2CPIO APPLET(rpm2cpio, rpm2cpio_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) #endif @@ -413,6 +511,9 @@ #elif defined(CONFIG_FEATURE_SH_IS_MSH) && defined(CONFIG_MSH) APPLET_NOUSAGE("sh", msh_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif +#ifdef CONFIG_SHA1SUM + APPLET(sha1sum, sha1sum_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) +#endif #ifdef CONFIG_SLEEP APPLET(sleep, sleep_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif @@ -422,6 +523,9 @@ #ifdef CONFIG_START_STOP_DAEMON APPLET_ODDNAME("start-stop-daemon", start_stop_daemon_main, _BB_DIR_SBIN, _BB_SUID_NEVER, start_stop_daemon) #endif +#ifdef CONFIG_STRINGS + APPLET(strings, strings_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) +#endif #ifdef CONFIG_STTY APPLET(stty, stty_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif @@ -455,6 +559,9 @@ #ifdef CONFIG_TELNET APPLET(telnet, telnet_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) #endif +#ifdef CONFIG_TELNETD + APPLET(telnetd, telnetd_main, _BB_DIR_USR_SBIN, _BB_SUID_NEVER) +#endif #ifdef CONFIG_TEST APPLET(test, test_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) #endif @@ -464,6 +571,9 @@ #ifdef CONFIG_TIME APPLET(time, time_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) #endif +#ifdef CONFIG_TOP + APPLET(top, top_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) +#endif #ifdef CONFIG_TOUCH APPLET(touch, touch_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif @@ -471,7 +581,7 @@ APPLET(tr, tr_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) #endif #ifdef CONFIG_TRACEROUTE - APPLET(traceroute, traceroute_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) + APPLET(traceroute, traceroute_main, _BB_DIR_USR_BIN, _BB_SUID_MAYBE) #endif #ifdef CONFIG_TRUE APPLET(true, true_main, _BB_DIR_BIN, _BB_SUID_NEVER) @@ -482,16 +592,17 @@ #ifdef CONFIG_UDHCPC APPLET(udhcpc, udhcpc_main, _BB_DIR_SBIN, _BB_SUID_NEVER) #endif +#ifdef CONFIG_UDHCPD + APPLET(udhcpd, udhcpd_main, _BB_DIR_USR_SBIN, _BB_SUID_NEVER) +#endif #ifdef CONFIG_UMOUNT APPLET(umount, umount_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif #ifdef CONFIG_UNAME APPLET(uname, uname_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif -#ifdef CONFIG_GUNZIP -# ifdef CONFIG_FEATURE_UNCOMPRESS - APPLET_ODDNAME("uncompress", gunzip_main, _BB_DIR_BIN, _BB_SUID_NEVER, gunzip) -# endif +#ifdef CONFIG_UNCOMPRESS + APPLET(uncompress, uncompress_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif #ifdef CONFIG_UNIQ APPLET(uniq, uniq_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) @@ -502,9 +613,6 @@ #ifdef CONFIG_UNZIP APPLET(unzip, unzip_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) #endif -#ifdef CONFIG_UPDATE - APPLET(update, update_main, _BB_DIR_SBIN, _BB_SUID_NEVER) -#endif #ifdef CONFIG_UPTIME APPLET(uptime, uptime_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) #endif @@ -517,12 +625,18 @@ #ifdef CONFIG_UUENCODE APPLET(uuencode, uuencode_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) #endif +#ifdef CONFIG_VCONFIG + APPLET(vconfig, vconfig_main, _BB_DIR_SBIN, _BB_SUID_NEVER) +#endif #ifdef CONFIG_VI APPLET(vi, vi_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif #ifdef CONFIG_VLOCK APPLET(vlock, vlock_main, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS) #endif +#ifdef CONFIG_WATCH + APPLET(watch, watch_main, _BB_DIR_BIN, _BB_SUID_NEVER) +#endif #ifdef CONFIG_WATCHDOG APPLET(watchdog, watchdog_main, _BB_DIR_SBIN, _BB_SUID_NEVER) #endif