path.c: Re-format path() to make it more clear what's happening.

[nmh] / uip / fmttest.c

diff --git a/uip/fmttest.c b/uip/fmttest.c
index 83e5c26d99c6b79e8b9152bcb9e2fef2c6439299..627123b483ab1ae4e3489a2f551a928bcecfef81 100644 (file)
--- 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) {