X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstripslash.c;h=4ba5dadbe8b6f0c13108892cd8cad9ee043c3019;hb=1c01f30b6b6a4b087e613f7122095058bfa36c54;hp=20cdc48b5ff87fb44e10384add15edd374aee4d6;hpb=572993f926994346e843556b653b619b61a101c2;p=gnulib.git

diff --git a/lib/stripslash.c b/lib/stripslash.c
index 20cdc48b5..4ba5dadbe 100644
--- a/lib/stripslash.c
+++ b/lib/stripslash.c
@@ -1,5 +1,6 @@
-/* stripslash.c -- remove trailing slashes from a string
-   Copyright (C) 1990 Free Software Foundation, Inc.
+/* stripslash.c -- remove redundant trailing slashes from a file name
+
+   Copyright (C) 1990, 2001, 2003-2006 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
@@ -13,34 +14,34 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
-#if STDC_HEADERS || HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include "dirname.h"
 
-#ifndef ISSLASH
-# define ISSLASH(C) ((C) == '/')
-#endif
+/* Remove trailing slashes from FILE.  Return true if a trailing slash
+   was removed.  This is useful when using file name completion from a
+   shell that adds a "/" after directory names (such as tcsh and
+   bash), because on symlinks to directories, several system calls
+   have different semantics according to whether a trailing slash is
+   present.  */
 
-/* Remove trailing slashes from PATH.
-   This is useful when using filename completion from a shell that
-   adds a "/" after directory names (such as tcsh and bash), because
-   the Unix rename and rmdir system calls return an "Invalid argument" error
-   when given a path that ends in "/" (except for the root directory).  */
-
-void
-strip_trailing_slashes (char *path)
+bool
+strip_trailing_slashes (char *file)
 {
-  int last;
-
-  last = strlen (path) - 1;
-  while (last > 0 && ISSLASH (path[last]))
-    path[last--] = '\0';
+  char *base = last_component (file);
+  char *base_lim;
+  bool had_slash;
+
+  /* last_component returns "" for file system roots, but we need to turn
+     `///' into `/'.  */
+  if (! *base)
+    base = file;
+  base_lim = base + base_len (base);
+  had_slash = (*base_lim != '\0');
+  *base_lim = '\0';
+  return had_slash;
 }