Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 4738042119F for ; Sun, 22 Jan 2012 20:24:54 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 056yZO3t+0XH for ; Sun, 22 Jan 2012 20:24:53 -0800 (PST) Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 8C9D242119C for ; Sun, 22 Jan 2012 20:24:53 -0800 (PST) Received: by mail-ww0-f45.google.com with SMTP id dt12so2215149wgb.2 for ; Sun, 22 Jan 2012 20:24:53 -0800 (PST) MIME-Version: 1.0 Received: by 10.180.94.97 with SMTP id db1mr10668097wib.16.1327292693232; Sun, 22 Jan 2012 20:24:53 -0800 (PST) Received: from localhost ([109.131.95.182]) by mx.google.com with ESMTPS id t6sm10821091wid.1.2012.01.22.20.24.52 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 22 Jan 2012 20:24:52 -0800 (PST) From: Pieter Praet To: Austin Clements Subject: [PATCH v2 4/6] setup: move tag printing and parsing into separate functions Date: Mon, 23 Jan 2012 05:22:35 +0100 Message-Id: <1327292557-7701-4-git-send-email-pieter@praet.org> X-Mailer: git-send-email 1.7.8.1 In-Reply-To: <87obtvaw8h.fsf@praet.org> References: <87obtvaw8h.fsf@praet.org> X-Gm-Message-State: ALoCoQmWtSK7smf0hfR/BJXgezHOQnpEgrVUCbWDqiAlDymzQBSzcp+J81rTNyo3c4mZl8s3j1On Cc: Notmuch Mail 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: Mon, 23 Jan 2012 04:24:54 -0000 From: Austin Clements * notmuch-setup.c (notmuch_setup_command): Break tag printing and response parsing out into separate functions called `print_tag_list' respectively `parse_tag_list', for reuse with the 'search.exclude_tags' option. --- notmuch-setup.c | 55 ++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 34 insertions(+), 21 deletions(-) diff --git a/notmuch-setup.c b/notmuch-setup.c index c3ea937..dcfa607 100644 --- a/notmuch-setup.c +++ b/notmuch-setup.c @@ -87,6 +87,38 @@ welcome_message_post_setup (void) "have sufficient storage space available now.\n\n"); } +static void +print_tag_list (const char **tags, size_t tags_len) +{ + unsigned int i; + for (i = 0; i < tags_len; i++) { + if (i != 0) + printf (" "); + printf ("%s", tags[i]); + } +} + +static GPtrArray * +parse_tag_list (void *ctx, char *response) +{ + GPtrArray *tags = g_ptr_array_new (); + char *tag = response; + char *space; + + while (tag && *tag) { + space = strchr (tag, ' '); + if (space) + g_ptr_array_add (tags, talloc_strndup (ctx, tag, space - tag)); + else + g_ptr_array_add (tags, talloc_strdup (ctx, tag)); + tag = space; + while (tag && *tag == ' ') + tag++; + } + + return tags; +} + int notmuch_setup_command (unused (void *ctx), unused (int argc), unused (char *argv[])) @@ -164,30 +196,11 @@ notmuch_setup_command (unused (void *ctx), new_tags = notmuch_config_get_new_tags (config, &new_tags_len); printf ("Tags to apply to all new messages (separated by spaces) ["); - - for (i = 0; i < new_tags_len; i++) { - if (i != 0) - printf (" "); - printf ("%s", new_tags[i]); - } - + print_tag_list(new_tags, new_tags_len); prompt ("]: "); if (strlen (response)) { - GPtrArray *tags = g_ptr_array_new (); - char *tag = response; - char *space; - - while (tag && *tag) { - space = strchr (tag, ' '); - if (space) - g_ptr_array_add (tags, talloc_strndup (ctx, tag, space - tag)); - else - g_ptr_array_add (tags, talloc_strdup (ctx, tag)); - tag = space; - while (tag && *tag == ' ') - tag++; - } + GPtrArray *tags = parse_tag_list (ctx, response); notmuch_config_set_new_tags (config, (const char **) tags->pdata, tags->len); -- 1.7.8.1