debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-28 21:54:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

insert: strip trailing / in folder path

Browse source 
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>
This commit is contained in:
Yuri Volchkov 2017-08-21 17:44:46 +02:00 committed by David Bremner
parent cec4a87539
commit 33a170e116
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
notmuch-insert.c
View file

@ -27,6 +27,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include "string-util.h"
static volatile sig_atomic_t interrupted; 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; size_t new_tags_length;
tag_op_list_t *tag_ops; tag_op_list_t *tag_ops;
char *query_string = NULL; char *query_string = NULL;
const char *folder = NULL; char *folder = NULL;
notmuch_bool_t create_folder = FALSE; notmuch_bool_t create_folder = FALSE;
notmuch_bool_t keep = FALSE; notmuch_bool_t keep = FALSE;
notmuch_bool_t no_hooks = 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) { if (folder == NULL) {
maildir = db_path; maildir = db_path;
} else { } else {
strip_trailing (folder, '/');
if (! is_valid_folder_name (folder)) { if (! is_valid_folder_name (folder)) {
fprintf (stderr, "Error: invalid folder name: '%s'\n", folder); fprintf (stderr, "Error: invalid folder name: '%s'\n", folder);
return EXIT_FAILURE; return EXIT_FAILURE;

1
test/T070-insert.sh
View file

@ -133,7 +133,6 @@ dirname=$(dirname "$output")
test_expect_equal "$dirname" "$MAIL_DIR/Drafts/new" test_expect_equal "$dirname" "$MAIL_DIR/Drafts/new"
test_begin_subtest "Insert message into folder with trailing /" test_begin_subtest "Insert message into folder with trailing /"
test_subtest_known_broken
gen_insert_msg gen_insert_msg
notmuch insert --folder=Drafts/ < "$gen_msg_filename" notmuch insert --folder=Drafts/ < "$gen_msg_filename"
output=$(notmuch search --output=files id:${gen_msg_id}) output=$(notmuch search --output=files id:${gen_msg_id})