X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstripslash.c;h=9998e641ced7a0c58cf84c326068bac3cad0b498;hb=8c275683036775b0f42833f4e895343d0f3e85fe;hp=81d1b7a051886e52f5d7807db6303f4424aceeb1;hpb=d349992d82f97d614404565ff66e3f8a47b4a568;p=gnulib.git

diff --git a/lib/stripslash.c b/lib/stripslash.c
index 81d1b7a05..9998e641c 100644
--- a/lib/stripslash.c
+++ b/lib/stripslash.c
@@ -1,5 +1,5 @@
-/* stripslash.c -- remove trailing slashes from a string
-   Copyright (C) 1990, 2000 Free Software Foundation, Inc.
+/* stripslash.c -- remove redundant trailing slashes from a file name
+   Copyright (C) 1990, 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
@@ -19,24 +19,21 @@
 # include <config.h>
 #endif
 
-#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include "dirname.h"
 
 /* Remove trailing slashes from PATH.
+   Return true 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
+bool
 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);
+  bool had_slash = (*base_lim != '\0');
+  *base_lim = '\0';
+  return had_slash;
 }