X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/ef3d1c488ff7104fc473561ff066f242077b4e6b..60899a188e74f0f2ee293f6eb629e3b81b71ac9f:/uip/comp.c?ds=sidebyside

diff --git a/uip/comp.c b/uip/comp.c
index a98e24e2..1e4ffa2a 100644
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -1,6 +1,4 @@
-
-/*
- * comp.c -- compose a message
+/* comp.c -- compose a message
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -10,6 +8,7 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <h/fmt_scan.h>
+#include "../sbr/m_maildir.h"
 #include <fcntl.h>
 
 #define COMP_SWITCHES \
@@ -31,7 +30,7 @@
     X("cc address", 0, CCSW) \
     X("from address", 0, FROMSW) \
     X("fcc mailbox", 0, FCCSW) \
-    X("width colums", 0, WIDTHSW) \
+    X("width columns", 0, WIDTHSW) \
     X("subject text", 0, SUBJECTSW) \
 
 #define X(sw, minchars, id) id,
@@ -123,7 +122,7 @@ main (int argc, char **argv)
 
 		case BILDSW:
 		    build++;
-		    /* fall through */
+		    /* FALLTHRU */
 		case NWHATSW: 
 		    nwhat++;
 		    continue;
@@ -192,8 +191,7 @@ main (int argc, char **argv)
 		    if (*cp == '@')
 			cp = dp = path(cp + 1, TSUBCWF);
 		    fcc = addlist(fcc, cp);
-		    if (dp)
-			free(dp);
+                    mh_xfree(dp);
 		    continue;
 
 		case WIDTHSW:
@@ -360,7 +358,7 @@ try_it_again:
 			i = YESW;
 		    break;
 		default: 
-		    advise (NULL, "say what?");
+		    inform("say what?");
 		    break;
 	    }
 	}