X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fdirname.c;h=15d25967afe88d8422f25503a89b6cdbc39b1df2;hb=535ad0d12391ae61b91cb173f9b980ac1e2699b6;hp=8e365ed928a05c763830786beea29808ca1a1fdd;hpb=92a0e357d2915935df140c766bf98db53a53a455;p=gnulib.git

diff --git a/lib/dirname.c b/lib/dirname.c
index 8e365ed92..15d25967a 100644
--- a/lib/dirname.c
+++ b/lib/dirname.c
@@ -16,14 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I will use ./config.h rather than /config.h
-   (which it would do because it found this file in ).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #ifdef STDC_HEADERS
@@ -33,11 +26,11 @@ char *malloc ();
 #endif
 #if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
 #include <string.h>
-#ifndef rindex
-#define rindex strrchr
-#endif
 #else
 #include <strings.h>
+#ifndef strrchr
+#define strrchr rindex
+#endif
 #endif
 
 /* Return the leading directories part of PATH,
@@ -53,7 +46,7 @@ dirname (path)
   char *slash;
   int length;			/* Length of result, not including NUL.  */
 
-  slash = rindex (path, '/');
+  slash = strrchr (path, '/');
   if (slash == 0)
     {
       /* File is in the current directory.  */
@@ -68,7 +61,7 @@ dirname (path)
 
       length = slash - path + 1;
     }
-  newpath = malloc (length + 1);
+  newpath = (char *) malloc (length + 1);
   if (newpath == 0)
     return 0;
   strncpy (newpath, path, length);