More doc updates for BusyBox, with fixes to apps for bugs revealed
while trying to write docs . :-)
-Erik
diff --git a/coreutils/dirname.c b/coreutils/dirname.c
index 77cb664..528b89a 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
*
- * 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.
+ * Copyright (C) 2000 by Lineo, inc.
+ * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
*
- * 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.
+ * 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.
+ *
+ * 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
+ *
*/
-
-#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);
}