On Sat, 24 Nov 2012, david@tethera.net wrote: > From: David Bremner <bremner@debian.org> > > This program is used both as a test-bed/unit-tester for > ../util/hex-escape.c, and also as a utility in future tests of dump > and restore. Should this have a mode for hex_decode_inplace()? It's silly from the tool perspective, but not from test coverage perspective. There'd be plenty to nitpick here, but it's only a test tool... so please just remove the extra/double newlines that seem to irritate me most. ;) Otherwise, looks good. BR, Jani. > --- > test/.gitignore | 1 + > test/Makefile.local | 13 ++++++- > test/basic | 1 + > test/hex-xcode.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 116 insertions(+), 2 deletions(-) > create mode 100644 test/hex-xcode.c > > diff --git a/test/.gitignore b/test/.gitignore > index e63c689..be7ab5e 100644 > --- a/test/.gitignore > +++ b/test/.gitignore > @@ -3,4 +3,5 @@ corpus.mail > smtp-dummy > symbol-test > arg-test > +hex-xcode > tmp.* > diff --git a/test/Makefile.local b/test/Makefile.local > index 9ae130a..8da4c56 100644 > --- a/test/Makefile.local > +++ b/test/Makefile.local > @@ -13,6 +13,9 @@ smtp_dummy_modules = $(smtp_dummy_srcs:.c=.o) > $(dir)/arg-test: $(dir)/arg-test.o command-line-arguments.o util/libutil.a > $(call quiet,CC) -I. $^ -o $@ > > +$(dir)/hex-xcode: $(dir)/hex-xcode.o command-line-arguments.o util/libutil.a > + $(call quiet,CC) -I. $^ -o $@ -ltalloc > + > $(dir)/smtp-dummy: $(smtp_dummy_modules) > $(call quiet,CC) $^ -o $@ > > @@ -24,8 +27,13 @@ $(dir)/parse-time: $(dir)/parse-time.o parse-time-string/parse-time-string.o > > .PHONY: test check > > -test-binaries: $(dir)/arg-test $(dir)/smtp-dummy $(dir)/symbol-test \ > - $(dir)/parse-time > +TEST_BINARIES=$(dir)/arg-test \ > + $(dir)/hex-xcode \ > + $(dir)/parse-time \ > + $(dir)/smtp-dummy \ > + $(dir)/symbol-test > + > +test-binaries: $(TEST_BINARIES) > > test: all test-binaries > @${dir}/notmuch-test $(OPTIONS) > @@ -36,5 +44,6 @@ SRCS := $(SRCS) $(smtp_dummy_srcs) > CLEAN := $(CLEAN) $(dir)/smtp-dummy $(dir)/smtp-dummy.o \ > $(dir)/symbol-test $(dir)/symbol-test.o \ > $(dir)/arg-test $(dir)/arg-test.o \ > + $(dir)/hex-xcode $(dir)/hex-xcode.o \ > $(dir)/parse-time $(dir)/parse-time.o \ > $(dir)/corpus.mail $(dir)/test-results $(dir)/tmp.* > diff --git a/test/basic b/test/basic > index 1b842d2..2a571ac 100755 > --- a/test/basic > +++ b/test/basic > @@ -56,6 +56,7 @@ tests_in_suite=$(for i in $TESTS; do echo $i; done | sort) > available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -perm +111 \ > ! -name aggregate-results.sh \ > ! -name arg-test \ > + ! -name hex-xcode \ > ! -name notmuch-test \ > ! -name parse-time \ > ! -name smtp-dummy \ > diff --git a/test/hex-xcode.c b/test/hex-xcode.c > new file mode 100644 > index 0000000..eec6541 > --- /dev/null > +++ b/test/hex-xcode.c > @@ -0,0 +1,103 @@ > +/* No, nothing to to with IDE from Apple Inc. > + testbed for ../util/hex-escape.c. > + > + usage: > + hex-xcode [--direction=(encode|decode)] [--omit-newline] < file > + hex-xcode [--direction=(encode|decode)] [--omit-newline] arg1 arg2 arg3 ... > + > + */ > + > +#include "notmuch-client.h" > +#include "hex-escape.h" > +#include <assert.h> > + > + > +enum direction { > + ENCODE, > + DECODE > +}; > + > +static int > +xcode (void *ctx, enum direction dir, char *in, char **buf_p, size_t *size_p) > +{ > + hex_status_t status; > + > + if (dir == ENCODE) > + status = hex_encode (ctx, in, buf_p, size_p); > + else > + status = hex_decode (ctx, in, buf_p, size_p); > + > + if (status == HEX_SUCCESS) > + fputs (*buf_p, stdout); > + > + return status; > +} > + > + > +int > +main (int argc, char **argv) > +{ > + > + > + enum direction dir = DECODE; > + int omit_newline = FALSE; > + > + notmuch_opt_desc_t options[] = { > + { NOTMUCH_OPT_KEYWORD, &dir, "direction", 'd', > + (notmuch_keyword_t []){ { "encode", ENCODE }, > + { "decode", DECODE }, > + { 0, 0 } } }, > + { NOTMUCH_OPT_BOOLEAN, &omit_newline, "omit-newline", 'n', 0 }, > + { 0, 0, 0, 0, 0 } > + }; > + > + int opt_index = parse_arguments (argc, argv, options, 1); > + > + if (opt_index < 0) > + exit (1); > + > + void *ctx = talloc_new (NULL); > + > + char *line = NULL; > + size_t line_size; > + ssize_t line_len; > + > + char *buffer = NULL; > + size_t buf_size = 0; > + > + notmuch_bool_t read_stdin = TRUE; > + > + for (; opt_index < argc; opt_index++) { > + > + if (xcode (ctx, dir, argv[opt_index], > + &buffer, &buf_size) != HEX_SUCCESS) > + return 1; > + > + if (!omit_newline) > + putchar ('\n'); > + > + read_stdin = FALSE; > + } > + > + if (!read_stdin) > + return 0; > + > + while ((line_len = getline (&line, &line_size, stdin)) != -1) { > + > + chomp_newline (line); > + > + if (xcode (ctx, dir, line, &buffer, &buf_size) != HEX_SUCCESS) > + return 1; > + > + if (!omit_newline) > + putchar ('\n'); > + > + } > + > + if (line) > + free (line); > + > + talloc_free (ctx); > + > + return 0; > +} > -- > 1.7.10.4 > > _______________________________________________ > notmuch mailing list > notmuch@notmuchmail.org > http://notmuchmail.org/mailman/listinfo/notmuch