append _unused to the expression defined using unused() macro

[notmuch] / notmuch-setup.c

diff --git a/notmuch-setup.c b/notmuch-setup.c
index 482efd2e3b9b497fcd09089809cb4a3fcab99fc1..81419ccf3a9426b56117e1eb44efbb642600d74e 100644 (file)
--- a/notmuch-setup.c
+++ b/notmuch-setup.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License

- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .

  *
  * Author: Carl Worth <cworth@cworth.org>
  */
  *
  * Author: Carl Worth <cworth@cworth.org>
  */


@@ -76,7 +76,8 @@ welcome_message_post_setup (void)
 "Notmuch is now configured, and the configuration settings are saved in\n"
 "a file in your home directory named .notmuch-config . If you'd like to\n"
 "change the configuration in the future, you can either edit that file\n"
 "Notmuch is now configured, and the configuration settings are saved in\n"
 "a file in your home directory named .notmuch-config . If you'd like to\n"
 "change the configuration in the future, you can either edit that file\n"

-"directly or run \"notmuch setup\".\n\n"
+"directly or run \"notmuch setup\".  To choose an alternate configuration\n"
+"location, set ${NOTMUCH_CONFIG}.\n\n"

 
 "The next step is to run \"notmuch new\" which will create a database\n"
 "that indexes all of your mail. Depending on the amount of mail you have\n"
 
 "The next step is to run \"notmuch new\" which will create a database\n"
 "that indexes all of your mail. Depending on the amount of mail you have\n"


@@ -86,30 +87,72 @@ welcome_message_post_setup (void)
 "have sufficient storage space available now.\n\n");
 }
 
 "have sufficient storage space available now.\n\n");
 }
 

+static void
+print_tag_list (const char **tags, size_t tags_len)
+{
+    unsigned int i;
+    for (i = 0; i < tags_len; i++) {
+       if (i != 0)
+           printf (" ");
+       printf ("%s", tags[i]);
+    }
+}
+
+static GPtrArray *
+parse_tag_list (void *ctx, char *response)
+{
+    GPtrArray *tags = g_ptr_array_new ();
+    char *tag = response;
+    char *space;
+
+    while (tag && *tag) {
+       space = strchr (tag, ' ');
+       if (space)
+           g_ptr_array_add (tags, talloc_strndup (ctx, tag, space - tag));
+       else
+           g_ptr_array_add (tags, talloc_strdup (ctx, tag));
+       tag = space;
+       while (tag && *tag == ' ')
+           tag++;
+    }
+
+    return tags;
+}
+

 int
 int

