[Patch v2 08/17] util: add string-util.[ch]

diff --git a/ea/f97e99b9bb6dddc57ff48a97bd7e4f4c20a859 b/ea/f97e99b9bb6dddc57ff48a97bd7e4f4c20a859
new file mode 100644 (file)
index 0000000..f717134
--- /dev/null
+++ b/ea/f97e99b9bb6dddc57ff48a97bd7e4f4c20a859
@@ -0,0 +1,149 @@
+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 4BC12431FD5\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 13:20:45 -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 j4s5i-y5Qzas for <notmuch@notmuchmail.org>;\r
+       Sat, 24 Nov 2012 13:20:43 -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 68615431FD9\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 13:20:33 -0800 (PST)\r
+Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([156.34.89.108] 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 1TcN9M-0006SO-Bh; Sat, 24 Nov 2012 17:20:32 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1TcN9G-0008Cy-Ni; Sat, 24 Nov 2012 17:20:26 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v2 08/17] util: add string-util.[ch]\r
+Date: Sat, 24 Nov 2012 17:20:08 -0400\r
+Message-Id: <1353792017-31459-9-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1353792017-31459-1-git-send-email-david@tethera.net>\r
+References: <1353792017-31459-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: Sat, 24 Nov 2012 21:20:45 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+This is to give a home to strtok_len. It's a bit silly to add a header\r
+for one routine, but it needs to be shared between several compilation\r
+units (or at least that's the most natural design).\r
+---\r
+ util/Makefile.local |    3 ++-\r
+ util/string-util.c  |   34 ++++++++++++++++++++++++++++++++++\r
+ util/string-util.h  |   19 +++++++++++++++++++\r
+ 3 files changed, 55 insertions(+), 1 deletion(-)\r
+ create mode 100644 util/string-util.c\r
+ create mode 100644 util/string-util.h\r
+\r
+diff --git a/util/Makefile.local b/util/Makefile.local\r
+index 3ca623e..a11e35b 100644\r
+--- a/util/Makefile.local\r
++++ b/util/Makefile.local\r
+@@ -3,7 +3,8 @@\r
+ dir := util\r
+ extra_cflags += -I$(srcdir)/$(dir)\r
+ \r
+-libutil_c_srcs := $(dir)/xutil.c $(dir)/error_util.c $(dir)/hex-escape.c\r
++libutil_c_srcs := $(dir)/xutil.c $(dir)/error_util.c $(dir)/hex-escape.c \\r
++                $(dir)/string-util.c\r
+ \r
+ libutil_modules := $(libutil_c_srcs:.c=.o)\r
+ \r
+diff --git a/util/string-util.c b/util/string-util.c\r
+new file mode 100644\r
+index 0000000..44f8cd3\r
+--- /dev/null\r
++++ b/util/string-util.c\r
+@@ -0,0 +1,34 @@\r
++/* string-util.c -  Extra or enhanced routines for null terminated strings.\r
++ *\r
++ * Copyright (c) 2012 Jani Nikula\r
++ *\r
++ * This program is free software: you can redistribute it and/or modify\r
++ * it under the terms of the GNU General Public License as published by\r
++ * the Free Software Foundation, either version 3 of the License, or\r
++ * (at your option) any later version.\r
++ *\r
++ * This program is distributed in the hope that it will be useful,\r
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
++ * GNU General Public License for more details.\r
++ *\r
++ * You should have received a copy of the GNU General Public License\r
++ * along with this program.  If not, see http://www.gnu.org/licenses/ .\r
++ *\r
++ * Author: Jani Nikula <jani@nikula.org>\r
++ */\r
++\r
++\r
++#include "string-util.h"\r
++\r
++char *\r
++strtok_len (char *s, const char *delim, size_t *len)\r
++{\r
++    /* skip initial delims */\r
++    s += strspn (s, delim);\r
++\r
++    /* length of token */\r
++    *len = strcspn (s, delim);\r
++\r
++    return *len ? s : NULL;\r
++}\r
+diff --git a/util/string-util.h b/util/string-util.h\r
+new file mode 100644\r
+index 0000000..696da40\r
+--- /dev/null\r
++++ b/util/string-util.h\r
+@@ -0,0 +1,19 @@\r
++#ifndef _STRING_UTIL_H\r
++#define _STRING_UTIL_H\r
++\r
++#include <string.h>\r
++\r
++/* like strtok(3), but without state, and doesn't modify s. usage pattern:\r
++ *\r
++ * const char *tok = input;\r
++ * const char *delim = " \t";\r
++ * size_t tok_len = 0;\r
++ *\r
++ * while ((tok = strtok_len (tok + tok_len, delim, &tok_len)) != NULL) {\r
++ *     // do stuff with string tok of length tok_len\r
++ * }\r
++ */\r
++\r
++char *strtok_len (char *s, const char *delim, size_t *len);\r
++\r
++#endif\r
+-- \r
+1.7.10.4\r
+\r