projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced with <unistd.h>.
[gnulib.git]
/
lib
/
concatpath.c
diff --git
a/lib/concatpath.c
b/lib/concatpath.c
index
d39a1fb
..
a6d4173
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-2004, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2001-2004, 2006
, 2007
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
@@
-26,7
+26,6
@@
#include <string.h>
#include "xalloc.h"
#include <string.h>
#include "xalloc.h"
-#include "stpcpy.h"
/* Concatenate a directory pathname, a relative pathname and an optional
suffix. The directory may end with the directory separator. The second
/* Concatenate a directory pathname, a relative pathname and an optional
suffix. The directory may end with the directory separator. The second
@@
-42,9
+41,10
@@
concatenated_pathname (const char *directory, const char *filename,
if (strcmp (directory, ".") == 0)
{
/* No need to prepend the directory. */
if (strcmp (directory, ".") == 0)
{
/* No need to prepend the directory. */
- result = (char *) xmalloc (strlen (filename)
- + (suffix != NULL ? strlen (suffix) : 0)
- + 1);
+ result = XNMALLOC (strlen (filename)
+ + (suffix != NULL ? strlen (suffix) : 0)
+ + 1,
+ char);
p = result;
}
else
p = result;
}
else
@@
-53,10
+53,11
@@
concatenated_pathname (const char *directory, const char *filename,
int need_slash =
(directory_len > FILE_SYSTEM_PREFIX_LEN (directory)
&& !ISSLASH (directory[directory_len - 1]));
int need_slash =
(directory_len > FILE_SYSTEM_PREFIX_LEN (directory)
&& !ISSLASH (directory[directory_len - 1]));
- result = (char *) xmalloc (directory_len + need_slash
- + strlen (filename)
- + (suffix != NULL ? strlen (suffix) : 0)
- + 1);
+ result = XNMALLOC (directory_len + need_slash
+ + strlen (filename)
+ + (suffix != NULL ? strlen (suffix) : 0)
+ + 1,
+ char);
memcpy (result, directory, directory_len);
p = result + directory_len;
if (need_slash)
memcpy (result, directory, directory_len);
p = result + directory_len;
if (need_slash)