Merge branch 'release'

[notmuch] / notmuch-compact.c

diff --git a/notmuch-compact.c b/notmuch-compact.c
index 2fc012a982d7f3b879fc6fe795d01b194b240c31..855545d735769e1269bd5a08ce6c1e99856bb989 100644 (file)
--- 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>
  */
@@ -38,12 +38,21 @@ notmuch_compact_command (notmuch_config_t *config, int argc, char *argv[])
     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 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,