3 files changed, 3 insertions, 256 deletions

diff --git a/include/applets.src.h b/include/applets.src.h
index 2998a0ea9..9162b66c7 100644
--- a/include/applets.src.h
+++ b/include/applets.src.h
@@ -136,7 +136,6 @@ IF_DUMPLEASES(APPLET(dumpleases, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 //IF_E2LABEL(APPLET_ODDNAME(e2label, tune2fs, _BB_DIR_SBIN, _BB_SUID_DROP, e2label))
 IF_ECHO(APPLET_NOFORK(echo, echo, _BB_DIR_BIN, _BB_SUID_DROP, echo))
 IF_ED(APPLET(ed, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_FEATURE_GREP_EGREP_ALIAS(APPLET_ODDNAME(egrep, grep, _BB_DIR_BIN, _BB_SUID_DROP, egrep))
 IF_EJECT(APPLET(eject, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_ENV(APPLET_NOEXEC(env, env, _BB_DIR_USR_BIN, _BB_SUID_DROP, env))
 IF_ENVDIR(APPLET_ODDNAME(envdir, chpst, _BB_DIR_USR_BIN, _BB_SUID_DROP, envdir))
@@ -152,8 +151,6 @@ IF_FDFLUSH(APPLET_ODDNAME(fdflush, freeramdisk, _BB_DIR_BIN, _BB_SUID_DROP, fdfl
 IF_FDFORMAT(APPLET(fdformat, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_FDISK(APPLET(fdisk, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_FGCONSOLE(APPLET(fgconsole, _BB_DIR_USR_BIN, _BB_SUID_DROP))
-IF_FEATURE_GREP_FGREP_ALIAS(APPLET_ODDNAME(fgrep, grep, _BB_DIR_BIN, _BB_SUID_DROP, fgrep))
-IF_FIND(APPLET_NOEXEC(find, find, _BB_DIR_USR_BIN, _BB_SUID_DROP, find))
 IF_FINDFS(APPLET(findfs, _BB_DIR_SBIN, _BB_SUID_MAYBE))
 IF_FLASH_ERASEALL(APPLET(flash_eraseall, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_FLASH_LOCK(APPLET_ODDNAME(flash_lock, flash_lock_unlock, _BB_DIR_USR_SBIN, _BB_SUID_DROP, flash_lock))
@@ -176,7 +173,6 @@ IF_GETENFORCE(APPLET(getenforce, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_GETOPT(APPLET(getopt, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_GETSEBOOL(APPLET(getsebool, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_GETTY(APPLET(getty, _BB_DIR_SBIN, _BB_SUID_DROP))
-IF_GREP(APPLET(grep, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_GUNZIP(APPLET(gunzip, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_GZIP(APPLET(gzip, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_HALT(APPLET(halt, _BB_DIR_SBIN, _BB_SUID_DROP))
@@ -433,7 +429,6 @@ IF_WGET(APPLET(wget, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_WHICH(APPLET(which, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_WHO(APPLET(who, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_WHOAMI(APPLET_NOFORK(whoami, whoami, _BB_DIR_USR_BIN, _BB_SUID_DROP, whoami))
-IF_XARGS(APPLET_NOEXEC(xargs, xargs, _BB_DIR_USR_BIN, _BB_SUID_DROP, xargs))
 IF_UNXZ(APPLET_ODDNAME(xzcat, unxz, _BB_DIR_USR_BIN, _BB_SUID_DROP, xzcat))
 IF_XZ(APPLET_ODDNAME(xz, unxz, _BB_DIR_USR_BIN, _BB_SUID_DROP, xz))
 IF_YES(APPLET_NOFORK(yes, yes, _BB_DIR_USR_BIN, _BB_SUID_DROP, yes))
diff --git a/include/libbb.h b/include/libbb.h
index 1e3df0930..0836b684e 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -687,6 +687,8 @@ extern ssize_t safe_write(int fd, const void *buf, size_t count) FAST_FUNC;
 extern ssize_t full_write(int fd, const void *buf, size_t count) FAST_FUNC;
 extern void xwrite(int fd, const void *buf, size_t count) FAST_FUNC;
 extern void xwrite_str(int fd, const char *str) FAST_FUNC;
+extern ssize_t full_write1_str(const char *str) FAST_FUNC;
+extern ssize_t full_write2_str(const char *str) FAST_FUNC;
 extern void xopen_xwrite_close(const char* file, const char *str) FAST_FUNC;
 
 /* Close fd, but check for failures (some types of write errors) */
diff --git a/include/usage.src.h b/include/usage.src.h
index f9f457871..f30edbc54 100644
--- a/include/usage.src.h
+++ b/include/usage.src.h
@@ -1280,72 +1280,6 @@ INSERT
 #define findfs_example_usage \
        "$ findfs LABEL=MyDevice"
 
-#define find_trivial_usage \
-       "[PATH]... [EXPRESSION]"
-#define find_full_usage "\n\n" \
-       "Search for files. The default PATH is the current directory,\n" \
-       "default EXPRESSION is '-print'\n" \
-     "\nEXPRESSION may consist of:" \
-     "\n        -follow         Follow symlinks" \
-        IF_FEATURE_FIND_XDEV( \
-     "\n        -xdev           Don't descend directories on other filesystems") \
-        IF_FEATURE_FIND_MAXDEPTH( \
-     "\n        -maxdepth N     Descend at most N levels. -maxdepth 0 applies" \
-     "\n                        tests/actions to command line arguments only") \
-     "\n        -mindepth N     Don't act on first N levels" \
-     "\n        -name PATTERN   File name (w/o directory name) matches PATTERN" \
-     "\n        -iname PATTERN  Case insensitive -name" \
-        IF_FEATURE_FIND_PATH( \
-     "\n        -path PATTERN   Path matches PATTERN") \
-        IF_FEATURE_FIND_REGEX( \
-     "\n        -regex PATTERN  Path matches regex PATTERN") \
-        IF_FEATURE_FIND_TYPE( \
-     "\n        -type X         File type is X (X is one of: f,d,l,b,c,...)") \
-        IF_FEATURE_FIND_PERM( \
-     "\n        -perm NNN       Permissions match any of (+NNN), all of (-NNN)," \
-     "\n                        or exactly NNN") \
-        IF_FEATURE_FIND_MTIME( \
-     "\n        -mtime DAYS     Modified time is greater than (+N), less than (-N)," \
-     "\n                        or exactly N days") \
-        IF_FEATURE_FIND_MMIN( \
-     "\n        -mmin MINS      Modified time is greater than (+N), less than (-N)," \
-     "\n                        or exactly N minutes") \
-        IF_FEATURE_FIND_NEWER( \
-     "\n        -newer FILE     Modified time is more recent than FILE's") \
-        IF_FEATURE_FIND_INUM( \
-     "\n        -inum N         File has inode number N") \
-        IF_FEATURE_FIND_USER( \
-     "\n        -user NAME      File is owned by user NAME (numeric user ID allowed)") \
-        IF_FEATURE_FIND_GROUP( \
-     "\n        -group NAME     File belongs to group NAME (numeric group ID allowed)") \
-        IF_FEATURE_FIND_DEPTH( \
-     "\n        -depth          Process directory name after traversing it") \
-        IF_FEATURE_FIND_SIZE( \
-     "\n        -size N[bck]    File size is N (c:bytes,k:kbytes,b:512 bytes(def.))" \
-     "\n                        +/-N: file size is bigger/smaller than N") \
-        IF_FEATURE_FIND_LINKS( \
-     "\n        -links N        Number of links is greater than (+N), less than (-N)," \
-     "\n                        or exactly N") \
-     "\n        -print          Print (default and assumed)" \
-        IF_FEATURE_FIND_PRINT0( \
-     "\n        -print0         Delimit output with null characters rather than" \
-     "\n                        newlines") \
-        IF_FEATURE_FIND_CONTEXT ( \
-     "\n        -context        File has specified security context") \
-        IF_FEATURE_FIND_EXEC( \
-     "\n        -exec CMD ARG ; Run CMD with all instances of {} replaced by the" \
-     "\n                        matching files") \
-        IF_FEATURE_FIND_PRUNE( \
-     "\n        -prune          Stop traversing current subtree") \
-        IF_FEATURE_FIND_DELETE( \
-     "\n        -delete         Delete files, turns on -depth option") \
-        IF_FEATURE_FIND_PAREN( \
-     "\n        (EXPR)          Group an expression") \
-
-#define find_example_usage \
-       "$ find / -name passwd\n" \
-       "/etc/passwd\n"
-
 #define flash_lock_trivial_usage \
        "MTD_DEVICE OFFSET SECTORS"
 #define flash_lock_full_usage "\n\n" \
@@ -1575,58 +1509,6 @@ INSERT
      "\n        -I INITSTR      Send INITSTR before anything else" \
      "\n        -H HOST         Log HOST into the utmp file as the hostname" \
 
-#define grep_trivial_usage \
-       "[-HhnlLoqvsriw" \
-       "F" \
-        IF_FEATURE_GREP_EGREP_ALIAS("E") \
-        IF_EXTRA_COMPAT("z") \
-       "] [-m N] " \
-        IF_FEATURE_GREP_CONTEXT("[-A/B/C N] ") \
-       "PATTERN/-e PATTERN.../-f FILE [FILE]..."
-#define grep_full_usage "\n\n" \
-       "Search for PATTERN in FILEs (or stdin)\n" \
-     "\nOptions:" \
-     "\n        -H      Add 'filename:' prefix" \
-     "\n        -h      Do not add 'filename:' prefix" \
-     "\n        -n      Add 'line_no:' prefix" \
-     "\n        -l      Show only names of files that match" \
-     "\n        -L      Show only names of files that don't match" \
-     "\n        -c      Show only count of matching lines" \
-     "\n        -o      Show only the matching part of line" \
-     "\n        -q      Quiet. Return 0 if PATTERN is found, 1 otherwise" \
-     "\n        -v      Select non-matching lines" \
-     "\n        -s      Suppress open and read errors" \
-     "\n        -r      Recurse" \
-     "\n        -i      Ignore case" \
-     "\n        -w      Match whole words only" \
-     "\n        -F      PATTERN is a literal (not regexp)" \
-        IF_FEATURE_GREP_EGREP_ALIAS( \
-     "\n        -E      PATTERN is an extended regexp" \
-        ) \
-        IF_EXTRA_COMPAT( \
-     "\n        -z      Input is NUL terminated" \
-        ) \
-     "\n        -m N    Match up to N times per file" \
-        IF_FEATURE_GREP_CONTEXT( \
-     "\n        -A N    Print N lines of trailing context" \
-     "\n        -B N    Print N lines of leading context" \
-     "\n        -C N    Same as '-A N -B N'" \
-        ) \
-     "\n        -e PTRN Pattern to match" \
-     "\n        -f FILE Read pattern from file" \
-
-#define grep_example_usage \
-       "$ grep root /etc/passwd\n" \
-       "root:x:0:0:root:/root:/bin/bash\n" \
-       "$ grep ^[rR]oo. /etc/passwd\n" \
-       "root:x:0:0:root:/root:/bin/bash\n"
-
-#define egrep_trivial_usage NOUSAGE_STR
-#define egrep_full_usage ""
-
-#define fgrep_trivial_usage NOUSAGE_STR
-#define fgrep_full_usage ""
-
 #define gunzip_trivial_usage \
        "[OPTIONS] [FILE]..."
 #define gunzip_full_usage "\n\n" \
@@ -2148,28 +2030,6 @@ INSERT
      "\ninotifyd waits for PROG to exit." \
      "\nWhen x event happens for all FILEs, inotifyd exits." \
 
-/* 2.6 style insmod has no options and required filename
- * (not module name - .ko can't be omitted) */
-#define insmod_trivial_usage \
-        IF_FEATURE_2_4_MODULES("[OPTIONS] MODULE ") \
-        IF_NOT_FEATURE_2_4_MODULES("FILE ") \
-        "[symbol=value]..."
-#define insmod_full_usage "\n\n" \
-       "Load the specified kernel modules into the kernel" \
-        IF_FEATURE_2_4_MODULES( "\n" \
-     "\nOptions:" \
-     "\n        -f      Force module to load into the wrong kernel version" \
-     "\n        -k      Make module autoclean-able" \
-     "\n        -v      Verbose" \
-     "\n        -q      Quiet" \
-     "\n        -L      Lock to prevent simultaneous loads of a module" \
-        IF_FEATURE_INSMOD_LOAD_MAP( \
-     "\n        -m      Output load map to stdout" \
-        ) \
-     "\n        -o NAME Set internal module name to NAME" \
-     "\n        -x      Don't export externs" \
-        )
-
 /* -v, -b, -c are ignored */
 #define install_trivial_usage \
         "[-cdDsp] [-o USER] [-g GRP] [-m MODE] [SOURCE]... DEST"
@@ -2973,95 +2833,6 @@ INSERT
        "$ ls -la /tmp/temp.mWiLjM\n" \
        "-rw-------    1 andersen andersen        0 Apr 25 17:10 /tmp/temp.mWiLjM\n"
 
-#define modprobe_trivial_usage \
-        IF_MODPROBE_SMALL("[-qfwrsv] MODULE [symbol=value]...") \
-        IF_NOT_MODPROBE_SMALL("[-" \
-                IF_FEATURE_2_4_MODULES("k")"nqrsv" \
-                IF_FEATURE_MODPROBE_BLACKLIST("b")"] MODULE [symbol=value]...")
-#define modprobe_full_usage "\n\n" \
-       "Options:" \
-        IF_MODPROBE_SMALL( \
-     "\n        -q      Quiet" \
-     "\n        -f      Force" \
-     "\n        -w      Wait for unload" \
-     "\n        -r      Remove module (stacks) or do autoclean" \
-     "\n        -s      Report via syslog instead of stderr" \
-     "\n        -v      Verbose" \
-        ) \
-        IF_NOT_MODPROBE_SMALL( \
-        IF_FEATURE_2_4_MODULES( \
-     "\n        -k      Make module autoclean-able" \
-        ) \
-     "\n        -n      Dry run" \
-     "\n        -q      Quiet" \
-     "\n        -r      Remove module (stacks) or do autoclean" \
-     "\n        -s      Report via syslog instead of stderr" \
-     "\n        -v      Verbose" \
-        IF_FEATURE_MODPROBE_BLACKLIST( \
-     "\n        -b      Apply blacklist to module names too" \
-        ) \
-        )
-
-#define modprobe_notes_usage \
-"modprobe can (un)load a stack of modules, passing each module options (when\n" \
-"loading). modprobe uses a configuration file to determine what option(s) to\n" \
-"pass each module it loads.\n" \
-"\n" \
-"The configuration file is searched (in this order):\n" \
-"\n" \
-"    /etc/modprobe.conf (2.6 only)\n" \
-"    /etc/modules.conf\n" \
-"    /etc/conf.modules (deprecated)\n" \
-"\n" \
-"They all have the same syntax (see below). If none is present, it is\n" \
-"_not_ an error; each loaded module is then expected to load without\n" \
-"options. Once a file is found, the others are tested for.\n" \
-"\n" \
-"/etc/modules.conf entry format:\n" \
-"\n" \
-"  alias <alias_name> <mod_name>\n" \
-"    Makes it possible to modprobe alias_name, when there is no such module.\n" \
-"    It makes sense if your mod_name is long, or you want a more representative\n" \
-"    name for that module (eg. 'scsi' in place of 'aha7xxx').\n" \
-"    This makes it also possible to use a different set of options (below) for\n" \
-"    the module and the alias.\n" \
-"    A module can be aliased more than once.\n" \
-"\n" \
-"  options <mod_name|alias_name> <symbol=value...>\n" \
-"    When loading module mod_name (or the module aliased by alias_name), pass\n" \
-"    the \"symbol=value\" pairs as option to that module.\n" \
-"\n" \
-"Sample /etc/modules.conf file:\n" \
-"\n" \
-"  options tulip irq=3\n" \
-"  alias tulip tulip2\n" \
-"  options tulip2 irq=4 io=0x308\n" \
-"\n" \
-"Other functionality offered by 'classic' modprobe is not available in\n" \
-"this implementation.\n" \
-"\n" \
-"If module options are present both in the config file, and on the command line,\n" \
-"then the options from the command line will be passed to the module _after_\n" \
-"the options from the config file. That way, you can have defaults in the config\n" \
-"file, and override them for a specific usage from the command line.\n"
-#define modprobe_example_usage \
-       "(with the above /etc/modules.conf):\n\n" \
-       "$ modprobe tulip\n" \
-       "   will load the module 'tulip' with default option 'irq=3'\n\n" \
-       "$ modprobe tulip irq=5\n" \
-       "   will load the module 'tulip' with option 'irq=5', thus overriding the default\n\n" \
-       "$ modprobe tulip2\n" \
-       "   will load the module 'tulip' with default options 'irq=4 io=0x308',\n" \
-       "   which are the default for alias 'tulip2'\n\n" \
-       "$ modprobe tulip2 irq=8\n" \
-       "   will load the module 'tulip' with default options 'irq=4 io=0x308 irq=8',\n" \
-       "   which are the default for alias 'tulip2' overridden by the option 'irq=8'\n\n" \
-       "   from the command line\n\n" \
-       "$ modprobe tulip2 irq=2 io=0x210\n" \
-       "   will load the module 'tulip' with default options 'irq=4 io=0x308 irq=4 io=0x210',\n" \
-       "   which are the default for alias 'tulip2' overridden by the options 'irq=2 io=0x210'\n\n" \
-       "   from the command line\n"
-
 #define more_trivial_usage \
        "[FILE]..."
 #define more_full_usage "\n\n" \
@@ -5208,34 +4979,13 @@ INSERT
 #define who_full_usage "\n\n" \
        "Show who is logged on\n" \
      "\nOptions:" \
-     "\n        -a      show all" \
+     "\n        -a      Show all" \
 
 #define whoami_trivial_usage \
        ""
 #define whoami_full_usage "\n\n" \
        "Print the user name associated with the current effective user id"
 
-#define xargs_trivial_usage \
-       "[OPTIONS] [PROG ARGS]"
-#define xargs_full_usage "\n\n" \
-       "Run PROG on every item given by stdin\n" \
-     "\nOptions:" \
-        IF_FEATURE_XARGS_SUPPORT_CONFIRMATION( \
-     "\n        -p      Ask user whether to run each command") \
-     "\n        -r      Don't run command if input is empty" \
-        IF_FEATURE_XARGS_SUPPORT_ZERO_TERM( \
-     "\n        -0      Input is separated by NUL characters") \
-     "\n        -t      Print the command on stderr before execution" \
-     "\n        -e[STR] STR stops input processing" \
-     "\n        -n N    Pass no more than N args to PROG" \
-     "\n        -s N    Pass command line of no more than N bytes" \
-        IF_FEATURE_XARGS_SUPPORT_TERMOPT( \
-     "\n        -x      Exit if size is exceeded") \
-
-#define xargs_example_usage \
-       "$ ls | xargs gzip\n" \
-       "$ find . -name '*.c' -print | xargs rm\n"
-
 #define zcat_trivial_usage \
        "FILE"
 #define zcat_full_usage "\n\n" \