X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstripslash.c;h=c6b319e69f867d2ebe7363c21177dd759abccc56;hb=ecc43f7ce6220952bac7d8e751ca102c60f9f812;hp=802204f25fda30b22259f685facde794e91adcae;hpb=d87c39464604e74f580c7fae835be31a4c125c36;p=gnulib.git

diff --git a/lib/stripslash.c b/lib/stripslash.c
index 802204f25..c6b319e69 100644
--- a/lib/stripslash.c
+++ b/lib/stripslash.c
@@ -1,5 +1,5 @@
-/* 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 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
@@ -12,28 +12,28 @@
    GNU General Public License for more details.
 
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#if defined(STDC_HEADERS) || defined(USG)
-#include <string.h>
-#else
-#include <strings.h>
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif
 
+#include "dirname.h"
+
 /* Remove trailing slashes from PATH.
+   Return nonzero if a trailing slash was removed.
    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 (path)
-     char *path;
+int
+strip_trailing_slashes (char *path)
 {
-  int last;
-
-  last = strlen (path) - 1;
-  while (last > 0 && path[last] == '/')
-    path[last--] = '\0';
+  char *base = base_name (path);
+  char *base_lim = base + base_len (base);
+  int had_slash = *base_lim;
+  *base_lim = '\0';
+  return had_slash;
 }