X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fconcatpath.c;h=bdab6aa190eac349fdb7b52b4b8cf9aa3a3962a6;hb=efc1f57b9d5d6d528919cedfe2e4c41e786341d2;hp=716d2f5d461d67b45a50527dda98084f1a8f2c02;hpb=ac52880a4604e1b2cd72ae710870e3d463a12d84;p=gnulib.git diff --git a/lib/concatpath.c b/lib/concatpath.c index 716d2f5d4..bdab6aa19 100644 --- a/lib/concatpath.c +++ b/lib/concatpath.c @@ -1,5 +1,5 @@ /* Construct a full pathname from a directory and a filename. - Copyright (C) 2001-2002 Free Software Foundation, Inc. + Copyright (C) 2001-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 the @@ -13,7 +13,7 @@ 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, + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* Written by Bruno Haible . */ @@ -53,7 +53,7 @@ concatenated_pathname (const char *directory, const char *filename, { size_t directory_len = strlen (directory); int need_slash = - (directory_len > FILESYSTEM_PREFIX_LEN (directory) + (directory_len > FILE_SYSTEM_PREFIX_LEN (directory) && !ISSLASH (directory[directory_len - 1])); result = (char *) xmalloc (directory_len + need_slash + strlen (filename)