X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=notmuch-compact.c;h=ae464e4805cbfbb5f329a278494006a3273706ab;hb=25960b5ecdc6374fc87a3cb12c1c393497b262da;hp=6c5909386da8e49ea9fd5dfe56c947fcbadafdc1;hpb=89fe006ca421142bfba0969c140b633ad520832c;p=notmuch

diff --git a/notmuch-compact.c b/notmuch-compact.c
index 6c590938..ae464e48 100644
--- a/notmuch-compact.c
+++ b/notmuch-compact.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: Ben Gamari <bgamari.foss@gmail.com>
  */
@@ -36,13 +36,22 @@ notmuch_compact_command (notmuch_config_t *config, int argc, char *argv[])
     int opt_index;
 
     notmuch_opt_desc_t options[] = {
-	{ NOTMUCH_OPT_STRING, &backup_path, "backup", 0, 0 },
-	{ NOTMUCH_OPT_BOOLEAN,  &quiet, "quiet", 'q', 0 },
+	{ .opt_string = &backup_path, .name = "backup" },
+	{ .opt_bool =  &quiet, .name = "quiet" },
+	{ .opt_inherit = notmuch_shared_options },
+	{ }
     };
 
     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");
@@ -50,7 +59,7 @@ notmuch_compact_command (notmuch_config_t *config, int argc, char *argv[])
 				    quiet ? NULL : status_update_cb, NULL);
     if (ret) {
 	fprintf (stderr, "Compaction failed: %s\n", notmuch_status_to_string (ret));
-	return 1;
+	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;
 }