[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
New function: mfile_name_concat.
From: |
Jim Meyering |
Subject: |
New function: mfile_name_concat. |
Date: |
Wed, 08 Aug 2007 08:43:39 +0200 |
I wanted the functionality of file_name_concat, but without
the exit-on-failure bits. Here's the result:
New function: mfile_name_concat.
* lib/filenamecat.c (mfile_name_concat): New function, just like
file_name_concat, but return NULL upon failure rather than exiting
with a diagnostic.
* lib/filenamecat.h: Declare it.
diff --git a/lib/filenamecat.c b/lib/filenamecat.c
index bccffb2..beac5c1 100644
--- a/lib/filenamecat.c
+++ b/lib/filenamecat.c
@@ -1,7 +1,6 @@
/* Concatenate two arbitrary file names.
- Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 1996-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
@@ -24,6 +23,7 @@
/* Specification. */
#include "filenamecat.h"
+#include <stdlib.h>
#include <string.h>
#include "dirname.h"
@@ -57,10 +57,10 @@ longest_relative_suffix (char const *f)
set *BASE_IN_RESULT to point to the sole corresponding slash that
is copied into the result buffer.
- Report an error if memory is exhausted. */
+ Return NULL if malloc fails. */
char *
-file_name_concat (char const *dir, char const *abase, char **base_in_result)
+mfile_name_concat (char const *dir, char const *abase, char **base_in_result)
{
char const *dirbase = last_component (dir);
size_t dirbaselen = base_len (dirbase);
@@ -70,9 +70,12 @@ file_name_concat (char const *dir, char const *abase, char
**base_in_result)
char const *base = longest_relative_suffix (abase);
size_t baselen = strlen (base);
- char *p_concat = xmalloc (dirlen + needs_separator + baselen + 1);
+ char *p_concat = malloc (dirlen + needs_separator + baselen + 1);
char *p;
+ if (p_concat == NULL)
+ return NULL;
+
p = mempcpy (p_concat, dir, dirlen);
*p = DIRECTORY_SEPARATOR;
p += needs_separator;
@@ -86,6 +89,19 @@ file_name_concat (char const *dir, char const *abase, char
**base_in_result)
return p_concat;
}
+/* Just like mfile_name_concat, above, except, rather than
+ returning NULL upon malloc failure, here, we report the
+ "memory exhausted" condition and exit. */
+
+char *
+file_name_concat (char const *dir, char const *abase, char **base_in_result)
+{
+ char *p = mfile_name_concat (dir, abase, base_in_result);
+ if (p == NULL)
+ xalloc_die ();
+ return p;
+}
+
#ifdef TEST_FILE_NAME_CONCAT
# include <stdlib.h>
# include <stdio.h>
diff --git a/lib/filenamecat.h b/lib/filenamecat.h
index c943b67..28f8c3f 100644
--- a/lib/filenamecat.h
+++ b/lib/filenamecat.h
@@ -1,6 +1,6 @@
/* Concatenate two arbitrary file names.
- Copyright (C) 1996, 1997, 2003, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 2003, 2005, 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
@@ -20,3 +20,6 @@
char *file_name_concat (char const *dir, char const *base,
char **base_in_result);
+
+char *mfile_name_concat (char const *dir, char const *base,
+ char **base_in_result);
- New function: mfile_name_concat.,
Jim Meyering <=