More doc updates for BusyBox, with fixes to apps for bugs revealed

while trying to write docs . :-)
 -Erik

5 files changed, 73 insertions, 144 deletions

diff --git a/coreutils/basename.c b/coreutils/basename.c
index 06e27663f..5fe5e0f03 100644
--- a/coreutils/basename.c
+++ b/coreutils/basename.c
@@ -34,8 +34,10 @@ extern int basename_main(int argc, char **argv)
 	argv++;
 
 	s1=*argv+strlen(*argv)-1;
-	if (*s1 == '/')
+	while (s1 && *s1 == '/') {
 		*s1 = '\0';
+		s1=*argv+strlen(*argv)-1;
+	}
 	s = strrchr(*argv, '/');
 	printf("%s\n", (s)? s + 1 : *argv);
 	exit(TRUE);
diff --git a/coreutils/dirname.c b/coreutils/dirname.c
index 77cb664ac..528b89a56 100644
--- a/coreutils/dirname.c
+++ b/coreutils/dirname.c
@@ -1,146 +1,45 @@
 /* vi: set sw=4 ts=4: */
 /*
- * This is temporary -- needs to be rewritten to be tighter */
-/*
- * Copyright (c) 1991, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
+ * Mini dirname implementation for busybox
+ *
+ * Copyright (C) 2000 by Lineo, inc.
+ * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
  */
-
-#if 0
-#ifndef lint
-static char copyright[] = "@(#) Copyright (c) 1991, 1993, 1994\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif							/* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)dirname.c	8.4 (Berkeley) 5/4/95";
-#endif							/* not lint */
-#endif							/* #if 0 */
-
 #include "internal.h"
 #include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
 
