X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstripslash.c;h=9b55da48ede3d7db1050ada210870bb17a96c51d;hb=5fa5d3d767b29cf1d757609afbb56459b09743fa;hp=f55c769128ad1a45775ee74b2e61964323e3c756;hpb=38b8fad546a66fb6e851b0bf8ab22bc22b9be35a;p=gnulib.git

diff --git a/lib/stripslash.c b/lib/stripslash.c
index f55c76912..9b55da48e 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, 2004, 2005 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,27 @@
 
    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 PATH.
-   This is useful when using filename completion from a shell that
+/* 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
    the Unix rename and rmdir system calls return an "Invalid argument" error
-   when given a path that ends in "/" (except for the root directory).  */
+   when given a file 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 (0 < last && ISSLASH (path[last]))
-    path[last--] = '\0';
+  char *base = base_name (file);
+  char *base_lim = base + base_len (base);
+  bool had_slash = (*base_lim != '\0');
+  *base_lim = '\0';
+  return had_slash;
 }