X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-setup.c;h=5304800553cfbe3897e2c8774ba702a30b8b9488;hp=36a6171a695b2bde194eab0dab3a577c91e265fe;hb=bcd6229d26c26e694b185fb8bf762bad606916c8;hpb=c7453773064efbd0b2cd17b15ba483edbd28ce1e

diff --git a/notmuch-setup.c b/notmuch-setup.c
index 36a6171a..53048005 100644
--- 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
- * 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>
  */
@@ -145,6 +145,13 @@ notmuch_setup_command (notmuch_config_t *config,
 	chomp_newline (response);				\
     } while (0)
 
+    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 (notmuch_config_is_new (config))
 	welcome_message_pre_setup ();
 
@@ -180,7 +187,7 @@ notmuch_setup_command (notmuch_config_t *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));
@@ -203,7 +210,7 @@ notmuch_setup_command (notmuch_config_t *config,
 	notmuch_config_set_new_tags (config, (const char **) tags->pdata,
 				     tags->len);
 
-	g_ptr_array_free (tags, TRUE);
+	g_ptr_array_free (tags, true);
     }
 
 
@@ -220,7 +227,7 @@ notmuch_setup_command (notmuch_config_t *config,
 						(const char **) tags->pdata,
 						tags->len);
 
-	g_ptr_array_free (tags, TRUE);
+	g_ptr_array_free (tags, true);
     }
 
     if (notmuch_config_save (config))