X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=279d21a58013be7cff1e5547d42addd35034e3f8;hp=bc04bc1b7ea5c788fb36d610702a930ee60a31d3;hb=b3cbcea8fdfdc71c5021fac483943a45ace816d3;hpb=f232f0a797b4fb657e630ca4bd664f9dcfe90dac

diff --git a/notmuch.c b/notmuch.c
index bc04bc1b..279d21a5 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -18,11 +18,12 @@
  * Author: Carl Worth <cworth@cworth.org>
  */
 
-#include "notmuch.h"
-
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE /* for getline */
 #endif
+#include <stdio.h>
+
+#include "notmuch.h"
 
 /* This is separate from notmuch-private.h because we're trying to
  * keep notmuch.c from looking into any internals, (which helps us
@@ -30,7 +31,6 @@
  */
 #include "xutil.h"
 
-#include <stdio.h>
 #include <stddef.h>
 #include <string.h>
 #include <sys/stat.h>
@@ -515,9 +515,8 @@ restore_command (int argc, char *argv[])
 
 	    message = notmuch_database_find_message (notmuch, message_id);
 	    if (message == NULL) {
-		fprintf (stderr, "Warning: Cannot apply tags to missing message: %s\n",
+		fprintf (stderr, "Warning: Cannot apply tags to missing message: %s (",
 			 message_id);
-		goto NEXT_LINE;
 	    }
 
 	    next = tags;
@@ -525,16 +524,25 @@ restore_command (int argc, char *argv[])
 		tag = strsep (&next, " ");
 		if (*tag == '\0')
 		    continue;
-		status = notmuch_message_add_tag (message, tag);
-		if (status) {
-		    fprintf (stderr, "Error applying tag %s to message %s.\n",
-			     tag, message_id);
+		if (message) {
+		    status = notmuch_message_add_tag (message, tag);
+		    if (status) {
+			fprintf (stderr,
+				 "Error applying tag %s to message %s:\n",
+				 tag, message_id);
+			fprintf (stderr, "%s\n",
+				 notmuch_status_to_string (status));
+		    }
+		} else {
+		    fprintf (stderr, "%s ", tag);
 		}
 	    }
 
-	    notmuch_message_destroy (message);
+	    if (message)
+		notmuch_message_destroy (message);
+	    else
+		fprintf (stderr, ")\n");
 	}
-      NEXT_LINE:
 	free (message_id);
 	free (tags);
     }