Use an int to hold the result of fgetc (bug noted by David Kimdon).

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

diff --git a/coreutils/basename.c b/coreutils/basename.c
index 5b83eef492c47ffaee991fd88dd3b068f8827a11..bdbcec17abd0e09a0f5dbee09a3aad812d9d35df 100644 (file)
--- a/coreutils/basename.c
+++ b/coreutils/basename.c
@@ -2,8 +2,8 @@
 /*
  * Mini basename implementation for busybox
  *
- * Copyright (C) 1999,2000 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+ * 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
@@ -21,8 +21,11 @@
  *
  */
 
-#include "internal.h"
-#include <stdio.h>
+/* getopt not needed */
+
+#include <stdlib.h>
+#include "busybox.h"
+#include <string.h>
 
 extern int basename_main(int argc, char **argv)
 {
@@ -30,7 +33,7 @@ extern int basename_main(int argc, char **argv)
        char *s;
 
        if ((argc < 2) || (**(argv + 1) == '-')) {
-               usage(basename_usage);
+               show_usage();
        }
 
        argv++;
@@ -41,9 +44,9 @@ extern int basename_main(int argc, char **argv)
                argv++;
                n = strlen(*argv);
                m = strlen(s);
-               if (m>=n && strncmp(s+m-n, *argv, n)==0)
+               if (m>n && strncmp(s+m-n, *argv, n)==0)
                        s[m-n] = '\0';
        }
-       printf("%s\n", s);
-       return(TRUE);
+       puts(s);
+       return EXIT_SUCCESS;
 }