X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/16b794c5709dc07a81534fd90fed5d1f25f3fbea..a37e496eeca84e0ea3fc1c7a95b013541a443cee:/uip/fmttest.c

diff --git a/uip/fmttest.c b/uip/fmttest.c
index 83e5c26d..627123b4 100644
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -11,7 +11,8 @@
 #include <h/utils.h>
 #include <h/scansbr.h>
 #include <h/addrsbr.h>
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
+#include "sbr/terminal.h"
 
 #define FMTTEST_SWITCHES \
     X("form formatfile", 0, FORMSW) \
@@ -270,8 +271,7 @@ main (int argc, char **argv)
 	if (mode == MESSAGE && !files && (*cp == '+' || *cp == '@')) {
 	    if (folder)
 	    	adios (NULL, "only one folder at a time!");
-	    else
-	    	folder = pluspath (cp);
+            folder = pluspath (cp);
 	} else
 	    app_msgarg(&msgs, cp);
     }
@@ -336,7 +336,7 @@ main (int argc, char **argv)
      */
 
     if (dupaddrs == 0 || trace) {
-    	memset(&cb, 0, sizeof(cb));
+    	ZERO(&cb);
 	cbp = &cb;
 
 	if (dupaddrs == 0) {