X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fdirname.c;h=9fb5f09374d1ce1c232e5ad18263cfbe763954a2;hb=f9fa25dca3c78a2298e466e1b33caca0ee7e458b;hp=cf62de7a042f4a19cbe2c720720e8a76d7f53869;hpb=373d8ea1b7074011bd6dc3605e1ef855cfb4af03;p=gnulib.git

diff --git a/lib/dirname.c b/lib/dirname.c
index cf62de7a0..9fb5f0937 100644
--- a/lib/dirname.c
+++ b/lib/dirname.c
@@ -1,5 +1,5 @@
 /* dirname.c -- return all but the last element in a path
-   Copyright (C) 1990, 1998 Free Software Foundation, Inc.
+   Copyright 1990, 1998, 2000, 2001 Free Software Foundation, Inc.
 
    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
@@ -19,62 +19,87 @@
 # include <config.h>
 #endif
 
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#else
-char *malloc ();
-#endif
-#if defined STDC_HEADERS || defined HAVE_STRING_H
+#if STDC_HEADERS || HAVE_STRING_H
 # include <string.h>
-#else
-# include <strings.h>
-# ifndef strrchr
-#  define strrchr rindex
-# endif
 #endif
 
 #include "dirname.h"
+#include "xalloc.h"
+
+/* Return the length of `dirname (PATH)', or zero if PATH is
+   in the working directory.  Works properly even if
+   there are trailing slashes (by effectively ignoring them).  */
+size_t
+dir_len (char const *path)
+{
+  size_t prefix_length = FILESYSTEM_PREFIX_LEN (path);
+  size_t length;
+
+  /* Strip the basename and any redundant slashes before it.  */
+  for (length = base_name (path) - path;  prefix_length < length;  length--)
+    if (! ISSLASH (path[length - 1]))
+      return length;
+
+  /* But don't strip the only slash from "/".  */
+  return prefix_length + ISSLASH (path[prefix_length]);
+}
 
 /* Return the leading directories part of PATH,
-   allocated with malloc.  If out of memory, return 0.
-   Assumes that trailing slashes have already been
-   removed.  */
+   allocated with xmalloc.
+   Works properly even if there are trailing slashes
+   (by effectively ignoring them).  */
 
 char *
-dir_name (const char *path)
+dir_name (char const *path)
 {
-  char *newpath;
-  char *slash;
-  int length;			/* Length of result, not including NUL.  */
+  size_t length = dir_len (path);
+  int append_dot = (length == FILESYSTEM_PREFIX_LEN (path));
+  char *newpath = xmalloc (length + append_dot + 1);
+  memcpy (newpath, path, length);
+  if (append_dot)
+    newpath[length++] = '.';
+  newpath[length] = 0;
+  return newpath;
+}
 
-  slash = strrchr (path, '/');
-  if (slash == 0)
-    {
-      /* File is in the current directory.  */
-      path = ".";
-      length = 1;
-    }
-  else
-    {
-      /* Remove any trailing slashes from the result.  */
-#ifdef MSDOS
-      char *lim = (path[0] >= 'A' && path[0] <= 'z' && path[1] == ':')
-		  ? path + 2 : path;
-
-      /* If canonicalized "d:/path", leave alone the root case "d:/".  */
-      while (slash > lim && *slash == '/')
-	--slash;
-#else
-      while (slash > path && *slash == '/')
-	--slash;
-#endif
+#ifdef TEST_DIRNAME
+/*
+
+Run the test like this (expect no output):
+  gcc -DHAVE_CONFIG_H -DTEST_DIRNAME -I.. -O -Wall \
+     basename.c dirname.c xmalloc.c
+  sed -n '/^BEGIN-DATA$/,/^END-DATA$/p' dirname.c|grep -v DATA|./a.out
+
+BEGIN-DATA
+foo//// .
+bar/foo//// bar
+foo/ .
+/ /
+. .
+a .
+END-DATA
 
-      length = slash - path + 1;
+*/
+
+# define MAX_BUFF_LEN 1024
+# include <stdio.h>
+
+int
+main ()
+{
+  char buff[MAX_BUFF_LEN + 1];
+
+  buff[MAX_BUFF_LEN] = 0;
+  while (fgets (buff, MAX_BUFF_LEN, stdin) && buff[0])
+    {
+      char path[MAX_BUFF_LEN];
+      char expected_result[MAX_BUFF_LEN];
+      char const *result;
+      sscanf (buff, "%s %s", path, expected_result);
+      result = dir_name (path);
+      if (strcmp (result, expected_result))
+	printf ("%s: got %s, expected %s\n", path, result, expected_result);
     }
-  newpath = (char *) malloc (length + 1);
-  if (newpath == 0)
-    return 0;
-  strncpy (newpath, path, length);
-  newpath[length] = 0;
-  return newpath;
+  return 0;
 }
+#endif