X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=notmuch-compact.c;h=359acfcc796625fe1371a18affc0ac6d5929d08f;hb=54e7f1777d0b623e0995c9d5e88ab9b412e470bb;hp=ee7afcf6b9a0c32be4e01ff1881c572bc07bf5fe;hpb=180dba66e47a5257b2cdf2f1ceb59cc8fa5a69d4;p=notmuch

diff --git a/notmuch-compact.c b/notmuch-compact.c
index ee7afcf6..359acfcc 100644
--- a/notmuch-compact.c
+++ b/notmuch-compact.c
@@ -27,28 +27,32 @@ status_update_cb (const char *msg, unused (void *closure))
 }
 
 int
-notmuch_compact_command (notmuch_config_t *config,
-			 unused (int argc),
-			 unused (char *argv[]))
+notmuch_compact_command (notmuch_config_t *config, int argc, char *argv[])
 {
     const char *path = notmuch_config_get_database_path (config);
-    const char *backup_path = path;
+    const char *backup_path = NULL;
     notmuch_status_t ret;
+    int opt_index;
+
+    notmuch_opt_desc_t options[] = {
+	{ NOTMUCH_OPT_STRING, &backup_path, "backup", 0, 0 },
+    };
+
+    opt_index = parse_arguments (argc, argv, options, 1);
+    if (opt_index < 0)
+	return 1;
 
     printf ("Compacting database...\n");
     ret = notmuch_database_compact (path, backup_path, status_update_cb, NULL);
     if (ret) {
 	fprintf (stderr, "Compaction failed: %s\n", notmuch_status_to_string(ret));
-    } else {
-	printf ("\n");
-	printf ("\n");
-	printf ("The old database has been moved to %s/xapian.old", backup_path);
-	printf ("\n");
-	printf ("To delete run,\n");
-	printf ("\n");
-	printf ("    rm -R %s/xapian.old\n", backup_path);
-	printf ("\n");
+	return 1;
     }
 
+    if (backup_path)
+	printf ("The old database has been moved to %s.\n", backup_path);
+
+    printf ("Done.\n");
+
     return 0;
 }