added msgmerge

2 files changed, 264 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 7c1f1e5..ea916d2 100644
--- a/Makefile
+++ b/Makefile
@@ -9,13 +9,14 @@ PROGSRC = $(sort $(wildcard src/*.c))
 
 PROGOBJS = $(PROGSRC:.c=.o)
 LIBOBJS = $(LIBSRC:.c=.o)
+OBJS = $(PROGOBJS) $(LIBOBJS)
 
 
 HEADERS = libintl.h
 ALL_INCLUDES = $(HEADERS)
 
 ALL_LIBS=libintl.a
-ALL_TOOLS=msgfmt
+ALL_TOOLS=msgfmt msgmerge
 
 CFLAGS=-O0 -fPIC
 
@@ -44,9 +45,15 @@ libintl.a: $(LIBOBJS)
 	$(AR) rc $@ $(LIBOBJS)
 	$(RANLIB) $@
 
-$(ALL_TOOLS): $(PROGOBJS)
-	$(CC) $(LDFLAGS) -static -o $@ $< src/poparser.o
-	
+src/poparser.o:
+	$(CC) $(BUILDCFLAGS) -c -o $@ src/poparser.c
+
+msgmerge: $(OBJS)
+	$(CC) $(LDFLAGS) -static -o $@ src/msgmerge.o src/poparser.o
+
+msgfmt: $(OBJS)
+	$(CC) $(LDFLAGS) -static -o $@ src/msgfmt.o src/poparser.o
+
 
 $(DESTDIR)$(libdir)/%.a: %.a
 	install -D -m 755 $< $@
diff --git a/src/msgmerge.c b/src/msgmerge.c
new file mode 100644
index 0000000..46322a9
--- /dev/null
+++ b/src/msgmerge.c
@@ -0,0 +1,253 @@
+/* msgfmt utility (C) 2012 rofl0r
+ * released under the MIT license, see LICENSE for details */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <assert.h>
+#include "poparser.h"
+
+__attribute__((noreturn))
+void syntax(void) {
+	fprintf(stdout,
+	"Usage: msgmerge [OPTION] def.po ref.pot\n");
+	exit(1);
+}
+
+#define streq(A, B) (!strcmp(A, B))
+#define strstarts(S, W) (memcmp(S, W, sizeof(W) - 1) ? NULL : (S + (sizeof(W) - 1)))
+
+struct fiLes {
+	FILE *out;
+	/* we can haz 3 different input files: 
+	* the .pot, which is the file containing only the ripped out strings from the program
+	* (and no translations)
+	* a .po, which is contains translations and strings made from a previous .pot from that same source file,
+	* a compendium, which is basically a huge po file containing all sorts of strings (msgid's) and translations (msgstr's)
+	*/
+	FILE *po;
+	FILE *pot;
+	FILE *compend;
+};
+
+size_t convert_buf(char* in, char* out) {
+	size_t l = 0;
+	while(*in) {
+		switch(*in) {
+			case '\n':
+				*out++ = '\\';
+				l++;
+				*out = 'n';
+				break;
+			case '\r':
+				*out++ = '\\';
+				l++;
+				*out = 'r';
+				break;
+			case '\t':
+				*out++ = '\\';
+				l++;
+				*out = 't';
+				break;
+			case '\\':
+				*out++ = '\\';
+				l++;
+				*out = '\\';
+				break;
+			case '"':
+				*out++ = '\\';
+				l++;
+				*out = '"';
+				break;
+			default:
+				*out = *in;
+		}
+		in++;
+		out++;
+		l++;
+	}
+	*out = 0;
+	return l;
+}
+
+/* currently we only output input strings as output strings 
+ * i.e. there is no translation lookup at all */
+int process_line_callback(struct po_info* info, void* user) {
+	char convbuf[8192];
+	FILE* out = (FILE*) user;
+	size_t l;
+	if(info->type == pe_msgid) {
+		l = convert_buf(info->text, convbuf);
+		fprintf(out, "msgid \"%s\"\nmsgstr \"%s\"\n", convbuf, convbuf);
+	}
+	return 0;
+}
+
+int process(struct fiLes *files, int update, int backup) {
+	(void) update; (void) backup;
+	struct po_parser pb, *p = &pb;
+	char line[4096], conv[4096], *lb;
+	poparser_init(p, conv, sizeof(conv), process_line_callback, files->out);
+	while((lb = fgets(line, sizeof(line), files->pot))) {
+		poparser_feed_line(p, lb, sizeof(line) - (size_t)(lb - line));
+	}
+	poparser_finish(p);
+	return 0;
+}
+
+void set_file(int out, char* fn, FILE** dest) {
+	if(streq(fn, "-")) {
+		*dest = out ? stdout : stdin;
+	} else {
+		*dest = fopen(fn, out ? "w" : "r");
+	}
+	if(!*dest) {
+		perror("fopen");
+		exit(1);
+	}
+}
+
+int getbackuptype(char* str) {
+	if(!str || !*str || streq(str, "none") || streq(str, "off"))
+		return 0;
+	else if(streq(str, "t") || streq(str, "numbered"))
+		return 1;
+	else if(streq(str, "nil") || streq(str, "existing"))
+		return 2;
+	else if(streq(str, "simple") || streq(str, "never"))
+		return 3;
+	else syntax();
+}
+
+int main(int argc, char**argv) {
+	if(argc == 1) syntax();
+	int arg = 1;
+	struct expect {
+		int out;
+		int po;
+		int pot;
+		int compend;
+	} expect_fn = {
+		.out = 0,
+		.po = 1,
+		.pot = 0,
+		.compend = 0,
+	};
+	struct fiLes files = {0,0,0,0};
+	char* backup_suffix = getenv("SIMPLE_BACKUP_SUFFIX");
+	if(!backup_suffix) backup_suffix = "~";
+	int update = 0;
+	int backup = getbackuptype(getenv("VERSION_CONTROL"));
+	char* dest;
+	set_file(1, "-", &files.out);
+#define A argv[arg]
+	for(; arg < argc; arg++) {
+		if(A[0] == '-') {
+			if(A[1] == '-') {
+				if(
+					streq(A+2, "strict") ||
+					streq(A+2, "properties-input") ||
+					streq(A+2, "properties-output") ||
+					streq(A+2, "stringtable-input") ||
+					streq(A+2, "stringtable-output") ||
+					streq(A+2, "no-fuzzy-matching") ||
+					streq(A+2, "multi-domain") ||
+					streq(A+2, "previous") ||
+					streq(A+2, "escape") ||
+					streq(A+2, "no-escape") ||
+					streq(A+2, "force-po") ||
+					streq(A+2, "indent") ||
+					streq(A+2, "add-location") ||
+					streq(A+2, "no-location") ||
+					streq(A+2, "no-wrap") ||
+					streq(A+2, "sort-output") ||
+					streq(A+2, "sort-by-file") ||
+					
+					strstarts(A+2, "lang=") ||
+					strstarts(A+2, "color") || // can be --color or --color=xxx
+					strstarts(A+2, "style=") ||
+					strstarts(A+2, "width=") ||
+					
+					streq(A+2, "verbose") ||
+					streq(A+2, "quiet") ||
+					streq(A+2, "silent") ||
+					streq(A+2, "version")
+					
+				) {
+				} else if((dest = strstarts(A+2, "output-file="))) {
+					set_file(1, dest, &files.out);
+				} else if((dest = strstarts(A+2, "compendium="))) {
+					set_file(1, dest, &files.compend);
+				} else if((dest = strstarts(A+2, "suffix="))) {
+					backup_suffix = dest;
+				} else if((dest = strstarts(A+2, "directory="))) {
+					goto nodir;
+				} else if((dest = strstarts(A+2, "backup"))) {
+					if (*dest == '=')
+						backup = getbackuptype(dest + 1);
+					else 
+						backup = 0;
+				} else if(streq(A+2, "update")) {
+					set_update:
+					update = 1;
+					abort();
+				} else if(streq(A+2, "help")) syntax();
+				
+			} else if(streq(A + 1, "o")) {
+				expect_fn.out = 1;
+			} else if(streq(A + 1, "C")) {
+				expect_fn.compend = 1;
+			} else if(streq(A + 1, "U")) {
+				goto set_update;
+			} else if(
+				streq(A+1, "m") ||
+				streq(A+1, "N") ||
+				streq(A+1, "P") ||
+				streq(A+1, "e") ||
+				streq(A+1, "E") ||
+				streq(A+1, "i") ||
+				streq(A+1, "p") ||
+				streq(A+1, "w") ||
+				streq(A+1, "s") ||
+				streq(A+1, "F") ||
+				streq(A+1, "V") ||
+				streq(A+1, "q") ||
+				streq(A+1, "v")
+			) {
+			} else if (streq(A+1, "D")) {
+				// no support for -D at this time
+				nodir:
+				fprintf(stderr, "EINVAL\n");
+				exit(1);
+			} else if (streq(A+1, "h")) syntax();
+		} else if(expect_fn.out) {
+			set_file(1, A, &files.out);
+			expect_fn.out = 0;
+		} else if(expect_fn.compend) {
+			set_file(1, A, &files.compend);
+			expect_fn.compend = 0;
+		} else if(expect_fn.po) {
+			set_file(0, A, &files.po);
+			expect_fn.po = 0;
+			expect_fn.pot = 1;
+		} else if(expect_fn.pot) {
+			set_file(0, A, &files.pot);
+			expect_fn.pot = 0;
+		}
+	}
+	if(!files.out || !files.po || !files.pot) syntax();
+	int ret = process(&files, update, backup);
+	FILE** filearr = (FILE**) &files;
+	unsigned i;
+	for (i = 0; i < 4; i++) {
+		if(filearr[i] != NULL) fflush(filearr[i]);
+	}
+	for (i = 0; i < 4; i++) {
+		if(
+			filearr[i] != NULL && 
+			filearr[i] != stdout && 
+			filearr[i] != stdin
+		) fclose(filearr[i]);
+	}
+	return ret;
+}