-notmuch_setup_command (unused (void *ctx),
-                      unused (int argc), unused (char *argv[]))
+notmuch_setup_command (notmuch_config_t *config,
+                      int argc, char *argv[])

 {
     char *response = NULL;
 {
     char *response = NULL;

-    size_t response_size;
-    notmuch_config_t *config;
-    char **old_other_emails;
+    size_t response_size = 0;
+    const char **old_other_emails;

     size_t old_other_emails_len;
     GPtrArray *other_emails;
     unsigned int i;
     size_t old_other_emails_len;
     GPtrArray *other_emails;
     unsigned int i;

-    int is_new;
-
-#define prompt(format, ...)                            \
-    do {                                               \
-       printf (format, ##__VA_ARGS__);                 \
-       fflush (stdout);                                \
-       getline (&response, &response_size, stdin);     \
-       chomp_newline (response);                       \
+    const char **new_tags;
+    size_t new_tags_len;
+    const char **search_exclude_tags;
+    size_t search_exclude_tags_len;
+
+#define prompt(format, ...)                                    \
+    do {                                                       \
+       printf (format, ##__VA_ARGS__);                         \
+       fflush (stdout);                                        \
+       if (getline (&response, &response_size, stdin) < 0) {   \
+           printf ("Exiting.\n");                              \
+           exit (EXIT_FAILURE);                                \
+       }                                                       \
+       chomp_newline (response);                               \

     } while (0)
 
     } while (0)
 

-    config = notmuch_config_open (ctx, NULL, &is_new);
+    if (notmuch_minimal_options ("setup", argc, argv) < 0)
+       return EXIT_FAILURE;
+
+    if (notmuch_requested_db_uuid)
+       fprintf (stderr, "Warning: ignoring --uuid=%s\n",
+                notmuch_requested_db_uuid);

 
 

-    if (is_new)
+    if (notmuch_config_is_new (config))

        welcome_message_pre_setup ();
 
     prompt ("Your full name [%s]: ", notmuch_config_get_user_name (config));
        welcome_message_pre_setup ();
 
     prompt ("Your full name [%s]: ", notmuch_config_get_user_name (config));


@@ -128,37 +171,70 @@ notmuch_setup_command (unused (void *ctx),
     for (i = 0; i < old_other_emails_len; i++) {
        prompt ("Additional email address [%s]: ", old_other_emails[i]);
        if (strlen (response))
     for (i = 0; i < old_other_emails_len; i++) {
        prompt ("Additional email address [%s]: ", old_other_emails[i]);
        if (strlen (response))

-           g_ptr_array_add (other_emails, talloc_strdup (ctx, response));
+           g_ptr_array_add (other_emails, talloc_strdup (config, response));

        else
        else

-           g_ptr_array_add (other_emails, talloc_strdup (ctx,
+           g_ptr_array_add (other_emails, talloc_strdup (config,

                                                         old_other_emails[i]));
     }
 
     do {
        prompt ("Additional email address [Press 'Enter' if none]: ");
        if (strlen (response))
                                                         old_other_emails[i]));
     }
 
     do {
        prompt ("Additional email address [Press 'Enter' if none]: ");
        if (strlen (response))

-           g_ptr_array_add (other_emails, talloc_strdup (ctx, response));
+           g_ptr_array_add (other_emails, talloc_strdup (config, response));

     } while (strlen (response));
     if (other_emails->len)
        notmuch_config_set_user_other_email (config,
                                             (const char **)
                                             other_emails->pdata,
                                             other_emails->len);
     } while (strlen (response));
     if (other_emails->len)
        notmuch_config_set_user_other_email (config,
                                             (const char **)
                                             other_emails->pdata,
                                             other_emails->len);

-    g_ptr_array_free (other_emails, TRUE);
+    g_ptr_array_free (other_emails, true);

 
     prompt ("Top-level directory of your email archive [%s]: ",
            notmuch_config_get_database_path (config));
     if (strlen (response)) {
        const char *absolute_path;
 
 
     prompt ("Top-level directory of your email archive [%s]: ",
            notmuch_config_get_database_path (config));
     if (strlen (response)) {
        const char *absolute_path;
 

-       absolute_path = make_path_absolute (ctx, response);
+       absolute_path = make_path_absolute (config, response);

        notmuch_config_set_database_path (config, absolute_path);
     }
 
        notmuch_config_set_database_path (config, absolute_path);
     }
 

-    notmuch_config_save (config);
+    new_tags = notmuch_config_get_new_tags (config, &new_tags_len);
+
+    printf ("Tags to apply to all new messages (separated by spaces) [");
+    print_tag_list (new_tags, new_tags_len);
+    prompt ("]: ");
+
+    if (strlen (response)) {
+       GPtrArray *tags = parse_tag_list (config, response);
+
+       notmuch_config_set_new_tags (config, (const char **) tags->pdata,
+                                    tags->len);
+
+       g_ptr_array_free (tags, true);
+    }
+
+
+    search_exclude_tags = notmuch_config_get_search_exclude_tags (config, &search_exclude_tags_len);
+
+    printf ("Tags to exclude when searching messages (separated by spaces) [");
+    print_tag_list (search_exclude_tags, search_exclude_tags_len);
+    prompt ("]: ");
+
+    if (strlen (response)) {
+       GPtrArray *tags = parse_tag_list (config, response);
+
+       notmuch_config_set_search_exclude_tags (config,
+                                               (const char **) tags->pdata,
+                                               tags->len);
+
+       g_ptr_array_free (tags, true);
+    }
+
+    if (notmuch_config_save (config))
+       return EXIT_FAILURE;

 
 

-    if (is_new)
+    if (notmuch_config_is_new (config))

        welcome_message_post_setup ();
 
        welcome_message_post_setup ();
 

-    return 0;
+    return EXIT_SUCCESS;

 }
 }