.

[gnulib.git] / lib / dirname.c

diff --git a/lib/dirname.c b/lib/dirname.c
index 237dd4b..483c338 100644 (file)
--- a/lib/dirname.c
+++ b/lib/dirname.c
@@ -15,7 +15,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#ifdef HAVE_CONFIG_H
+#if HAVE_CONFIG_H
 # include <config.h>
 #endif
 
@@ -33,14 +33,7 @@ char *malloc ();
 # endif
 #endif
 
-#include <ctype.h>
-
-#if defined STDC_HEADERS || (!defined isascii && !defined HAVE_ISASCII)
-# define IN_CTYPE_DOMAIN(c) 1
-#else
-# define IN_CTYPE_DOMAIN(c) isascii(c)
-#endif
-#define ISALPHA(Ch) (IN_CTYPE_DOMAIN (Ch) && isalpha (Ch))
+#include "dirname.h"
 
 /* Return the leading directories part of PATH,
    allocated with malloc.  If out of memory, return 0.
@@ -48,8 +41,7 @@ char *malloc ();
    removed.  */
 
 char *
-dirname (path)
-     char *path;
+dir_name (const char *path)
 {
   char *newpath;
   char *slash;
@@ -64,13 +56,6 @@ dirname (path)
     }
   else
     {
-      char *lim = path;
-
-#ifdef MSDOS
-      /* If canonicalized "d:/path", leave alone the root case "d:/".  */
-      lim = (ISALPHA (path[0]) && path[1] == ':') ? path + 2 : path;
-#endif
-
       /* Remove any trailing slashes from the result.  */
       while (slash > path && *slash == '/')
        --slash;