X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=54f46c6828cc13a72d6dec17cc264e50b4e9c231;hp=45a73ce07f2b31fb660871a17a74b50f13820aa0;hb=a755c9d6a9099366cc82ba3a4bee8e6d2b83d529;hpb=8d6aa603ef3a9680c7032cabf59e3673f773dea3

diff --git a/notmuch.c b/notmuch.c
index 45a73ce0..54f46c68 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -44,6 +44,8 @@ static command_t commands[] = {
       "Interactively setup notmuch for first use." },
     { "new", notmuch_new_command, FALSE,
       "Find and import new messages to the notmuch database." },
+    { "insert", notmuch_insert_command, FALSE,
+      "Add a new message into the maildir and notmuch database." },
     { "search", notmuch_search_command, FALSE,
       "Search for messages matching the given search terms." },
     { "show", notmuch_show_command, FALSE,
@@ -58,6 +60,8 @@ static command_t commands[] = {
       "Create a plain-text dump of the tags for each message." },
     { "restore", notmuch_restore_command, FALSE,
       "Restore the tags from the given dump file (see 'dump')." },
+    { "compact", notmuch_compact_command, FALSE,
+      "Compact the notmuch database." },
     { "config", notmuch_config_command, FALSE,
       "Get or set settings in the notmuch configuration file." },
     { "help", notmuch_help_command, TRUE, /* create but don't save config */
@@ -123,7 +127,7 @@ by the notmuch CLI (it requires at least version %d).  You may need to\n\
 upgrade your notmuch front-end.\n",
 		 notmuch_format_version, NOTMUCH_FORMAT_MIN);
 	exit (NOTMUCH_EXIT_FORMAT_TOO_OLD);
-    } else if (notmuch_format_version != NOTMUCH_FORMAT_CUR) {
+    } else if (notmuch_format_version < NOTMUCH_FORMAT_MIN_ACTIVE) {
 	/* Warn about old version requests so compatibility issues are
 	 * less likely when we drop support for a deprecated format
 	 * versions. */
@@ -238,32 +242,6 @@ notmuch_command (notmuch_config_t *config,
     return 0;
 }
 
-static int
-redirect_stderr (const char * stderr_file)
-{
-    if (strcmp (stderr_file, "-") == 0) {
-	if (dup2 (STDOUT_FILENO, STDERR_FILENO) < 0) {
-	    perror ("dup2");
-	    return 1;
-	}
-    } else {
-	int fd = open (stderr_file, O_WRONLY|O_CREAT|O_TRUNC, 0666);
-	if (fd < 0) {
-	    fprintf (stderr, "Error: Cannot redirect stderr to '%s': %s\n",
-		     stderr_file, strerror (errno));
-	    return 1;
-	}
-	if (fd != STDERR_FILENO) {
-	    if (dup2 (fd, STDERR_FILENO) < 0) {
-		perror ("dup2");
-		return 1;
-	    }
-	    close (fd);
-	}
-    }
-    return 0;
-}
-
 int
 main (int argc, char *argv[])
 {
@@ -272,7 +250,6 @@ main (int argc, char *argv[])
     const char *command_name = NULL;
     command_t *command;
     char *config_file_name = NULL;
-    char *stderr_file = NULL;
     notmuch_config_t *config;
     notmuch_bool_t print_help=FALSE, print_version=FALSE;
     int opt_index;
@@ -282,7 +259,6 @@ main (int argc, char *argv[])
 	{ NOTMUCH_OPT_BOOLEAN, &print_help, "help", 'h', 0 },
 	{ NOTMUCH_OPT_BOOLEAN, &print_version, "version", 'v', 0 },
 	{ NOTMUCH_OPT_STRING, &config_file_name, "config", 'c', 0 },
-	{ NOTMUCH_OPT_STRING, &stderr_file, "stderr", '\0', 0 },
 	{ 0, 0, 0, 0, 0 }
     };
 
@@ -290,7 +266,7 @@ main (int argc, char *argv[])
 
     local = talloc_new (NULL);
 
-    g_mime_init (0);
+    g_mime_init (GMIME_ENABLE_RFC2047_WORKAROUNDS);
 #if !GLIB_CHECK_VERSION(2, 35, 1)
     g_type_init ();
 #endif
@@ -304,10 +280,6 @@ main (int argc, char *argv[])
 	return 1;
     }
 
-    if (stderr_file && redirect_stderr (stderr_file) != 0) {
-	/* error already printed */
-	return 1;
-    }
     if (print_help)
 	return notmuch_help_command (NULL, argc - 1, &argv[1]);