hex2bytes is now the -x switch for mnencode

mnencode.c

@@ -1,22 +1,69 @@
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
+#include <errno.h>
 #include "mnemonic.h"
 
-int main(void) {
-	mn_byte buf[0x10000];
+int hex2bytes(const char *in, mn_byte *out) {
+	int inlen = strlen(in);
+	char t[3];
+	int i, j = 0, k = 0;
+	if(inlen % 2 != 0) {
+		t[j++] = '0';
+	}
+	for(i = 0; i < inlen; i++) {
+		if(isxdigit(in[i])) {
+			t[j++] = in[i];
+			if(j == 2) {
+				t[2] = '\0';
+				errno = 0;
+				out[k++] = strtol(t, NULL, 16);
+				if(errno != 0) {
+					return -1;
+				}
+				j = 0;
+			}
+		}
+	}
+	return k;
+}
+
+int main(int argc, char **argv) {
+	mn_byte *buf;
+	mn_byte cbuf[0x10000];
+	mn_byte xbuf[0x8000];
 	char outbuf[0x90000];
 	int buflen;
 	int n;
+	int hex_encoded_input = 0;
+
+	if(argc > 1 && strcmp(argv[1],"-x") == 0) {
+		hex_encoded_input = 1;
+	}
 
 	fprintf (stderr, "%s\n", mn_wordlist_version);
 
-	buflen = fread (buf, 1, sizeof (buf), stdin);
-	n = mn_encode (buf, buflen, outbuf, sizeof outbuf, "x x x. x x x. x x x\n");
-	if (n == 0)
-		fwrite (outbuf, 1, strlen (outbuf), stdout);
-	else
-		fprintf (stderr, "mn_encode error %d\n", n);
-	putchar ('\n');
+	buflen = fread(cbuf, 1, sizeof cbuf, stdin);
+
+	if(hex_encoded_input) {
+		buflen = hex2bytes(cbuf, xbuf);
+		if(buflen < 0) {
+			perror("hex2bytes");
+			return EXIT_FAILURE;
+		}
+		buf = xbuf;
+	} else {
+		buf = cbuf;
+	}
+
+	n = mn_encode(buf, buflen, outbuf, sizeof outbuf, "x x x. x x x. x x x\n");
+
+	if(n == 0) {
+		fwrite(outbuf, 1, strlen (outbuf), stdout);
+	} else {
+		fprintf(stderr, "mn_encode error %d\n", n);
+	}
+	putchar('\n');
 
-	return 0;
+	return EXIT_SUCCESS;
 }