From 33a170e1163b39b47deafcaef863d19c0d5d62cd Mon Sep 17 00:00:00 2001 From: Yuri Volchkov Date: Mon, 21 Aug 2017 17:44:46 +0200 Subject: [PATCH] insert: strip trailing / in folder path 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 --- 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 bc96af0e..2590e836 100644 --- a/notmuch-insert.c +++ b/notmuch-insert.c @@ -27,6 +27,7 @@ #include #include #include +#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 187dfd37..380934a6 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})