projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify my *-tests modules.
[gnulib.git]
/
lib
/
concatpath.c
diff --git
a/lib/concatpath.c
b/lib/concatpath.c
index
716d2f5
..
bdab6aa
100644
(file)
--- a/
lib/concatpath.c
+++ b/
lib/concatpath.c
@@
-1,5
+1,5
@@
/* Construct a full pathname from a directory and a filename.
/* Construct a full pathname from a directory and a filename.
- Copyright (C) 2001-200
2
Free Software Foundation, Inc.
+ Copyright (C) 2001-200
4
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
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
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
,
+ Foundation, Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
,
USA. */
/* Written by Bruno Haible <haible@clisp.cons.org>. */
USA. */
/* Written by Bruno Haible <haible@clisp.cons.org>. */
@@
-53,7
+53,7
@@
concatenated_pathname (const char *directory, const char *filename,
{
size_t directory_len = strlen (directory);
int need_slash =
{
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)
&& !ISSLASH (directory[directory_len - 1]));
result = (char *) xmalloc (directory_len + need_slash
+ strlen (filename)