/* Construct a full pathname from a directory and a filename.
- Copyright (C) 2001-2004 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
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 <haible@clisp.cons.org>. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "pathname.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
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
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)