Use xconcatenated_filename instead of concatenated_filename.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index ada81639aaa9843eefe584e7820ee39caeb1c5da..15ed384b9b98b6bf6ce84a9a63652d0aaf332c43 100644 (file)
--- 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 c9d4c2ae163b131ee259fd37ed6cd769f1312c9d..241d4d2963e6b8b2d304b3378fc96669480d3f53 100644 (file)
--- 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)