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 943E1429E26 for ; Fri, 9 Dec 2011 11:54:46 -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 IOcCxpdO5OXU for ; Fri, 9 Dec 2011 11:54:44 -0800 (PST) Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU [18.9.25.12]) by olra.theworths.org (Postfix) with ESMTP id 4F95E429E33 for ; Fri, 9 Dec 2011 11:54:41 -0800 (PST) X-AuditID: 1209190c-b7f806d0000008d6-ea-4ee26781a8db Received: from mailhub-auth-2.mit.edu ( [18.7.62.36]) by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP id 4C.F6.02262.18762EE4; Fri, 9 Dec 2011 14:54:41 -0500 (EST) Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id pB9Jsexe029553; Fri, 9 Dec 2011 14:54:40 -0500 Received: from drake.mit.edu (26-4-166.dynamic.csail.mit.edu [18.26.4.166]) (authenticated bits=0) (User authenticated as amdragon@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id pB9Jsdfv013160 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); Fri, 9 Dec 2011 14:54:40 -0500 (EST) Received: from amthrax by drake.mit.edu with local (Exim 4.76) (envelope-from ) id 1RZ6Wl-00015X-47; Fri, 09 Dec 2011 14:54:39 -0500 From: Austin Clements To: notmuch@notmuchmail.org Subject: [PATCH 3/4] Utility function to seek in MIME trees in depth-first order. Date: Fri, 9 Dec 2011 14:54:27 -0500 Message-Id: <1323460468-4030-4-git-send-email-amdragon@mit.edu> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1323460468-4030-1-git-send-email-amdragon@mit.edu> References: <1323027100-10307-1-git-send-email-amdragon@mit.edu> <1323460468-4030-1-git-send-email-amdragon@mit.edu> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrHIsWRmVeSWpSXmKPExsUixG6notuY/sjPYPFLNovrN2cyOzB6PFt1 izmAMYrLJiU1J7MstUjfLoEr48iXrUwFu3grPlxdyNbAeIGri5GTQ0LAROLQl/3MELaYxIV7 69lAbCGBfYwSW7eUdzFyAdnrGSUWTbjOCOEcY5K49HwaO4Qzn1Fi/bHlYC1sAhoS2/YvZwSx RQSkJXbenc3axcjBwSygJvGnSwUkLCwQKPF9zismEJtFQFXi+LTb7CA2r4C9xLHLO9khrlCQ OLf6HJjNKeAg8e3VF3aIi8okbnZ+Z5/AyL+AkWEVo2xKbpVubmJmTnFqsm5xcmJeXmqRrqFe bmaJXmpK6SZGUNBwSvLsYHxzUOkQowAHoxIPr6fXIz8h1sSy4srcQ4ySHExKoryv04BCfEn5 KZUZicUZ8UWlOanFhxglOJiVRHhV5IFyvCmJlVWpRfkwKWkOFiVx3updD/2EBNITS1KzU1ML UotgsjIcHEoSvD9AhgoWpaanVqRl5pQgpJk4OEGG8wAND40EGV5ckJhbnJkOkT/FqMuxs+PA GUYhlrz8vFQpcd6zIIMEQIoySvPg5sCi/RWjONBbwrxKIKN4gIkCbtIroCVMQEu+ZD8AWVKS iJCSamAsObSw9MvP9Z+/5rfxt547mxh3809kir6OWdaFXvFvp77adSi4s2euz05amWo8+5dg uarTfx+vO5wqMc16yiIeb09ovlu6aufn73wNU6x5V/D3yFrzSHdVW26MVls+bf+8uDUb9h3k Yf2mdyDO1cD19pFS1aufLJ8/rJmzPkms6/vZIDddlddKLMUZiYZazEXFiQCpnK+t0QIAAA== 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: Fri, 09 Dec 2011 19:54:47 -0000 This function matches how we number parts for the --part argument to show. It will allow us to jump directly to the desired part, rather than traversing the entire tree and carefully tracking whether or not we're "in the zone". --- mime-node.c | 25 +++++++++++++++++++++++++ notmuch-client.h | 5 +++++ 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/mime-node.c b/mime-node.c index a8e4a59..207818e 100644 --- a/mime-node.c +++ b/mime-node.c @@ -232,3 +232,28 @@ mime_node_child (const mime_node_t *parent, int child) g_type_name (G_OBJECT_TYPE (parent->part))); } } + +static mime_node_t * +_mime_node_seek_dfs_walk (mime_node_t *node, int *n) +{ + mime_node_t *ret = NULL; + int i; + + if (*n <= 0) + return node; + + *n = *n - 1; + for (i = 0; i < node->children && !ret; i++) { + mime_node_t *child = mime_node_child (node, i); + ret = _mime_node_seek_dfs_walk (child, n); + if (!ret) + talloc_free (child); + } + return ret; +} + +mime_node_t * +mime_node_seek_dfs (mime_node_t *node, int n) +{ + return _mime_node_seek_dfs_walk (node, &n); +} diff --git a/notmuch-client.h b/notmuch-client.h index fce1187..f215d4b 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -318,5 +318,10 @@ mime_node_open (const void *ctx, notmuch_message_t *message, mime_node_t * mime_node_child (const mime_node_t *parent, int child); +/* Return the nth child of node in a depth-first traversal. If n is + * 0, returns node itself. Returns NULL if there is no such part. */ +mime_node_t * +mime_node_seek_dfs (mime_node_t *node, int n); + #include "command-line-arguments.h" #endif -- 1.7.7.3