From 02eb734d9d12cbbe61a1ef6d641a2ec2d6d34311 Mon Sep 17 00:00:00 2001 From: Dmitry Kurochkin Date: Mon, 30 Jan 2012 06:26:10 +0400 Subject: [PATCH] [PATCH v2 01/13] emacs: move tag format validation to `notmuch-tag' function --- 46/12af15b503ad4fa9d469b6938becda2ba0bc94 | 101 ++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 46/12af15b503ad4fa9d469b6938becda2ba0bc94 diff --git a/46/12af15b503ad4fa9d469b6938becda2ba0bc94 b/46/12af15b503ad4fa9d469b6938becda2ba0bc94 new file mode 100644 index 000000000..0f5ce5eca --- /dev/null +++ b/46/12af15b503ad4fa9d469b6938becda2ba0bc94 @@ -0,0 +1,101 @@ +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 4A315431E64 + for ; Sun, 29 Jan 2012 18:27:39 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.799 +X-Spam-Level: +X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_FROM=0.001, 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 PiawXmOJRVC6 for ; + Sun, 29 Jan 2012 18:27:38 -0800 (PST) +Received: from mail-bk0-f53.google.com (mail-bk0-f53.google.com + [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id A454B431FD2 + for ; Sun, 29 Jan 2012 18:27:38 -0800 (PST) +Received: by bke11 with SMTP id 11so960274bke.26 + for ; Sun, 29 Jan 2012 18:27:37 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; + h=from:to:subject:date:message-id:x-mailer:in-reply-to:references; + bh=tCONDe2BxG39qitT55xnR3sf2CKcETDyKuEOgGI3z7A=; + b=Vfa+3SRG/wLh7PxG9+9DOB4tW/2JGJRHFnNN8++7vMDbrwsYv+rZbCqHBoRMubN6rf + LtCbUqSJ4Tb3iog9Z5qa+Cy2cRmw4ezDgQy8LKI8NxVI0OUUR+JNYbQ/1AKPX+j7qxlN + Gc2BOQEa8m/6UOYYbyr5HOgG3G+L4DIi4Xt8U= +Received: by 10.204.10.73 with SMTP id o9mr7370443bko.99.1327890457378; + Sun, 29 Jan 2012 18:27:37 -0800 (PST) +Received: from localhost ([91.144.186.21]) + by mx.google.com with ESMTPS id z15sm31385347bkd.7.2012.01.29.18.27.36 + (version=TLSv1/SSLv3 cipher=OTHER); + Sun, 29 Jan 2012 18:27:36 -0800 (PST) +From: Dmitry Kurochkin +To: notmuch@notmuchmail.org +Subject: [PATCH v2 01/13] emacs: move tag format validation to `notmuch-tag' + function +Date: Mon, 30 Jan 2012 06:26:10 +0400 +Message-Id: <1327890382-548-2-git-send-email-dmitry.kurochkin@gmail.com> +X-Mailer: git-send-email 1.7.8.3 +In-Reply-To: <1327890382-548-1-git-send-email-dmitry.kurochkin@gmail.com> +References: <1327725684-5887-1-git-send-email-dmitry.kurochkin@gmail.com> + <1327890382-548-1-git-send-email-dmitry.kurochkin@gmail.com> +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, 30 Jan 2012 02:27:39 -0000 + +Before the change, tag format validation was done in +`notmuch-search-operate-all' function only. The patch moves it down +to `notmuch-tag', so that all users of that function get input +validation. +--- + emacs/notmuch.el | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/emacs/notmuch.el b/emacs/notmuch.el +index 72f78ed..84d7d0a 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -522,6 +522,12 @@ Note: Other code should always use this function alter tags of + messages instead of running (notmuch-call-notmuch-process \"tag\" ..) + directly, so that hooks specified in notmuch-before-tag-hook and + notmuch-after-tag-hook will be run." ++ ;; Perform some validation ++ (when (null tags) (error "No tags given")) ++ (mapc (lambda (tag) ++ (unless (string-match-p "^[-+][-+_.[:word:]]+$" tag) ++ (error "Tag must be of the form `+this_tag' or `-that_tag'"))) ++ tags) + (run-hooks 'notmuch-before-tag-hook) + (apply 'notmuch-call-notmuch-process + (append (list "tag") tags (list "--" query))) +@@ -890,12 +896,6 @@ characters as well as `_.+-'. + (interactive (notmuch-select-tags-with-completion + "Operations (+add -drop): notmuch tag " + '("+" "-"))) +- ;; Perform some validation +- (when (null actions) (error "No operations given")) +- (mapc (lambda (action) +- (unless (string-match-p "^[-+][-+_.[:word:]]+$" action) +- (error "Action must be of the form `+this_tag' or `-that_tag'"))) +- actions) + (apply 'notmuch-tag notmuch-search-query-string actions)) + + (defun notmuch-search-buffer-title (query) +-- +1.7.8.3 + -- 2.26.2