Fix the pwd and group functions. The bb_ stuff was a leftover from

[oweals/busybox.git] / dirname.c

diff --git a/dirname.c b/dirname.c
index 23f46be4085e842b7b76b131188a2bca1cd87655..2e11a69dc432c358c8ef26d33fb2ac6e35708c77 100644 (file)
--- a/dirname.c
+++ b/dirname.c
@@ -2,7 +2,7 @@
 /*
  * Mini dirname implementation for busybox
  *
- * Copyright (C) 2000 by Lineo, inc.
+ * Copyright (C) 1999,2000,2001 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
@@ -22,6 +22,8 @@
  */
 #include "busybox.h"
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 extern int dirname_main(int argc, char **argv)
 {
@@ -32,13 +34,14 @@ extern int dirname_main(int argc, char **argv)
        argv++;
 
        s=*argv+strlen(*argv)-1;
-       while (s && *s == '/') {
-               *s = '\0';
-               s=*argv+strlen(*argv)-1;
+       while (s != *argv && *s == '/') {
+               *s-- = '\0';
        }
        s = strrchr(*argv, '/');
-       if (s && *s)
+       if (s != NULL && s == *argv)
+               s[1] = '\0';
+       else if (s != NULL)
                *s = '\0';
-       printf("%s\n", (s)? *argv : ".");
-       return(TRUE);
+       puts(s ? *argv : ".");
+       return EXIT_SUCCESS;
 }