X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-compact.c;h=937372161df1abc95cc569da44a212367fe8a01f;hp=8022dfe9278ad84f0875686343e62ac95ea7fa46;hb=3d38baf35280b9fe2d94a104bb2148e82164996b;hpb=0e04bda2a97a78ea63c5888fa3b3d60e7f84bd1a

diff --git a/notmuch-compact.c b/notmuch-compact.c
index 8022dfe9..93737216 100644
--- a/notmuch-compact.c
+++ b/notmuch-compact.c
@@ -23,7 +23,7 @@
 static void
 status_update_cb (const char *msg, unused (void *closure))
 {
-    printf("%s\n", msg);
+    printf ("%s\n", msg);
 }
 
 int
@@ -32,25 +32,34 @@ notmuch_compact_command (notmuch_config_t *config, int argc, char *argv[])
     const char *path = notmuch_config_get_database_path (config);
     const char *backup_path = NULL;
     notmuch_status_t ret;
-    notmuch_bool_t quiet;
+    notmuch_bool_t quiet = FALSE;
     int opt_index;
 
     notmuch_opt_desc_t options[] = {
 	{ NOTMUCH_OPT_STRING, &backup_path, "backup", 0, 0 },
 	{ NOTMUCH_OPT_BOOLEAN,  &quiet, "quiet", 'q', 0 },
+	{ NOTMUCH_OPT_INHERIT, (void *) &notmuch_shared_options, NULL, 0, 0 },
+	{ 0, 0, 0, 0, 0}
     };
 
     opt_index = parse_arguments (argc, argv, options, 1);
     if (opt_index < 0)
-	return 1;
+	return EXIT_FAILURE;
+
+    if (notmuch_requested_db_uuid) {
+	fprintf (stderr, "Error: --uuid not implemented for compact\n");
+	return EXIT_FAILURE;
+    }
+
+    notmuch_process_shared_options (argv[0]);
 
     if (! quiet)
 	printf ("Compacting database...\n");
     ret = notmuch_database_compact (path, backup_path,
 				    quiet ? NULL : status_update_cb, NULL);
     if (ret) {
-	fprintf (stderr, "Compaction failed: %s\n", notmuch_status_to_string(ret));
-	return 1;
+	fprintf (stderr, "Compaction failed: %s\n", notmuch_status_to_string (ret));
+	return EXIT_FAILURE;
     }
 
     if (! quiet) {
@@ -60,5 +69,5 @@ notmuch_compact_command (notmuch_config_t *config, int argc, char *argv[])
 	printf ("Done.\n");
     }
 
-    return 0;
+    return EXIT_SUCCESS;
 }