strtoumax: fix typo in previous commit.

[gnulib.git] / lib / concat-filename.c

diff --git a/lib/concat-filename.c b/lib/concat-filename.c
index a6d4173..68168dc 100644 (file)
--- a/lib/concat-filename.c
+++ b/lib/concat-filename.c
@@ -1,9 +1,9 @@
-/* Construct a full pathname from a directory and a filename.
-   Copyright (C) 2001-2004, 2006, 2007 Free Software Foundation, Inc.
+/* Construct a full filename from a directory and a relative filename.
+   Copyright (C) 2001-2004, 2006-2013 Free Software Foundation, Inc.

 
 

-   This program is free software; you can redistribute it and/or modify it
+   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
    under the terms of the GNU General Public License as published by the

-   Free Software Foundation; either version 2, or (at your option) any
+   Free Software Foundation; either version 3 of the License, or any

    later version.
 
    This program is distributed in the hope that it will be useful,
    later version.
 
    This program is distributed in the hope that it will be useful,


@@ -12,28 +12,29 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 /* Written by Bruno Haible <haible@clisp.cons.org>.  */
 
 #include <config.h>
 
 /* Specification.  */
 
 /* Written by Bruno Haible <haible@clisp.cons.org>.  */
 
 #include <config.h>
 
 /* Specification.  */

-#include "pathname.h"
+#include "concat-filename.h"

 
 

+#include <errno.h>
+#include <stdlib.h>

 #include <string.h>
 
 #include <string.h>
 

-#include "xalloc.h"
+#include "filename.h"

 
 

-/* Concatenate a directory pathname, a relative pathname and an optional
+/* Concatenate a directory filename, a relative filename and an optional

    suffix.  The directory may end with the directory separator.  The second
    argument may not start with the directory separator (it is relative).
    suffix.  The directory may end with the directory separator.  The second
    argument may not start with the directory separator (it is relative).

-   Return a freshly allocated pathname.  */
+   Return a freshly allocated filename.  Return NULL and set errno
+   upon memory allocation failure.  */

 char *
 char *

-concatenated_pathname (const char *directory, const char *filename,
-                      const char *suffix)
+concatenated_filename (const char *directory, const char *filename,
+                       const char *suffix)

 {
   char *result;
   char *p;
 {
   char *result;
   char *p;


@@ -41,27 +42,29 @@ 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 = XNMALLOC (strlen (filename)
-                        + (suffix != NULL ? strlen (suffix) : 0)
-                        + 1,
-                        char);
+      result = (char *) malloc (strlen (filename)
+                                + (suffix != NULL ? strlen (suffix) : 0)
+                                + 1);
+      if (result == NULL)
+        return NULL; /* errno is set here */

       p = result;
     }
   else
     {
       size_t directory_len = strlen (directory);
       int need_slash =
       p = result;
     }
   else
     {
       size_t directory_len = strlen (directory);
       int need_slash =

-       (directory_len > FILE_SYSTEM_PREFIX_LEN (directory)
-        && !ISSLASH (directory[directory_len - 1]));
-      result = XNMALLOC (directory_len + need_slash
-                        + strlen (filename)
-                        + (suffix != NULL ? strlen (suffix) : 0)
-                        + 1,
-                        char);
+        (directory_len > FILE_SYSTEM_PREFIX_LEN (directory)
+         && !ISSLASH (directory[directory_len - 1]));
+      result = (char *) malloc (directory_len + need_slash
+                                + strlen (filename)
+                                + (suffix != NULL ? strlen (suffix) : 0)
+                                + 1);
+      if (result == NULL)
+        return NULL; /* errno is set here */

       memcpy (result, directory, directory_len);
       p = result + directory_len;
       if (need_slash)
       memcpy (result, directory, directory_len);
       p = result + directory_len;
       if (need_slash)

-       *p++ = '/';
+        *p++ = '/';

     }
   p = stpcpy (p, filename);
   if (suffix != NULL)
     }
   p = stpcpy (p, filename);
   if (suffix != NULL)