New module 'xconcat-filename', split off from module 'concat-filename'.

1 files changed, 15 insertions, 11 deletions

diff --git a/lib/concat-filename.c b/lib/concat-filename.c
index 94532d0741..a1d22fa541 100644
--- a/lib/concat-filename.c
+++ b/lib/concat-filename.c
@@ -21,15 +21,17 @@
 /* Specification.  */
 #include "concat-filename.h"
 
+#include <errno.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "filename.h"
-#include "xalloc.h"
 
 /* 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).
-   Return a freshly allocated filename.  */
+   Return a freshly allocated filename.  Return NULL and set errno
+   upon memory allocation failure.  */
 char *
 concatenated_filename (const char *directory, const char *filename,
 		       const char *suffix)
@@ -40,10 +42,11 @@ concatenated_filename (const char *directory, const char *filename,
   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
@@ -52,11 +55,12 @@ concatenated_filename (const char *directory, const char *filename,
       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);
+      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)