X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fdirname.c;h=7671a0d62e43cf9415df0f7c1d1d9ba83067061c;hb=a10e3d19c8c812a60794c247ff6940a04ed51bea;hp=237dd4b75b90ddb0106301a0e790125a49de11e2;hpb=ec4c2552456754b07b5d1d19b1c80c84d9cfa9c3;p=gnulib.git

diff --git a/lib/dirname.c b/lib/dirname.c
index 237dd4b75..7671a0d62 100644
--- a/lib/dirname.c
+++ b/lib/dirname.c
@@ -1,5 +1,7 @@
 /* dirname.c -- return all but the last element in a path
-   Copyright (C) 1990, 1998 Free Software Foundation, Inc.
+
+   Copyright (C) 1990, 1998, 2000, 2001, 2003, 2004 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
@@ -15,72 +17,105 @@
    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
 
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#else
-char *malloc ();
-#endif
-#if defined STDC_HEADERS || defined HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef strrchr
-#  define strrchr rindex
-# endif
-#endif
+#include "dirname.h"
 
-#include <ctype.h>
+#include <string.h>
+#include "xalloc.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))
+/* 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 = FILE_SYSTEM_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 *
-dirname (path)
-     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);
+  bool append_dot = (length == FILE_SYSTEM_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
-    {
-      char *lim = path;
+#ifdef TEST_DIRNAME
+/*
 
-#ifdef MSDOS
-      /* If canonicalized "d:/path", leave alone the root case "d:/".  */
-      lim = (ISALPHA (path[0]) && path[1] == ':') ? path + 2 : path;
-#endif
+Run the test like this (expect no output):
+  gcc -DHAVE_CONFIG_H -DTEST_DIRNAME -I.. -O -Wall \
+     basename.c dirname.c xmalloc.c error.c
+  sed -n '/^BEGIN-DATA$/,/^END-DATA$/p' dirname.c|grep -v DATA|./a.out
+
+If it's been built on a DOS or Windows platforms, run another test like
+this (again, expect no output):
+  sed -n '/^BEGIN-DOS-DATA$/,/^END-DOS-DATA$/p' dirname.c|grep -v DATA|./a.out
+
+BEGIN-DATA
+foo//// .
+bar/foo//// bar
+foo/ .
+/ /
+. .
+a .
+END-DATA
+
+BEGIN-DOS-DATA
+c:///// c:/
+c:/ c:/
+c:/. c:/
+c:foo c:.
+c:foo/bar c:foo
+END-DOS-DATA
 
-      /* Remove any trailing slashes from the result.  */
-      while (slash > path && *slash == '/')
-	--slash;
+*/
 
-      length = slash - path + 1;
+# define MAX_BUFF_LEN 1024
+# include <stdio.h>
+
+char *program_name;
+
+int
+main (int argc, char *argv[])
+{
+  char buff[MAX_BUFF_LEN + 1];
+
+  program_name = argv[0];
+
+  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