X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-compact.c;h=2fc012a982d7f3b879fc6fe795d01b194b240c31;hp=b9461c2fcae641922811173cef59574a65b0f95b;hb=3fed6736a7ef8b8b1f05d0fabb136bdd3b5917ee;hpb=d34be29a41bbe1d5bd2c81d7d791cd67ac4eb649

diff --git a/notmuch-compact.c b/notmuch-compact.c
index b9461c2f..2fc012a9 100644
--- a/notmuch-compact.c
+++ b/notmuch-compact.c
@@ -23,37 +23,42 @@
 static void
 status_update_cb (const char *msg, unused (void *closure))
 {
-    printf("%s\n", msg);
+    printf ("%s\n", msg);
 }
 
 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;
+    const char *backup_path = NULL;
     notmuch_status_t ret;
+    notmuch_bool_t quiet = FALSE;
+    int opt_index;
 
-    backup_path = talloc_asprintf (config, "%s/xapian.old", path);
-    if (! backup_path)
-	return 1;
+    notmuch_opt_desc_t options[] = {
+	{ NOTMUCH_OPT_STRING, &backup_path, "backup", 0, 0 },
+	{ NOTMUCH_OPT_BOOLEAN,  &quiet, "quiet", 'q', 0 },
+    };
 
-    printf ("Compacting database...\n");
-    ret = notmuch_database_compact (path, backup_path, status_update_cb, NULL);
+    opt_index = parse_arguments (argc, argv, options, 1);
+    if (opt_index < 0)
+	return EXIT_FAILURE;
+
+    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;
     }
 
-    printf ("\n");
-    printf ("\n");
-    printf ("The old database has been moved to %s", backup_path);
-    printf ("\n");
-    printf ("To delete run,\n");
-    printf ("\n");
-    printf ("    rm -R %s\n", backup_path);
-    printf ("\n");
+    if (! quiet) {
+	if (backup_path)
+	    printf ("The old database has been moved to %s.\n", backup_path);
+
+	printf ("Done.\n");
+    }
 
-    return 0;
+    return EXIT_SUCCESS;
 }