move utmp.h include to libbb.h

[oweals/busybox.git] / coreutils / basename.c

diff --git a/coreutils/basename.c b/coreutils/basename.c
index 71bb9b3bdbabf190458dc4d0ad5eab23d7b8386d..d441247416ef27b456e7b0527071513aef6f0294 100644 (file)
--- a/coreutils/basename.c
+++ b/coreutils/basename.c
@@ -2,29 +2,11 @@
 /*
  * Mini basename implementation for busybox
  *
- * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen
- * Copyright (C) 1999,2000,2001 by Erik Andersen <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.
- *
- * 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
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
-/* BB_AUDIT SUSv3 compliant */
-/* http://www.opengroup.org/onlinepubs/007904975/utilities/basename.html */
-
-
 /* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
  *
  * Changes:
@@ -33,31 +15,47 @@
  * 3) Save some space by using strcmp().  Calling strncmp() here was silly.
  */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include "busybox.h"
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/basename.html */
+
+//kbuild:lib-$(CONFIG_BASENAME) += basename.o
+
+//config:config BASENAME
+//config:      bool "basename"
+//config:      default y
+//config:      help
+//config:        basename is used to strip the directory and suffix from filenames,
+//config:        leaving just the filename itself. Enable this option if you wish
+//config:        to enable the 'basename' utility.
 
-extern int basename_main(int argc, char **argv)
+#include "libbb.h"
+
+/* This is a NOFORK applet. Be very careful! */
+
+int basename_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int basename_main(int argc, char **argv)
 {
        size_t m, n;
        char *s;
 
-       if (((unsigned int)(argc-2)) >= 2) {
+       if ((unsigned)(argc-2) >= 2) {
                bb_show_usage();
        }
 
-       s = bb_get_last_path_component(*++argv);
+       /* It should strip slash: /abc/def/ -> def */
+       s = bb_get_last_path_component_strip(*++argv);
 
+       m = strlen(s);
        if (*++argv) {
                n = strlen(*argv);
-               m = strlen(s);
-               if ((m > n) && ((strcmp)(s+m-n, *argv) == 0)) {
-                       s[m-n] = '\0';
+               if ((m > n) && (strcmp(s+m-n, *argv) == 0)) {
+                       m -= n;
+                       /*s[m] = '\0'; - redundant */
                }
        }
 
-       puts(s);
-
-       bb_fflush_stdout_and_exit(EXIT_SUCCESS);
+       /* puts(s) will do, but we can do without stdio this way: */
+       s[m++] = '\n';
+       /* NB: != is correct here: */
+       return full_write(STDOUT_FILENO, s, m) != (ssize_t)m;
 }