X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/de4636bb664106d9932ae7acb517e471b848f1f3..bcb443a54dc3e08c2aa51fa1dd414cf2023fc037:/uip/whatnowsbr.c

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 86ff81df..90a2cf2e 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -644,7 +644,7 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
 {
     int pid, status, vecp;
     char altpath[BUFSIZ], linkpath[BUFSIZ];
-    char *cp, *vec[MAXARGS];
+    char *cp, *prog, **vec;
     struct stat st;
 
 #ifdef HAVE_LSTAT
@@ -665,8 +665,8 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
 	}
     } else {
 	/* set initial editor */
-	if (*ed == NULL && (*ed = context_find ("editor")) == NULL)
-	    *ed = defaulteditor;
+	if (*ed == NULL)
+	    *ed = get_default_editor();
     }
 
     if (altmsg) {
@@ -697,7 +697,7 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
     context_save ();	/* save the context file */
     fflush (stdout);
 
-    switch (pid = vfork()) {
+    switch (pid = fork()) {
 	case NOTOK:
 	    advise ("fork", "unable to");
 	    status = NOTOK;
@@ -712,15 +712,15 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
 		m_putenv ("editalt", altpath);
 	    }
 
-	    vecp = 0;
-	    vec[vecp++] = r1bindex (*ed, '/');
+	    vec = argsplit(*ed, &prog, &vecp);
+
 	    if (arg)
 		while (*arg)
 		    vec[vecp++] = *arg++;
 	    vec[vecp++] = file;
 	    vec[vecp] = NULL;
 
-	    execvp (*ed, vec);
+	    execvp (prog, vec);
 	    fprintf (stderr, "unable to exec ");
 	    perror (*ed);
 	    _exit (-1);
@@ -845,7 +845,7 @@ sendfile (char **arg, char *file, int pushsw)
     context_save ();	/* save the context file */
     fflush (stdout);
 
-    for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
+    for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
 	sleep (5);
     switch (child_id) {
 	case NOTOK:
@@ -924,14 +924,15 @@ check_draft (char *msgnam)
     int	state;
     char buf[BUFSIZ], name[NAMESZ];
     FILE *fp;
+    m_getfld_state_t gstate = 0;
 
     if ((fp = fopen (msgnam, "r")) == NULL)
 	return 0;
-    for (state = FLD;;)
-	switch (state = m_getfld (state, name, buf, sizeof(buf), fp)) {
+    for (;;) {
+	int bufsz = sizeof buf;
+	switch (state = m_getfld (&gstate, name, buf, &bufsz, fp)) {
 	    case FLD:
 	    case FLDPLUS:
-	    case FLDEOF:
 		/*
 		 * If draft already contains any of the
 		 * Content-XXX fields, then assume it already
@@ -939,10 +940,13 @@ check_draft (char *msgnam)
 		 */
 	        if (uprf (name, XXX_FIELD_PRF)) {
 		    fclose (fp);
+		    m_getfld_state_destroy (&gstate);
 		    return 0;
 		}
-		while (state == FLDPLUS)
-		    state = m_getfld (state, name, buf, sizeof(buf), fp);
+		while (state == FLDPLUS) {
+		    bufsz = sizeof buf;
+		    state = m_getfld (&gstate, name, buf, &bufsz, fp);
+		}
 		break;
 
 	    case BODY:
@@ -952,17 +956,21 @@ check_draft (char *msgnam)
 		    for (bp = buf; *bp; bp++)
 			if (*bp != ' ' && *bp != '\t' && *bp != '\n') {
 			    fclose (fp);
+			    m_getfld_state_destroy (&gstate);
 			    return 1;
 			}
 
-		    state = m_getfld (state, name, buf, sizeof(buf), fp);
+		    bufsz = sizeof buf;
+		    state = m_getfld (&gstate, name, buf, &bufsz, fp);
 		} while (state == BODY);
 		/* and fall... */
 
 	    default:
 		fclose (fp);
+		m_getfld_state_destroy (&gstate);
 		return 0;
 	}
+    }
 }
 
 
@@ -1325,7 +1333,7 @@ whomfile (char **arg, char *file)
     context_save ();	/* save the context file */
     fflush (stdout);
 
-    switch (pid = vfork()) {
+    switch (pid = fork()) {
 	case NOTOK:
 	    advise ("fork", "unable to");
 	    return 1;