From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id E66B8431FDE for ; Sat, 24 Nov 2012 13:20:33 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lN7Y23ux6kKm for ; Sat, 24 Nov 2012 13:20:32 -0800 (PST) Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 8DB6C431FB6 for ; Sat, 24 Nov 2012 13:20:32 -0800 (PST) Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net ([156.34.89.108] helo=zancas.localnet) by tesseract.cs.unb.ca with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1TcN9L-0006SI-9f; Sat, 24 Nov 2012 17:20:31 -0400 Received: from bremner by zancas.localnet with local (Exim 4.80) (envelope-from ) id 1TcN9F-0008CT-R9; Sat, 24 Nov 2012 17:20:25 -0400 From: david@tethera.net To: notmuch@notmuchmail.org Subject: [Patch v2 02/17] test/hex-xcode: new test binary Date: Sat, 24 Nov 2012 17:20:02 -0400 Message-Id: <1353792017-31459-3-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1353792017-31459-1-git-send-email-david@tethera.net> References: <1353792017-31459-1-git-send-email-david@tethera.net> X-Spam_bar: - Cc: David Bremner X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Nov 2012 21:20:34 -0000 From: David Bremner 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. --- 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 + + +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