X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/59620a0948c8b5a2782400580d1487fb4b9b8d39..73bc51c1347d03e5802a457182eea462ddaeaa5f:/uip/comp.c

diff --git a/uip/comp.c b/uip/comp.c
index 416a8854..e3d87808 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 \
@@ -24,13 +23,14 @@
     X("nouse", 0, NUSESW) \
     X("whatnowproc program", 0, WHATSW) \
     X("nowhatnowproc", 0, NWHATSW) \
+    X("build", 5, BILDSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
     X("to address", 0, TOSW) \
     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,
@@ -69,7 +69,7 @@ static struct swit aqrul[] = {
 int
 main (int argc, char **argv)
 {
-    int use = NOUSE, nedit = 0, nwhat = 0;
+    int use = NOUSE, nedit = 0, nwhat = 0, build = 0;
     int i, in = NOTOK, isdf = 0, out, dat[5], format_len = 0;
     int outputlinelen = OUTPUTLINELEN;
     char *cp, *cwd, *maildir, *dfolder = NULL;
@@ -82,13 +82,7 @@ main (int argc, char **argv)
     struct format *fmt;
     struct stat st;
 
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], 1)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -125,6 +119,10 @@ main (int argc, char **argv)
 			adios (NULL, "missing argument to %s", argp[-2]);
 		    nwhat = 0;
 		    continue;
+
+		case BILDSW:
+		    build++;
+		    /* FALLTHRU */
 		case NWHATSW: 
 		    nwhat++;
 		    continue;
@@ -193,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:
@@ -214,17 +211,15 @@ main (int argc, char **argv)
 	if (*cp == '+' || *cp == '@') {
 	    if (folder)
 		adios (NULL, "only one folder at a time!");
-	    else
-		folder = pluspath (cp);
+            folder = pluspath (cp);
 	} else {
 	    if (msg)
 		adios (NULL, "only one message at a time!");
-	    else
-		msg = cp;
+            msg = cp;
 	}
     }
 
-    cwd = getcpy (pwd ());
+    cwd = mh_xstrdup(pwd ());
 
     if (!context_find ("path"))
 	free (path ("./", TFOLDER));
@@ -256,7 +251,7 @@ main (int argc, char **argv)
 	    adios (maildir, "unable to change directory to");
 
 	/* read folder and create message structure */
-	if (!(mp = folder_read (folder)))
+	if (!(mp = folder_read (folder, 1)))
 	    adios (NULL, "unable to read folder %s", folder);
 
 	/* check for empty folder */
@@ -267,11 +262,12 @@ main (int argc, char **argv)
 	if (!m_convert (mp, msg))
 	    done (1);
 	seq_setprev (mp);	/* set the previous-sequence */
+	seq_save (mp);
 
 	if (mp->numsel > 1)
 	    adios (NULL, "only one message at a time!");
 
-	if ((in = open (form = getcpy (m_name (mp->lowsel)), O_RDONLY)) == NOTOK)
+	if ((in = open (form = mh_xstrdup(m_name (mp->lowsel)), O_RDONLY)) == NOTOK)
 	    adios (form, "unable to open message");
     } else {
 	struct comp *cptr;
@@ -315,12 +311,13 @@ main (int argc, char **argv)
     }
 
 try_it_again:
-    strncpy (drft, m_draft (dfolder, file, use, &isdf), sizeof(drft));
+    strncpy (drft, build ? m_maildir ("draft")
+    			: m_draft (dfolder, file, use, &isdf), sizeof(drft));
 
     /*
      * Check if we have an existing draft
      */
-    if ((out = open (drft, O_RDONLY)) != NOTOK) {
+    if (!build && (out = open (drft, O_RDONLY)) != NOTOK) {
 	i = fdcompare (in, out);
 	close (out);
 
@@ -336,7 +333,8 @@ try_it_again:
 	    adios (drft, "unable to stat");
 	printf ("Draft \"%s\" exists (%ld bytes).", drft, (long) st.st_size);
 	for (i = LISTDSW; i != YESW;) {
-	    if (!(argp = getans ("\nDisposition? ", isdf ? aqrunl : aqrul)))
+	    if (!(argp = read_switch_multiword ("\nDisposition? ",
+						isdf ? aqrunl : aqrul)))
 		done (1);
 	    switch (i = smatch (*argp, isdf ? aqrunl : aqrul)) {
 		case NOSW: 
@@ -358,7 +356,7 @@ try_it_again:
 			i = YESW;
 		    break;
 		default: 
-		    advise (NULL, "say what?");
+		    inform("say what?");
 		    break;
 	    }
 	}
@@ -370,18 +368,21 @@ try_it_again:
     if ((out = creat (drft, m_gmprot ())) == NOTOK)
 	adios (drft, "unable to create");
     if (cp) {
-    	char *scanl;
+	charstring_t scanl;
 
 	i = format_len + 1024;
-	scanl = mh_xmalloc((size_t) i + 2);
+	scanl = charstring_create (i + 2);
 	dat[0] = 0;
 	dat[1] = 0;
 	dat[2] = 0;
 	dat[3] = outputlinelen;
 	dat[4] = 0;
-	fmt_scan(fmt, scanl, i + 1, i, dat, NULL);
-	write(out, scanl, strlen(scanl));
-	free(scanl);
+	fmt_scan(fmt, scanl, i, dat, NULL);
+	if (write(out, charstring_buffer (scanl),
+		  charstring_bytes (scanl)) < 0) {
+	    advise (drft, "write");
+	}
+	charstring_free(scanl);
     } else {
 	cpydata (in, out, form, drft);
 	close (in);
@@ -393,7 +394,7 @@ edit_it:
 
     if (nwhat)
 	done (0);
-    what_now (ed, nedit, use, drft, NULL, 0, NULLMP, NULL, 0, cwd, 0);
+    what_now (ed, nedit, use, drft, NULL, 0, NULL, NULL, 0, cwd, 0);
     done (1);
     return 1;
 }