summaryrefslogtreecommitdiffstats
path: root/gettext-tools/src/msgconv.c
diff options
context:
space:
mode:
Diffstat (limited to 'gettext-tools/src/msgconv.c')
-rw-r--r--gettext-tools/src/msgconv.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/gettext-tools/src/msgconv.c b/gettext-tools/src/msgconv.c
index 24cb9cb..2b7e0b7 100644
--- a/gettext-tools/src/msgconv.c
+++ b/gettext-tools/src/msgconv.c
@@ -36,6 +36,9 @@
#include "basename.h"
#include "message.h"
#include "read-catalog.h"
+#include "read-po.h"
+#include "read-properties.h"
+#include "read-stringtable.h"
#include "write-catalog.h"
#include "write-po.h"
#include "write-properties.h"
@@ -99,6 +102,7 @@ main (int argc, char **argv)
char *output_file;
const char *input_file;
msgdomain_list_ty *result;
+ catalog_input_format_ty input_syntax = &input_format_po;
catalog_output_format_ty output_syntax = &output_format_po;
bool sort_by_filepos = false;
bool sort_by_msgid = false;
@@ -167,7 +171,7 @@ main (int argc, char **argv)
break;
case 'P':
- input_syntax = syntax_properties;
+ input_syntax = &input_format_properties;
break;
case 's':
@@ -201,7 +205,7 @@ main (int argc, char **argv)
break;
case CHAR_MAX + 2: /* --stringtable-input */
- input_syntax = syntax_stringtable;
+ input_syntax = &input_format_stringtable;
break;
case CHAR_MAX + 3: /* --stringtable-output */
@@ -256,7 +260,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
to_code = locale_charset ();
/* Read input file. */
- result = read_catalog_file (input_file);
+ result = read_catalog_file (input_file, input_syntax);
/* Convert if and only if the output syntax supports different encodings. */
if (!output_syntax->requires_utf8)