Use minix xargs instead, and update docs accordingly

-Erik

applets/usage.c

@@ -592,6 +592,9 @@ const char ls_usage[] =
 #ifdef BB_FEATURE_LS_FILETYPES
 	"p"
 #endif
+#ifdef BB_FEATURE_LS_FOLLOWLINKS
+    "L"
+#endif
 #ifdef BB_FEATURE_LS_RECURSIVE
 	"R"
 #endif
@@ -640,6 +643,9 @@ const char ls_usage[] =
 #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
@@ -1433,14 +1439,15 @@ const char whoami_usage[] =
 #endif
 
 #if defined BB_XARGS
-const char xargs_usage[] =
-       "xargs [-0prtx] [-e[eof-str]] [-i[replace-str]] [-l[max-lines]]\n"
-       "[-n max-args] [-s max-chars] [-P max-procs] [--null] [--eof[=eof-str]]\n"
-       "[--replace[=replace-str]] [--max-lines[=max-lines]] [--interactive]\n"
-       "[--max-chars=max-chars] [--verbose] [--exit] [--max-procs=max-procs]\n"
-       "[--max-args=max-args] [--no-run-if-empty] [--help]\n"
-       "[command [initial-arguments]]\n"
-       "\nBuild and execute command on lines from standard input.\n"; 
+const char xargs_usage[] = "xargs [OPTIONS] [COMMAND] [ARGS...]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+	"\nExecutes COMMAND on every item given by standard input.\n\n" 
+	"Options:\n"
+	"\t-t\tPrint the command just before it is run\n"
+	"\t-l LEN\tUse LEN as maximum line length (default 490, max 1023)\n"
+	"\t-e ENDING\tAppend ENDING to the command before executing it.\n"
+#endif
+	;
 #endif
 
 #if defined BB_YES

docs/busybox.pod

@@ -64,8 +64,8 @@ mkfifo, mkfs.minix, mknod, mkswap, mktemp, more, mount, mt, mv, nc, nslookup,
 ping, poweroff, printf, ps, pwd, rdate, reboot, renice, reset, rm, rmdir,
 rmmod, sed, setkeycodes, sh, sleep, sort, swapoff, swapon, sync, syslogd, tail,
 tar, tee, telnet, test, touch, tr, true, tty, umount, uname, uniq, unix2dos,
-unrpm, update, uptime, usleep, uudecode, uuencode, wc, which, whoami, yes,
-zcat, [
+unrpm, update, uptime, usleep, uudecode, uuencode, wc, which, whoami, xargs,
+yes, zcat, [
 
 -------------------------------
 
@@ -1105,7 +1105,7 @@ Example:
 
 =item ls
 
-Usage: ls [B<-1acdelnpuxACFR>] [filenames...]
+Usage: ls [B<-1acdelnpuxACFLR>] [filenames...]
 
 Options:
 
@@ -1124,6 +1124,7 @@ Options:
 	-C	list entries by columns
 	-F	append indicator (one of */=@|) to entries
 	-R  list subdirectories recursively
+	-L  list entries pointed to by symbolic links
 
 -------------------------------
 
@@ -2080,6 +2081,25 @@ Example:
 
 -------------------------------
 
+=item xargs
+
+Usage: xargs [OPTIONS] [COMMAND] [ARGS...]
+
+Executes COMMAND on every item given by standard input.
+
+Options:
+
+		-t      Print the command just before it is run
+		-l LEN  Use LEN as maximum line length (default 490, max 1023)
+		-e ENDING       Append ENDING to the command before executing it.
+ 
+Example:
+
+	$ ls | xargs gzip
+	$ find . -name '*.c' -print | xargs rm
+
+-------------------------------
+
 =item yes
 
 Usage: yes [OPTION]... [STRING]...
@@ -2182,4 +2202,4 @@ Enrique Zanardi <ezanardi@ull.es>
 
 =cut
 
-# $Id: busybox.pod,v 1.70 2000/09/21 02:06:35 andersen Exp $
+# $Id: busybox.pod,v 1.71 2000/09/22 20:22:27 andersen Exp $

docs/busybox.sgml

@@ -1922,6 +1922,7 @@
 			-A	Do not list implied . and ..
 			-C	List entries by columns
 			-F	Append indicator (one of */=@|) to entries
+			-L	list entries pointed to by symbolic links
 			-R	List subdirectories recursively
 		</screen>
 		</para>
@@ -3659,6 +3660,42 @@
 		</para>
 	</sect1>
 
+	<sect1 id="xargs">
+	    <title>xargs</title>
+
+		<para>
+		Usage: xargs [OPTIONS] [COMMAND] [ARGS...]
+		</para>
+
+		<para>
+		Executes COMMAND on every item given by standard input.
+		</para>
+
+		<para>
+		Options:
+		</para>
+
+		<para>
+		<screen>
+			-t      Print the command just before it is run
+			-l LEN  Use LEN as maximum line length (default 490, max 1023)
+			-e ENDING       Append ENDING to the command before executing it.
+		</screen>
+		</para>
+
+
+		<para>
+		Example:
+		</para>
+
+		<para>
+		<screen>
+			$ ls | xargs gzip
+			$ find . -name '*.c' -print | xargs rm
+		</screen>
+		</para>
+	</sect1>
+
 	<sect1 id="yes">
 	    <title>yes</title>
 

usage.c

@@ -592,6 +592,9 @@ const char ls_usage[] =
 #ifdef BB_FEATURE_LS_FILETYPES
 	"p"
 #endif
+#ifdef BB_FEATURE_LS_FOLLOWLINKS
+    "L"
+#endif
 #ifdef BB_FEATURE_LS_RECURSIVE
 	"R"
 #endif
@@ -640,6 +643,9 @@ const char ls_usage[] =
 #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
@@ -1433,14 +1439,15 @@ const char whoami_usage[] =
 #endif
 
 #if defined BB_XARGS
-const char xargs_usage[] =
-       "xargs [-0prtx] [-e[eof-str]] [-i[replace-str]] [-l[max-lines]]\n"
-       "[-n max-args] [-s max-chars] [-P max-procs] [--null] [--eof[=eof-str]]\n"
-       "[--replace[=replace-str]] [--max-lines[=max-lines]] [--interactive]\n"
-       "[--max-chars=max-chars] [--verbose] [--exit] [--max-procs=max-procs]\n"
-       "[--max-args=max-args] [--no-run-if-empty] [--help]\n"
-       "[command [initial-arguments]]\n"
-       "\nBuild and execute command on lines from standard input.\n"; 
+const char xargs_usage[] = "xargs [OPTIONS] [COMMAND] [ARGS...]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+	"\nExecutes COMMAND on every item given by standard input.\n\n" 
+	"Options:\n"
+	"\t-t\tPrint the command just before it is run\n"
+	"\t-l LEN\tUse LEN as maximum line length (default 490, max 1023)\n"
+	"\t-e ENDING\tAppend ENDING to the command before executing it.\n"
+#endif
+	;
 #endif
 
 #if defined BB_YES