-void dirname_usage()
+extern int dirname_main(int argc, char **argv)
 {
+	char* s;
 
-	(void) fprintf(stderr, "usage: dirname path\n");
-	exit(1);
-}
-
-extern int dirname_main(argc, argv)
-int argc;
-char **argv;
-{
-	char *p;
-	int ch;
-
-	while ((ch = getopt(argc, argv, "")) != -1)
-		switch (ch) {
-		case '?':
-		default:
-			dirname_usage();
-		}
-	argc -= optind;
-	argv += optind;
-
-	if (argc != 1)
-		dirname_usage();
-
-	/*
-	 * (1) If string is //, skip steps (2) through (5).
-	 * (2) If string consists entirely of slash characters, string
-	 *     shall be set to a single slash character.  In this case,
-	 *     skip steps (3) through (8).
-	 */
-	for (p = *argv;; ++p) {
-		if (!*p) {
-			if (p > *argv)
-				(void) printf("/\n");
-			else
-				(void) printf(".\n");
-			exit(0);
-		}
-		if (*p != '/')
-			break;
+	if ((argc < 2) || (**(argv + 1) == '-')) {
+		usage("dirname [file ...]\n");
 	}
+	argv++;
 
-	/*
-	 * (3) If there are any trailing slash characters in string, they
-	 *     shall be removed.
-	 */
-	for (; *p; ++p);
-	while (*--p == '/')
-		continue;
-	*++p = '\0';
-
-	/*
-	 * (4) If there are no slash characters remaining in string,
-	 *     string shall be set to a single period character.  In this
-	 *     case skip steps (5) through (8).
-	 *
-	 * (5) If there are any trailing nonslash characters in string,
-	 *     they shall be removed.
-	 */
-	while (--p >= *argv)
-		if (*p == '/')
-			break;
-	++p;
-	if (p == *argv) {
-		(void) printf(".\n");
-		exit(0);
+	s=*argv+strlen(*argv)-1;
+	while (s && *s == '/') {
+		*s = '\0';
+		s=*argv+strlen(*argv)-1;
 	}
-
-	/*
-	 * (6) If the remaining string is //, it is implementation defined
-	 *     whether steps (7) and (8) are skipped or processed.
-	 *
-	 * This case has already been handled, as part of steps (1) and (2).
-	 */
-
-	/*
-	 * (7) If there are any trailing slash characters in string, they
-	 *     shall be removed.
-	 */
-	while (--p >= *argv)
-		if (*p != '/')
-			break;
-	++p;
-
-	/*
-	 * (8) If the remaining string is empty, string shall be set to
-	 *     a single slash character.
-	 */
-	*p = '\0';
-	(void) printf("%s\n", p == *argv ? "/" : *argv);
-	exit(0);
+	s = strrchr(*argv, '/');
+	if (s && *s)
+		*s = '\0';
+	printf("%s\n", (s)? *argv : ".");
+	exit(TRUE);
 }
diff --git a/coreutils/echo.c b/coreutils/echo.c
index 91f17aa0f..2405d0ae1 100644
--- a/coreutils/echo.c
+++ b/coreutils/echo.c
@@ -25,6 +25,14 @@
 #include "internal.h"
 #include <stdio.h>
 
+static const char uname_usage[] =
+	"echo [-neE] [ARG ...]\n\n"
+	"Prints 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\n";
+
 extern int 
 echo_main(int argc, char** argv)
 {
@@ -45,6 +53,9 @@ echo_main(int argc, char** argv)
 		} else if (strcmp(p, "-E")==0) {
 			eflag = 0;
 		}
+		else if (strncmp(p, "--", 2)==0) {
+			usage( uname_usage);
+		} 
 		else break;
 		ap++;
 	}
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 3e010503c..0c7f6522c 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -88,7 +88,6 @@
 #define DISP_FULLTIME	32		/* show extended time display */
 #define DIR_NOLIST	64			/* show directory as itself, not contents */
 #define DISP_DIRNAME	128		/* show directory name (for internal use) */
-#define DIR_RECURSE	256			/* -R (not yet implemented) */
 
 #ifndef MAJOR
 #define MAJOR(dev) (((dev)>>8)&0xff)
@@ -450,10 +449,33 @@ static const char ls_usage[] = "ls [-1a"
 #ifdef BB_FEATURE_LS_FILETYPES
 	"F"
 #endif
-#ifdef FEATURE_RECURSIVE
-	"R"
+	"] [filenames...]\n\n"
+	"Options:\n"
+	"\t-a\tdo not hide entries starting with .\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
-	"] [filenames...]\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_TIMESTAMPS
+	"\t-u\twith -l: show access time (the time of last\n"
+	"\t\taccess of the file)\n"
+#endif
+	"\t-x\tlist entries by lines instead of by columns\n"
+	"\t-A\tdo not list implied . and ..\n"
+	"\t-C\tlist entries by columns\n"
+#ifdef BB_FEATURE_LS_FILETYPES
+	"\t-F\tappend indicator (one of */=@|) to entries\n"
+#endif
+	;
 
 extern int ls_main(int argc, char **argv)
 {
@@ -508,11 +530,6 @@ extern int ls_main(int argc, char **argv)
 			case 'd':
 				opts |= DIR_NOLIST;
 				break;
-#ifdef FEATURE_RECURSIVE
-			case 'R':
-				opts |= DIR_RECURSE;
-				break;
-#endif
 #ifdef BB_FEATURE_LS_TIMESTAMPS
 			case 'u':
 				time_fmt = TIME_ACCESS;
diff --git a/coreutils/mknod.c b/coreutils/mknod.c
index b11a81f2a..40f508d33 100644
--- a/coreutils/mknod.c
+++ b/coreutils/mknod.c
@@ -70,7 +70,7 @@ int mknod_main(int argc, char **argv)
 
 	if (mknod(argv[1], mode, dev) != 0) {
 		perror(argv[1]);
-		return (FALSE);
+		exit (FALSE);
 	}
-	return (TRUE);
+	exit (TRUE);
 }