--- /dev/null
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 9176E431FBF\r
+ for <notmuch@notmuchmail.org>; Sun, 2 Dec 2012 05:34:04 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+ autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 0rXGhEqA8F58 for <notmuch@notmuchmail.org>;\r
+ Sun, 2 Dec 2012 05:34:00 -0800 (PST)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+ (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 9E35E431FCB\r
+ for <notmuch@notmuchmail.org>; Sun, 2 Dec 2012 05:33:50 -0800 (PST)\r
+Received: from fctnnbsc30w-142167090129.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+ ([142.167.90.129] helo=zancas.localnet)\r
+ by tesseract.cs.unb.ca with esmtpsa\r
+ (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1Tf9g0-0005w1-GM; Sun, 02 Dec 2012 09:33:50 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1Tf9fv-0001rO-0v; Sun, 02 Dec 2012 09:33:39 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [patch v3 2/6] test/hex-xcode: new test binary\r
+Date: Sun, 2 Dec 2012 09:33:20 -0400\r
+Message-Id: <1354455204-6908-3-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1354455204-6908-1-git-send-email-david@tethera.net>\r
+References: <1354455204-6908-1-git-send-email-david@tethera.net>\r
+X-Spam_bar: -\r
+Cc: David Bremner <bremner@debian.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 02 Dec 2012 13:34:05 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+This program is used both as a test-bed/unit-tester for\r
+../util/hex-escape.c, and also as a utility in future tests of dump\r
+and restore.\r
+---\r
+ test/.gitignore | 1 +\r
+ test/Makefile.local | 13 +++++-\r
+ test/basic | 1 +\r
+ test/hex-xcode.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++\r
+ 4 files changed, 122 insertions(+), 2 deletions(-)\r
+ create mode 100644 test/hex-xcode.c\r
+\r
+diff --git a/test/.gitignore b/test/.gitignore\r
+index e63c689..be7ab5e 100644\r
+--- a/test/.gitignore\r
++++ b/test/.gitignore\r
+@@ -3,4 +3,5 @@ corpus.mail\r
+ smtp-dummy\r
+ symbol-test\r
+ arg-test\r
++hex-xcode\r
+ tmp.*\r
+diff --git a/test/Makefile.local b/test/Makefile.local\r
+index 9ae130a..8da4c56 100644\r
+--- a/test/Makefile.local\r
++++ b/test/Makefile.local\r
+@@ -13,6 +13,9 @@ smtp_dummy_modules = $(smtp_dummy_srcs:.c=.o)\r
+ $(dir)/arg-test: $(dir)/arg-test.o command-line-arguments.o util/libutil.a\r
+ $(call quiet,CC) -I. $^ -o $@\r
+ \r
++$(dir)/hex-xcode: $(dir)/hex-xcode.o command-line-arguments.o util/libutil.a\r
++ $(call quiet,CC) -I. $^ -o $@ -ltalloc\r
++\r
+ $(dir)/smtp-dummy: $(smtp_dummy_modules)\r
+ $(call quiet,CC) $^ -o $@\r
+ \r
+@@ -24,8 +27,13 @@ $(dir)/parse-time: $(dir)/parse-time.o parse-time-string/parse-time-string.o\r
+ \r
+ .PHONY: test check\r
+ \r
+-test-binaries: $(dir)/arg-test $(dir)/smtp-dummy $(dir)/symbol-test \\r
+- $(dir)/parse-time\r
++TEST_BINARIES=$(dir)/arg-test \\r
++ $(dir)/hex-xcode \\r
++ $(dir)/parse-time \\r
++ $(dir)/smtp-dummy \\r
++ $(dir)/symbol-test\r
++\r
++test-binaries: $(TEST_BINARIES)\r
+ \r
+ test: all test-binaries\r
+ @${dir}/notmuch-test $(OPTIONS)\r
+@@ -36,5 +44,6 @@ SRCS := $(SRCS) $(smtp_dummy_srcs)\r
+ CLEAN := $(CLEAN) $(dir)/smtp-dummy $(dir)/smtp-dummy.o \\r
+ $(dir)/symbol-test $(dir)/symbol-test.o \\r
+ $(dir)/arg-test $(dir)/arg-test.o \\r
++ $(dir)/hex-xcode $(dir)/hex-xcode.o \\r
+ $(dir)/parse-time $(dir)/parse-time.o \\r
+ $(dir)/corpus.mail $(dir)/test-results $(dir)/tmp.*\r
+diff --git a/test/basic b/test/basic\r
+index b7feb07..c448ef8 100755\r
+--- a/test/basic\r
++++ b/test/basic\r
+@@ -56,6 +56,7 @@ tests_in_suite=$(for i in $TESTS; do echo $i; done | sort)\r
+ available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -perm +111 \\r
+ ! -name aggregate-results.sh \\r
+ ! -name arg-test \\r
++ ! -name hex-xcode \\r
+ ! -name notmuch-test \\r
+ ! -name parse-time \\r
+ ! -name smtp-dummy \\r
+diff --git a/test/hex-xcode.c b/test/hex-xcode.c\r
+new file mode 100644\r
+index 0000000..65d4956\r
+--- /dev/null\r
++++ b/test/hex-xcode.c\r
+@@ -0,0 +1,109 @@\r
++/* No, nothing to to with IDE from Apple Inc.\r
++ * testbed for ../util/hex-escape.c.\r
++ *\r
++ * usage:\r
++ * hex-xcode [--direction=(encode|decode)] [--omit-newline] < file\r
++ * hex-xcode [--direction=(encode|decode)] [--omit-newline] [--in-place] arg1 arg2 arg3 ...\r
++ *\r
++ */\r
++\r
++#include "notmuch-client.h"\r
++#include "hex-escape.h"\r
++#include <assert.h>\r
++\r
++enum direction {\r
++ ENCODE,\r
++ DECODE\r
++};\r
++\r
++static int inplace = FALSE;\r
++\r
++static int\r
++xcode (void *ctx, enum direction dir, char *in, char **buf_p, size_t *size_p)\r
++{\r
++ hex_status_t status;\r
++\r
++ if (dir == ENCODE)\r
++ status = hex_encode (ctx, in, buf_p, size_p);\r
++ else\r
++ if (inplace) {\r
++ status = hex_decode_inplace (in);\r
++ *buf_p = in;\r
++ *size_p = strlen(in);\r
++ } else {\r
++ status = hex_decode (ctx, in, buf_p, size_p);\r
++ }\r
++\r
++ if (status == HEX_SUCCESS)\r
++ fputs (*buf_p, stdout);\r
++\r
++ return status;\r
++}\r
++\r
++int\r
++main (int argc, char **argv)\r
++{\r
++\r
++ enum direction dir = DECODE;\r
++ int omit_newline = FALSE;\r
++\r
++ notmuch_opt_desc_t options[] = {\r
++ { NOTMUCH_OPT_KEYWORD, &dir, "direction", 'd',\r
++ (notmuch_keyword_t []){ { "encode", ENCODE },\r
++ { "decode", DECODE },\r
++ { 0, 0 } } },\r
++ { NOTMUCH_OPT_BOOLEAN, &omit_newline, "omit-newline", 'n', 0 },\r
++ { NOTMUCH_OPT_BOOLEAN, &inplace, "in-place", 'i', 0 },\r
++ { 0, 0, 0, 0, 0 }\r
++ };\r
++\r
++ int opt_index = parse_arguments (argc, argv, options, 1);\r
++\r
++ if (opt_index < 0)\r
++ exit (1);\r
++\r
++ void *ctx = talloc_new (NULL);\r
++\r
++ char *line = NULL;\r
++ size_t line_size;\r
++ ssize_t line_len;\r
++\r
++ char *buffer = NULL;\r
++ size_t buf_size = 0;\r
++\r
++ notmuch_bool_t read_stdin = TRUE;\r
++\r
++ for (; opt_index < argc; opt_index++) {\r
++\r
++ if (xcode (ctx, dir, argv[opt_index],\r
++ &buffer, &buf_size) != HEX_SUCCESS)\r
++ return 1;\r
++\r
++ if (! omit_newline)\r
++ putchar ('\n');\r
++\r
++ read_stdin = FALSE;\r
++ }\r
++\r
++ if (! read_stdin)\r
++ return 0;\r
++\r
++ while ((line_len = getline (&line, &line_size, stdin)) != -1) {\r
++\r
++ chomp_newline (line);\r
++\r
++ if (xcode (ctx, dir, line, &buffer, &buf_size) != HEX_SUCCESS)\r
++ return 1;\r
++\r
++ if (! omit_newline)\r
++ putchar ('\n');\r
++\r
++ }\r
++\r
++ if (line)\r
++ free (line);\r
++\r
++ talloc_free (ctx);\r
++\r
++ return 0;\r
++}\r
+-- \r
+1.7.10.4\r
+\r
projects / notmuch-archives.git / commitdiff