From: Bruno Haible <bruno@clisp.org>
Date: Sun, 14 Sep 2008 12:36:39 +0000 (+0000)
Subject: Use xconcatenated_filename instead of concatenated_filename.
X-Git-Tag: v0.18~349
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdef1254b20de91424caeac241b7493f3d3fe311;p=thirdparty%2Fgettext.git

Use xconcatenated_filename instead of concatenated_filename.
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index ada81639a..15ed384b9 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+            Bruno Haible  <bruno@clisp.org>
+
+	* xgettext.c: Include concat-filename.h.
+	(main, xgettext_open): Use xconcatenated_filename instead of
+	concatenated_filename.
+
 2008-09-01  Bruno Haible  <bruno@clisp.org>
 
 	* color.c: Include concat-filename.h.
diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
index c9d4c2ae1..241d4d296 100644
--- a/gettext-tools/src/xgettext.c
+++ b/gettext-tools/src/xgettext.c
@@ -49,6 +49,7 @@
 #include "c-strstr.h"
 #include "xerror.h"
 #include "filename.h"
+#include "concat-filename.h"
 #include "c-strcase.h"
 #include "open-catalog.h"
 #include "read-catalog-abstract.h"
@@ -603,12 +604,12 @@ xgettext cannot work without keywords to look for"));
 	file_name = xstrdup (output_file);
       else
 	/* Please do NOT add a .po suffix! */
-	file_name = concatenated_filename (output_dir, output_file, NULL);
+	file_name = xconcatenated_filename (output_dir, output_file, NULL);
     }
   else if (strcmp (default_domain, "-") == 0)
     file_name = "-";
   else
-    file_name = concatenated_filename (output_dir, default_domain, ".po");
+    file_name = xconcatenated_filename (output_dir, default_domain, ".po");
 
   /* Determine list of files we have to process.  */
   if (files_from != NULL)
@@ -1811,7 +1812,7 @@ error while opening \"%s\" for reading"), fn);
 	    error (EXIT_FAILURE, ENOENT, _("\
 error while opening \"%s\" for reading"), fn);
 
-	  new_name = concatenated_filename (dir, fn, NULL);
+	  new_name = xconcatenated_filename (dir, fn, NULL);
 
 	  fp = fopen (new_name, "r");
 	  if (fp != NULL)