X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fconcat-filename.h;h=e6c958d126402227d8630a6674b80b26fce8e42c;hb=3c65a6806b208533f681855712e0febf4bb0ed67;hp=d7dafb0ec220c752849ea803fff38691aaad0a38;hpb=be6c2737cca8fa0f8e41e836e0cb843bc9138035;p=gnulib.git

diff --git a/lib/concat-filename.h b/lib/concat-filename.h
index d7dafb0ec..e6c958d12 100644
--- a/lib/concat-filename.h
+++ b/lib/concat-filename.h
@@ -1,5 +1,5 @@
 /* Construct a full filename from a directory and a relative filename.
-   Copyright (C) 2001-2004, 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2007-2010 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
@@ -23,9 +23,15 @@ extern "C" {
 
 
 /* Concatenate a directory filename, a relative filename and an optional
-   suffix.  Return a freshly allocated filename.  */
+   suffix.  Return a freshly allocated filename.  Return NULL and set errno
+   upon memory allocation failure.  */
 extern char *concatenated_filename (const char *directory,
-				    const char *filename, const char *suffix);
+                                    const char *filename, const char *suffix);
+
+/* Concatenate a directory filename, a relative filename and an optional
+   suffix.  Return a freshly allocated filename.  */
+extern char *xconcatenated_filename (const char *directory,
+                                     const char *filename, const char *suffix);
 
 
 #ifdef __cplusplus