emacs: Add new option notmuch-search-hide-excluded

[notmuch] / notmuch-insert.c

diff --git a/notmuch-insert.c b/notmuch-insert.c
index 648bd944a7b122c20d05358a510efa69b25bc4e1..e44607ad45a8fdf9058f3ddf9fa3fc88acb7614e 100644 (file)
--- a/notmuch-insert.c
+++ b/notmuch-insert.c
@@ -34,7 +34,7 @@ static volatile sig_atomic_t interrupted;
 static void
 handle_sigint (unused (int sig))
 {
 static void
 handle_sigint (unused (int sig))
 {

-    static char msg[] = "Stopping...         \n";
+    static const char msg[] = "Stopping...         \n";

 
     /* This write is "opportunistic", so it's okay to ignore the
      * result.  It is not required for correctness, and if it does
 
     /* This write is "opportunistic", so it's okay to ignore the
      * result.  It is not required for correctness, and if it does


@@ -65,7 +65,7 @@ safe_gethostname (char *hostname, size_t len)
 }
 
 /* Call fsync() on a directory path. */
 }
 
 /* Call fsync() on a directory path. */

-static notmuch_bool_t
+static bool

 sync_dir (const char *dir)
 {
     int fd, r;
 sync_dir (const char *dir)
 {
     int fd, r;


@@ -73,7 +73,7 @@ sync_dir (const char *dir)
     fd = open (dir, O_RDONLY);
     if (fd == -1) {
        fprintf (stderr, "Error: open %s: %s\n", dir, strerror (errno));
     fd = open (dir, O_RDONLY);
     if (fd == -1) {
        fprintf (stderr, "Error: open %s: %s\n", dir, strerror (errno));

-       return FALSE;
+       return false;

     }
 
     r = fsync (fd);
     }
 
     r = fsync (fd);


@@ -88,29 +88,29 @@ sync_dir (const char *dir)
 /*
  * Check the specified folder name does not contain a directory
  * component ".." to prevent writes outside of the Maildir
 /*
  * Check the specified folder name does not contain a directory
  * component ".." to prevent writes outside of the Maildir

- * hierarchy. Return TRUE on valid folder name, FALSE otherwise.
+ * hierarchy. Return true on valid folder name, false otherwise.

  */
  */

-static notmuch_bool_t
+static bool

 is_valid_folder_name (const char *folder)
 {
     const char *p = folder;
 
     for (;;) {
        if ((p[0] == '.') && (p[1] == '.') && (p[2] == '\0' || p[2] == '/'))
 is_valid_folder_name (const char *folder)
 {
     const char *p = folder;
 
     for (;;) {
        if ((p[0] == '.') && (p[1] == '.') && (p[2] == '\0' || p[2] == '/'))

-           return FALSE;
+           return false;

        p = strchr (p, '/');
        p = strchr (p, '/');

-       if (!p)
-           return TRUE;
+       if (! p)
+           return true;

        p++;
     }
 }
 
 /*
  * Make the given directory and its parents as necessary, using the
        p++;
     }
 }
 
 /*
  * Make the given directory and its parents as necessary, using the

- * given mode. Return TRUE on success, FALSE otherwise. Partial
+ * given mode. Return true on success, false otherwise. Partial

  * results are not cleaned up on errors.
  */
  * results are not cleaned up on errors.
  */

-static notmuch_bool_t
+static bool

 mkdir_recursive (const void *ctx, const char *path, int mode)
 {
     struct stat st;
 mkdir_recursive (const void *ctx, const char *path, int mode)
 {
     struct stat st;


@@ -120,16 +120,16 @@ mkdir_recursive (const void *ctx, const char *path, int mode)
     /* First check the common case: directory already exists. */
     r = stat (path, &st);
     if (r == 0) {
     /* First check the common case: directory already exists. */
     r = stat (path, &st);
     if (r == 0) {

-        if (! S_ISDIR (st.st_mode)) {
+       if (! S_ISDIR (st.st_mode)) {

            fprintf (stderr, "Error: '%s' is not a directory: %s\n",
                     path, strerror (EEXIST));
            fprintf (stderr, "Error: '%s' is not a directory: %s\n",
                     path, strerror (EEXIST));

-           return FALSE;
+           return false;

        }
 
        }
 

-       return TRUE;
+       return true;

     } else if (errno != ENOENT) {
        fprintf (stderr, "Error: stat '%s': %s\n", path, strerror (errno));
     } else if (errno != ENOENT) {
        fprintf (stderr, "Error: stat '%s': %s\n", path, strerror (errno));

-       return FALSE;
+       return false;

     }
 
     /* mkdir parents, if any */
     }
 
     /* mkdir parents, if any */


@@ -138,31 +138,31 @@ mkdir_recursive (const void *ctx, const char *path, int mode)
        parent = talloc_strndup (ctx, path, slash - path);
        if (! parent) {
            fprintf (stderr, "Error: %s\n", strerror (ENOMEM));
        parent = talloc_strndup (ctx, path, slash - path);
        if (! parent) {
            fprintf (stderr, "Error: %s\n", strerror (ENOMEM));

-           return FALSE;
+           return false;

        }
 
        if (! mkdir_recursive (ctx, parent, mode))
        }
 
        if (! mkdir_recursive (ctx, parent, mode))

-           return FALSE;
+           return false;

     }
 
     if (mkdir (path, mode)) {
        fprintf (stderr, "Error: mkdir '%s': %s\n", path, strerror (errno));
     }
 
     if (mkdir (path, mode)) {
        fprintf (stderr, "Error: mkdir '%s': %s\n", path, strerror (errno));

-       return FALSE;
+       return false;

     }
 
     }
 

-    return parent ? sync_dir (parent) : TRUE;
+    return parent ? sync_dir (parent) : true;

 }
 
 /*
  * Create the given maildir folder, i.e. maildir and its
 }
 
 /*
  * Create the given maildir folder, i.e. maildir and its

- * subdirectories cur/new/tmp. Return TRUE on success, FALSE
+ * subdirectories cur/new/tmp. Return true on success, false

  * otherwise. Partial results are not cleaned up on errors.
  */
  * otherwise. Partial results are not cleaned up on errors.
  */

-static notmuch_bool_t
-maildir_create_folder (const void *ctx, const char *maildir)
+static bool
+maildir_create_folder (const void *ctx, const char *maildir, bool world_readable)

 {
     const char *subdirs[] = { "cur", "new", "tmp" };
 {
     const char *subdirs[] = { "cur", "new", "tmp" };

-    const int mode = 0700;
+    const int mode = (world_readable ? 0755 : 0700);

     char *subdir;
     unsigned int i;
 
     char *subdir;
     unsigned int i;
 


@@ -170,14 +170,14 @@ maildir_create_folder (const void *ctx, const char *maildir)
        subdir = talloc_asprintf (ctx, "%s/%s", maildir, subdirs[i]);
        if (! subdir) {
            fprintf (stderr, "Error: %s\n", strerror (ENOMEM));
        subdir = talloc_asprintf (ctx, "%s/%s", maildir, subdirs[i]);
        if (! subdir) {
            fprintf (stderr, "Error: %s\n", strerror (ENOMEM));

-           return FALSE;
+           return false;

        }
 
        if (! mkdir_recursive (ctx, subdir, mode))
        }
 
        if (! mkdir_recursive (ctx, subdir, mode))

-           return FALSE;
+           return false;

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 /*
 }
 
 /*


@@ -211,10 +211,11 @@ tempfilename (const void *ctx)
  * is not touched).
  */
 static int
  * is not touched).
  */
 static int

-maildir_mktemp (const void *ctx, const char *maildir, char **path_out)
+maildir_mktemp (const void *ctx, const char *maildir, bool world_readable, char **path_out)

 {
     char *filename, *path;
     int fd;
 {
     char *filename, *path;
     int fd;

+    const int mode = (world_readable ? 0644 : 0600);

 
     do {
        filename = tempfilename (ctx);
 
     do {
        filename = tempfilename (ctx);


@@ -227,7 +228,7 @@ maildir_mktemp (const void *ctx, const char *maildir, char **path_out)
            return -1;
        }
 
            return -1;
        }
 

-       fd = open (path, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600);
+       fd = open (path, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode);

     } while (fd == -1 && errno == EEXIST);
 
     if (fd == -1) {
     } while (fd == -1 && errno == EEXIST);
 
     if (fd == -1) {


@@ -240,19 +241,41 @@ maildir_mktemp (const void *ctx, const char *maildir, char **path_out)
     return fd;
 }
 
     return fd;
 }
 

+static bool
+write_buf (const char *buf, int fdout, ssize_t remain)
+{
+    const char *p = buf;
+
+    do {
+       ssize_t written = write (fdout, p, remain);
+       if (written < 0 && errno == EINTR)
+           continue;
+       if (written <= 0) {
+           fprintf (stderr, "Error: writing to temporary file: %s",
+                    strerror (errno));
+           return false;
+       }
+       p += written;
+       remain -= written;
+    } while (remain > 0);
+    return true;
+}
+

 /*
 /*

- * Copy fdin to fdout, return TRUE on success, and FALSE on errors and
+ * Copy fdin to fdout, return true on success, and false on errors and

  * empty input.
  */
  * empty input.
  */

-static notmuch_bool_t
+static bool

 copy_fd (int fdout, int fdin)
 {
 copy_fd (int fdout, int fdin)
 {

-    notmuch_bool_t empty = TRUE;
+    bool empty = true;
+    bool first = true;
+    const char *header = "X-Envelope-From: ";

 
     while (! interrupted) {
        ssize_t remain;
        char buf[4096];
 
     while (! interrupted) {
        ssize_t remain;
        char buf[4096];

-       char *p;
+       const char *p = buf;

 
        remain = read (fdin, buf, sizeof (buf));
        if (remain == 0)
 
        remain = read (fdin, buf, sizeof (buf));
        if (remain == 0)


@@ -262,26 +285,24 @@ copy_fd (int fdout, int fdin)
                continue;
            fprintf (stderr, "Error: reading from standard input: %s\n",
                     strerror (errno));
                continue;
            fprintf (stderr, "Error: reading from standard input: %s\n",
                     strerror (errno));

-           return FALSE;
+           return false;

        }
 
        }
 

-       p = buf;
-       do {
-           ssize_t written = write (fdout, p, remain);
-           if (written < 0 && errno == EINTR)
-               continue;
-           if (written <= 0) {
-               fprintf (stderr, "Error: writing to temporary file: %s",
-                        strerror (errno));
-               return FALSE;
-           }
-           p += written;
-           remain -= written;
-           empty = FALSE;
-       } while (remain > 0);
+       if (first && remain >= 5 && 0 == strncmp (buf, "From ", 5)) {
+           if (! write_buf (header, fdout, strlen (header)))
+               return false;
+           p += 5;
+           remain -= 5;
+       }
+
+       first = false;
+
+       if (! write_buf (p, fdout, remain))
+           return false;
+       empty = false;

     }
 
     }
 

-    return (!interrupted && !empty);
+    return (! interrupted && ! empty);

 }
 
 /*
 }
 
 /*


@@ -289,12 +310,12 @@ copy_fd (int fdout, int fdin)
  * the file, or NULL on errors.
  */
 static char *
  * the file, or NULL on errors.
  */
 static char *

-maildir_write_tmp (const void *ctx, int fdin, const char *maildir)
+maildir_write_tmp (const void *ctx, int fdin, const char *maildir, bool world_readable)

 {
     char *path;
     int fdout;
 
 {
     char *path;
     int fdout;
 

-    fdout = maildir_mktemp (ctx, maildir, &path);
+    fdout = maildir_mktemp (ctx, maildir, world_readable, &path);

     if (fdout < 0)
        return NULL;
 
     if (fdout < 0)
        return NULL;
 


@@ -310,7 +331,7 @@ maildir_write_tmp (const void *ctx, int fdin, const char *maildir)
 
     return path;
 
 
     return path;
 

-FAIL:
+  FAIL:

     close (fdout);
     unlink (path);
 
     close (fdout);
     unlink (path);
 


@@ -323,11 +344,11 @@ FAIL:
  * errors.
  */
 static char *
  * errors.
  */
 static char *

-maildir_write_new (const void *ctx, int fdin, const char *maildir)
+maildir_write_new (const void *ctx, int fdin, const char *maildir, bool world_readable)

 {
     char *cleanpath, *tmppath, *newpath, *newdir;
 
 {
     char *cleanpath, *tmppath, *newpath, *newdir;
 

-    tmppath = maildir_write_tmp (ctx, fdin, maildir);
+    tmppath = maildir_write_tmp (ctx, fdin, maildir, world_readable);

     if (! tmppath)
        return NULL;
     cleanpath = tmppath;
     if (! tmppath)
        return NULL;
     cleanpath = tmppath;


@@ -359,7 +380,7 @@ maildir_write_new (const void *ctx, int fdin, const char *maildir)
 
     return newpath;
 
 
     return newpath;
 

-FAIL:
+  FAIL:

     unlink (cleanpath);
 
     return NULL;
     unlink (cleanpath);
 
     return NULL;


@@ -367,24 +388,25 @@ FAIL:
 
 /*
  * Add the specified message file to the notmuch database, applying
 
 /*
  * Add the specified message file to the notmuch database, applying

- * tags in tag_ops. If synchronize_flags is TRUE, the tags are
+ * tags in tag_ops. If synchronize_flags is true, the tags are

  * synchronized to maildir flags (which may result in message file
  * rename).
  *
  * Return NOTMUCH_STATUS_SUCCESS on success, errors otherwise. If keep
  * synchronized to maildir flags (which may result in message file
  * rename).
  *
  * Return NOTMUCH_STATUS_SUCCESS on success, errors otherwise. If keep

- * is TRUE, errors in tag changes and flag syncing are ignored and
+ * is true, errors in tag changes and flag syncing are ignored and

  * success status is returned; otherwise such errors cause the message
  * to be removed from the database. Failure to add the message to the
  * database results in error status regardless of keep.
  */
 static notmuch_status_t
 add_file (notmuch_database_t *notmuch, const char *path, tag_op_list_t *tag_ops,
  * success status is returned; otherwise such errors cause the message
  * to be removed from the database. Failure to add the message to the
  * database results in error status regardless of keep.
  */
 static notmuch_status_t
 add_file (notmuch_database_t *notmuch, const char *path, tag_op_list_t *tag_ops,

-         notmuch_bool_t synchronize_flags, notmuch_bool_t keep)
+         bool synchronize_flags, bool keep,
+         notmuch_indexopts_t *indexopts)

 {
     notmuch_message_t *message;
     notmuch_status_t status;
 
 {
     notmuch_message_t *message;
     notmuch_status_t status;
 

-    status = notmuch_database_index_file (notmuch, path, NULL, &message);
+    status = notmuch_database_index_file (notmuch, path, indexopts, &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) {


@@ -442,65 +464,77 @@ add_file (notmuch_database_t *notmuch, const char *path, tag_op_list_t *tag_ops,
 }
 
 int
 }
 
 int

-notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[])
+notmuch_insert_command (notmuch_database_t *notmuch, int argc, char *argv[])

 {
     notmuch_status_t status, close_status;
 {
     notmuch_status_t status, close_status;

-    notmuch_database_t *notmuch;

     struct sigaction action;
     struct sigaction action;

-    const char *db_path;
-    const char **new_tags;
-    size_t new_tags_length;
+    const char *mail_root;
+    notmuch_config_values_t *new_tags = NULL;

     tag_op_list_t *tag_ops;
     char *query_string = NULL;
     tag_op_list_t *tag_ops;
     char *query_string = NULL;

-    char *folder = NULL;
-    notmuch_bool_t create_folder = FALSE;
-    notmuch_bool_t keep = FALSE;
-    notmuch_bool_t no_hooks = FALSE;
+    const char *folder = "";
+    bool create_folder = false;
+    bool keep = false;
+    bool hooks = true;
+    bool world_readable = false;

     notmuch_bool_t synchronize_flags;
     notmuch_bool_t synchronize_flags;

-    const char *maildir;
+    char *maildir;

     char *newpath;
     int opt_index;
     char *newpath;
     int opt_index;

-    unsigned int i;
+    notmuch_indexopts_t *indexopts = notmuch_database_get_default_indexopts (notmuch);
+
+    void *local = talloc_new (NULL);

 
     notmuch_opt_desc_t options[] = {
 
     notmuch_opt_desc_t options[] = {

-       { NOTMUCH_OPT_STRING, &folder, "folder", 0, 0 },
-       { NOTMUCH_OPT_BOOLEAN, &create_folder, "create-folder", 0, 0 },
-       { NOTMUCH_OPT_BOOLEAN, &keep, "keep", 0, 0 },
-       { NOTMUCH_OPT_BOOLEAN,  &no_hooks, "no-hooks", 'n', 0 },
-       { NOTMUCH_OPT_INHERIT, (void *) &notmuch_shared_options, NULL, 0, 0 },
-       { NOTMUCH_OPT_END, 0, 0, 0, 0 }
+       { .opt_string = &folder, .name = "folder", .allow_empty = true },
+       { .opt_bool = &create_folder, .name = "create-folder" },
+       { .opt_bool = &keep, .name = "keep" },
+       { .opt_bool = &hooks, .name = "hooks" },
+       { .opt_bool = &world_readable, .name = "world-readable" },
+       { .opt_inherit = notmuch_shared_indexing_options },
+       { .opt_inherit = notmuch_shared_options },
+       { }

     };
 
     opt_index = parse_arguments (argc, argv, options, 1);
     if (opt_index < 0)
        return EXIT_FAILURE;
 
     };
 
     opt_index = parse_arguments (argc, argv, options, 1);
     if (opt_index < 0)
        return EXIT_FAILURE;
 

-    notmuch_process_shared_options (argv[0]);
+    notmuch_process_shared_options (notmuch, argv[0]);
+
+    mail_root = notmuch_config_get (notmuch, NOTMUCH_CONFIG_MAIL_ROOT);

 
 

-    db_path = notmuch_config_get_database_path (config);
-    new_tags = notmuch_config_get_new_tags (config, &new_tags_length);
-    synchronize_flags = notmuch_config_get_maildir_synchronize_flags (config);
+    new_tags = notmuch_config_get_values (notmuch, NOTMUCH_CONFIG_NEW_TAGS);
+
+    if (print_status_database (
+           "notmuch insert",
+           notmuch,
+           notmuch_config_get_bool (notmuch, NOTMUCH_CONFIG_SYNC_MAILDIR_FLAGS,
+                                    &synchronize_flags)))
+       return EXIT_FAILURE;

 
 

-    tag_ops = tag_op_list_create (config);
+    tag_ops = tag_op_list_create (local);

     if (tag_ops == NULL) {
        fprintf (stderr, "Out of memory.\n");
        return EXIT_FAILURE;
     }
     if (tag_ops == NULL) {
        fprintf (stderr, "Out of memory.\n");
        return EXIT_FAILURE;
     }

-    for (i = 0; i < new_tags_length; i++) {
+    for (;
+        notmuch_config_values_valid (new_tags);
+        notmuch_config_values_move_to_next (new_tags)) {

        const char *error_msg;
        const char *error_msg;

-
-       error_msg = illegal_tag (new_tags[i], FALSE);
+       const char *tag = notmuch_config_values_get (new_tags);
+       error_msg = illegal_tag (tag, false);

        if (error_msg) {
            fprintf (stderr, "Error: tag '%s' in new.tags: %s\n",
        if (error_msg) {
            fprintf (stderr, "Error: tag '%s' in new.tags: %s\n",

-                    new_tags[i],  error_msg);
+                    tag,  error_msg);

            return EXIT_FAILURE;
        }
 
            return EXIT_FAILURE;
        }
 

-       if (tag_op_list_append (tag_ops, new_tags[i], FALSE))
+       if (tag_op_list_append (tag_ops, tag, false))

            return EXIT_FAILURE;
     }
 
            return EXIT_FAILURE;
     }
 

-    if (parse_tag_command_line (config, argc - opt_index, argv + opt_index,
+    if (parse_tag_command_line (local, argc - opt_index, argv + opt_index,

                                &query_string, tag_ops))
        return EXIT_FAILURE;
 
                                &query_string, tag_ops))
        return EXIT_FAILURE;
 


@@ -509,23 +543,21 @@ notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[])
        return EXIT_FAILURE;
     }
 
        return EXIT_FAILURE;
     }
 

-    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;
-       }
-       maildir = talloc_asprintf (config, "%s/%s", db_path, folder);
-       if (! maildir) {
-           fprintf (stderr, "Out of memory\n");
-           return EXIT_FAILURE;
-       }
-       if (create_folder && ! maildir_create_folder (config, maildir))
-           return EXIT_FAILURE;
+    if (! is_valid_folder_name (folder)) {
+       fprintf (stderr, "Error: invalid folder name: '%s'\n", folder);
+       return EXIT_FAILURE;

     }
 
     }
 

+    maildir = talloc_asprintf (local, "%s/%s", mail_root, folder);
+    if (! maildir) {
+       fprintf (stderr, "Out of memory\n");
+       return EXIT_FAILURE;
+    }
+
+    strip_trailing (maildir, '/');
+    if (create_folder && ! maildir_create_folder (local, maildir, world_readable))
+       return EXIT_FAILURE;
+

     /* Set up our handler for SIGINT. We do not set SA_RESTART so that copying
      * from standard input may be interrupted. */
     memset (&action, 0, sizeof (struct sigaction));
     /* Set up our handler for SIGINT. We do not set SA_RESTART so that copying
      * from standard input may be interrupted. */
     memset (&action, 0, sizeof (struct sigaction));


@@ -535,24 +567,23 @@ notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[])
     sigaction (SIGINT, &action, NULL);
 
     /* Write the message to the Maildir new directory. */
     sigaction (SIGINT, &action, NULL);
 
     /* Write the message to the Maildir new directory. */

-    newpath = maildir_write_new (config, STDIN_FILENO, maildir);
+    newpath = maildir_write_new (local, STDIN_FILENO, maildir, world_readable);

     if (! newpath) {
        return EXIT_FAILURE;
     }
 
     if (! newpath) {
        return EXIT_FAILURE;
     }
 

-    status = notmuch_database_open (notmuch_config_get_database_path (config),
-                                   NOTMUCH_DATABASE_MODE_READ_WRITE, &notmuch);
-    if (status)
-       return keep ? NOTMUCH_STATUS_SUCCESS : status_to_exit (status);
-
-    notmuch_exit_if_unmatched_db_uuid (notmuch);
-
+    status = notmuch_process_shared_indexing_options (indexopts);
+    if (status != NOTMUCH_STATUS_SUCCESS) {
+       fprintf (stderr, "Error: Failed to process index options. (%s)\n",
+                notmuch_status_to_string (status));
+       return EXIT_FAILURE;
+    }

 
     /* Index the message. */
 
     /* Index the message. */

-    status = add_file (notmuch, newpath, tag_ops, synchronize_flags, keep);
+    status = add_file (notmuch, newpath, tag_ops, synchronize_flags, keep, indexopts);

 
     /* Commit changes. */
 
     /* Commit changes. */

-    close_status = notmuch_database_destroy (notmuch);
+    close_status = notmuch_database_close (notmuch);

     if (close_status) {
        /* Hold on to the first error, if any. */
        if (! status)
     if (close_status) {
        /* Hold on to the first error, if any. */
        if (! status)


@@ -575,10 +606,14 @@ notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[])
        }
     }
 
        }
     }
 

-    if (! no_hooks && status == NOTMUCH_STATUS_SUCCESS) {
+    if (hooks && status == NOTMUCH_STATUS_SUCCESS) {

        /* Ignore hook failures. */
        /* Ignore hook failures. */

-       notmuch_run_hook (db_path, "post-insert");
+       notmuch_run_hook (notmuch, "post-insert");

     }
 
     }
 

+    notmuch_database_destroy (notmuch);
+
+    talloc_free (local);
+

     return status_to_exit (status);
 }
     return status_to_exit (status);
 }