1 files changed, 3 insertions, 118 deletions
diff --git a/numtext-strip.c b/numtext-strip.c
index b9b453e..5ebe2ff 100644
--- a/numtext-strip.c
+++ b/numtext-strip.c
@@ -1,3 +1,5 @@
+/* See LICENSE file for copyright and license details. */
+#define LIBSIMPLY_CONFIG_MULTICALL_BINARY
 #include "common.h"
 #include <libsimple-arg.h>
 
@@ -7,123 +9,6 @@ USAGE("-l language");
 static enum libnumtext_language lang;
 
 
-static int
-run(int argc, char *argv[], ssize_t (*callback)(char *, size_t, const char *, size_t))
-{
-	char *line = NULL;
-	size_t size = 0;
-	ssize_t len;
-	int ret = 0;
-	char *outbuf = NULL;
-	size_t outbuf_size = 0;
-	size_t num_len;
-
-	if (argc) {
-		for (; *argv; argv++) {
-			num_len = strlen(*argv);
-			len = callback(outbuf, outbuf_size, *argv, num_len);
-			if (len < 0) {
-				ret = 1;
-				continue;
-			}
-			if ((size_t)len > outbuf_size) {
-				outbuf_size = (size_t)len;
-				outbuf = realloc(outbuf, outbuf_size);
-				if (!outbuf) {
-					fprintf(stderr, "%s: realloc %zu: %s\n", argv0, outbuf_size, strerror(errno));
-					exit(1);
-				}
-			}
-			len = callback(outbuf, outbuf_size, *argv, num_len);
-			if (len < 0) {
-				ret = 1;
-				continue;
-			}
-			printf("%s\n", outbuf);
-		}
-	} else {
-		for (;;) {
-			len = getline(&line, &size, stdin);
-			if (len == -1)
-				break;
-			if (len && line[len - 1] == '\n')
-				line[--len] = '\0';
-			if (!len)
-				continue;
-			num_len = (size_t)len;
-			len = callback(outbuf, outbuf_size, line, num_len);
-			if (len < 0) {
-				ret = 1;
-				continue;
-			}
-			if ((size_t)len > outbuf_size) {
-				outbuf_size = (size_t)len;
-				outbuf = realloc(outbuf, outbuf_size);
-				if (!outbuf) {
-					fprintf(stderr, "%s: realloc %zu: %s\n", argv0, outbuf_size, strerror(errno));
-					exit(1);
-				}
-			}
-			len = callback(outbuf, outbuf_size, line, num_len);
-			if (len < 0) {
-				ret = 1;
-				continue;
-			}
-			printf("%s\n", outbuf);
-		}
-		if (ferror(stdin)) {
-			fprintf(stderr, "%s: getline <stdin>: %s\n", argv0, strerror(errno));
-			ret = 1;
-		}
-		free(line);
-	}
-
-	if (fflush(stdout) || fclose(stdout)) {
-		fprintf(stderr, "%s: printf: %s\n", argv0, strerror(errno));
-		ret = 1;
-	}
-
-	free(outbuf);
-	return ret;
-}
-
-
-static int
-get_language(const char *arg, enum libnumtext_language *langp, int *have_langp)
-{
-	static const struct language {
-		enum libnumtext_language value;
-		const char *code;
-		const char *name;
-	} languages[] = {
-		{LIBNUMTEXT_SWEDISH, "sv", "swedish"}
-	};
-
-	size_t i;
-
-	if (*have_langp)
-		return 0;
-	*have_langp = 1;
-
-	if (!strcmp(arg, "?")) {
-		for (i = 0; i < sizeof(languages) / sizeof(*languages); i++) {
-			printf("Languages:\n");
-			printf("\t%s %s\n", languages[i].code, languages[i].name);
-		}
-		exit(0);
-	} else {
-		for (i = 0; i < sizeof(languages) / sizeof(*languages); i++) {
-			if (!strcasecmp(arg, languages[i].code) || !strcasecmp(arg, languages[i].name)) {
-				*langp = languages[i].value;
-				return 1;
-			}
-		}
-		fprintf(stderr, "%s: unrecognised language, use ? to list available languages: %s\n", argv0, arg);
-		exit(1);
-	}
-}
-
-
 static ssize_t
 process(char *outbuf, size_t outbuf_size, const char *num, size_t num_len)
 {
@@ -141,7 +26,7 @@ process(char *outbuf, size_t outbuf_size, const char *num, size_t num_len)
 
 
 int
-main(int argc, char *argv[])
+numtext_strip_main(int argc, char *argv[])
 {
 	int have_lang = 0;