projects
/
notmuch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
debian: update gitignore
[notmuch.git]
/
notmuch-insert.c
diff --git
a/notmuch-insert.c
b/notmuch-insert.c
index bc96af0e881c4ec2b2dac8130bf9aea22588fb81..648bd944a7b122c20d05358a510efa69b25bc4e1 100644
(file)
--- a/
notmuch-insert.c
+++ b/
notmuch-insert.c
@@
-27,6
+27,7
@@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
+#include "string-util.h"
static volatile sig_atomic_t interrupted;
static volatile sig_atomic_t interrupted;
@@
-383,7
+384,7
@@
add_file (notmuch_database_t *notmuch, const char *path, tag_op_list_t *tag_ops,
notmuch_message_t *message;
notmuch_status_t status;
notmuch_message_t *message;
notmuch_status_t status;
- status = notmuch_database_
add_message (notmuch, path
, &message);
+ status = notmuch_database_
index_file (notmuch, path, NULL
, &message);
if (status == NOTMUCH_STATUS_SUCCESS) {
status = tag_op_list_apply (message, tag_ops, 0);
if (status) {
if (status == NOTMUCH_STATUS_SUCCESS) {
status = tag_op_list_apply (message, tag_ops, 0);
if (status) {
@@
-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;
size_t new_tags_length;
tag_op_list_t *tag_ops;
char *query_string = NULL;
- c
onst c
har *folder = NULL;
+ char *folder = NULL;
notmuch_bool_t create_folder = FALSE;
notmuch_bool_t keep = FALSE;
notmuch_bool_t no_hooks = FALSE;
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 {
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;
if (! is_valid_folder_name (folder)) {
fprintf (stderr, "Error: invalid folder name: '%s'\n", folder);
return EXIT_FAILURE;