X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fstripslash.c;h=9b55da48ede3d7db1050ada210870bb17a96c51d;hb=5fa5d3d767b29cf1d757609afbb56459b09743fa;hp=c6b319e69f867d2ebe7363c21177dd759abccc56;hpb=7f5a14a4366b8696b9f58cc78d8b3a02912ffc6d;p=gnulib.git diff --git a/lib/stripslash.c b/lib/stripslash.c index c6b319e69..9b55da48e 100644 --- a/lib/stripslash.c +++ b/lib/stripslash.c @@ -1,5 +1,6 @@ /* stripslash.c -- remove redundant trailing slashes from a file name - Copyright (C) 1990, 2001, 2003 Free Software Foundation, Inc. + + 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,27 +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 #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 +/* 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). */ -int -strip_trailing_slashes (char *path) +bool +strip_trailing_slashes (char *file) { - char *base = base_name (path); + char *base = base_name (file); char *base_lim = base + base_len (base); - int had_slash = *base_lim; + bool had_slash = (*base_lim != '\0'); *base_lim = '\0'; return had_slash; }