X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstripslash.c;h=9998e641ced7a0c58cf84c326068bac3cad0b498;hb=10cf9b5e371bc4927b2b28354c19b62943dfe95e;hp=73be737321fc326242a7730b928dd987612c8305;hpb=02e94d668e9c5ad0144df22dbb20d72bdcb67373;p=gnulib.git diff --git a/lib/stripslash.c b/lib/stripslash.c index 73be73732..9998e641c 100644 --- a/lib/stripslash.c +++ b/lib/stripslash.c @@ -1,5 +1,5 @@ /* stripslash.c -- remove redundant trailing slashes from a file name - Copyright (C) 1990, 2001 Free Software Foundation, Inc. + 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,27 +19,21 @@ # include #endif -#if STDC_HEADERS || HAVE_STRING_H -# include -#else -# include -#endif - #include "dirname.h" /* Remove trailing slashes from PATH. - Return nonzero if a trailing slash was removed. + 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). */ -int +bool strip_trailing_slashes (char *path) { char *base = base_name (path); char *base_lim = base + base_len (base); - int had_slash = *base_lim; + bool had_slash = (*base_lim != '\0'); *base_lim = '\0'; return had_slash; }