From: Yuri Volchkov <yuri.volchkov@gmail.com>
To: notmuch@notmuchmail.org
Subject: [PATCH v2 2/4] insert: strip trailing / in folder path
Date: Mon, 21 Aug 2017 17:44:46 +0200 [thread overview]
Message-ID: <1503330288-9375-3-git-send-email-yuri.volchkov@gmail.com> (raw)
In-Reply-To: <1503330288-9375-1-git-send-email-yuri.volchkov@gmail.com>
This patch fixes the "Insert message into folder with trailing /"
test. The problem was insufficient path canonization.
From database's point of view, "Sent" and "Sent/" are different
folders. If user runs (note the last '/'):
notmuch insert --folder=maildir/Sent/ < test.msg
notmuch will create an extra XDIRECTORY record for the folder
'Sent/'. This means that database will have _TWO_ records for _ONE_
physical folder: 'Sent' and 'Sent/'. However, the 'notmuch new'
command will update only records related to the first one (the correct
one).
Now, if user moved the email file (e.g. from 'Sent/new' to
'Sent/cur'), 'notmuch new' will add a record about the new file, but
will not delete the old record.
Signed-off-by: Yuri Volchkov <yuri.volchkov@gmail.com>
---
notmuch-insert.c | 4 +++-
test/T070-insert.sh | 1 -
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/notmuch-insert.c b/notmuch-insert.c
index bc96af0..2590e83 100644
--- a/notmuch-insert.c
+++ b/notmuch-insert.c
@@ -27,6 +27,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
+#include "string-util.h"
static volatile sig_atomic_t interrupted;
@@ -451,7 +452,7 @@ notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[])
size_t new_tags_length;
tag_op_list_t *tag_ops;
char *query_string = NULL;
- const char *folder = NULL;
+ char *folder = NULL;
notmuch_bool_t create_folder = FALSE;
notmuch_bool_t keep = FALSE;
notmuch_bool_t no_hooks = FALSE;
@@ -511,6 +512,7 @@ notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[])
if (folder == NULL) {
maildir = db_path;
} else {
+ strip_trailing (folder, '/');
if (! is_valid_folder_name (folder)) {
fprintf (stderr, "Error: invalid folder name: '%s'\n", folder);
return EXIT_FAILURE;
diff --git a/test/T070-insert.sh b/test/T070-insert.sh
index 187dfd3..380934a 100755
--- a/test/T070-insert.sh
+++ b/test/T070-insert.sh
@@ -133,7 +133,6 @@ dirname=$(dirname "$output")
test_expect_equal "$dirname" "$MAIL_DIR/Drafts/new"
test_begin_subtest "Insert message into folder with trailing /"
-test_subtest_known_broken
gen_insert_msg
notmuch insert --folder=Drafts/ < "$gen_msg_filename"
output=$(notmuch search --output=files id:${gen_msg_id})
--
2.7.4
next prev parent reply other threads:[~2017-08-21 15:45 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-12 16:47 [PATCH 0/4] fix "no such file" problem for emails send by emacs Yuri Volchkov
2017-08-12 16:47 ` [PATCH 1/4] test: insert into the folder with trailing / Yuri Volchkov
2017-08-17 1:21 ` David Bremner
2017-08-20 12:16 ` David Bremner
2017-08-12 16:47 ` [PATCH 2/4] insert: strip trailing / in folder path Yuri Volchkov
2017-08-19 0:17 ` David Bremner
2017-08-19 8:27 ` Yuri Volchkov
2017-08-19 12:55 ` David Bremner
2017-08-12 16:47 ` [PATCH 3/4] test: show id:<> works even if the first duplicated is deleted Yuri Volchkov
2017-08-12 16:47 ` [PATCH 4/4] show: workaround for the missing file problem Yuri Volchkov
2017-08-13 12:41 ` [PATCH 0/4] fix "no such file" problem for emails send by emacs David Bremner
2017-08-13 21:56 ` Yuri Volchkov
2017-08-16 11:32 ` David Bremner
2017-08-21 15:44 ` [PATCH v2 0/4] fix insufficient path canonization Yuri Volchkov
2017-08-21 15:44 ` [PATCH v2 1/4] database: move striping of trailing '/' into helper function Yuri Volchkov
2017-08-21 15:44 ` Yuri Volchkov [this message]
2017-08-21 15:44 ` [PATCH v2 3/4] test: show id:<> works even if the first duplicate is deleted Yuri Volchkov
2017-08-21 15:44 ` [PATCH v2 4/4] show: workaround for the missing file problem Yuri Volchkov
2017-08-23 0:19 ` [PATCH v2 0/4] fix insufficient path canonization David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1503330288-9375-3-git-send-email-yuri.volchkov@gmail.com \
--to=yuri.volchkov@gmail.com \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).