X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fdirname.c;h=15d25967afe88d8422f25503a89b6cdbc39b1df2;hb=512ba8f4f8cd29b154fc3ddf064276f0db9fd294;hp=82deea7b4ac90929658990923da15b7df686dc55;hpb=d87c39464604e74f580c7fae835be31a4c125c36;p=gnulib.git

diff --git a/lib/dirname.c b/lib/dirname.c
index 82deea7b4..15d25967a 100644
--- a/lib/dirname.c
+++ b/lib/dirname.c
@@ -15,16 +15,22 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #ifdef STDC_HEADERS
 #include <stdlib.h>
 #else
 char *malloc ();
 #endif
-#if defined(USG) || defined(STDC_HEADERS)
+#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
 #include <string.h>
-#define rindex strrchr
 #else
 #include <strings.h>
+#ifndef strrchr
+#define strrchr rindex
+#endif
 #endif
 
 /* Return the leading directories part of PATH,
@@ -40,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.  */
@@ -55,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);