X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/751542a19198f2efa957b77ce41d82479952af62..63621a81d16ab743de6b57d47578a9a2c670ad22:/uip/post.c

diff --git a/uip/post.c b/uip/post.c
index a02b0711..69fe6b86 100644
--- a/uip/post.c
+++ b/uip/post.c
@@ -15,8 +15,8 @@
 #include <h/utils.h>
 #include <h/tws.h>
 #include <h/mts.h>
-#include "../sbr/m_mktemp.h"
-#include "../sbr/message_id.h"
+#include "sbr/m_mktemp.h"
+#include "sbr/message_id.h"
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
@@ -290,7 +290,7 @@ static char *partno = NULL;
 static void putfmt (char *, char *, int *, FILE *);
 static void start_headers (void);
 static void finish_headers (FILE *);
-static int get_header (char *, struct headers *);
+static int get_header (char *, struct headers *) PURE;
 static int putadr (char *, char *, struct mailname *, FILE *, unsigned int,
 		   char *, unsigned int);
 static void putgrp (char *, char *, FILE *, unsigned int);
@@ -301,7 +301,7 @@ static int annoaux (struct mailname *);
 static void insert_fcc (struct headers *, char *);
 static void make_bcc_file (int);
 static void verify_all_addresses (int, int, char *, int, char *);
-static void chkadr (void);
+static void chkadr (void) PURE;
 static void sigon (void);
 static void sigoff (void);
 static void p_refile (char *);
@@ -1512,8 +1512,7 @@ make_bcc_file (int dashstuff)
      * of MIME encapsulation.
      */
     if (filter != NULL) {
-	for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
-	    sleep (5);
+	child_id = fork();
 	switch (child_id) {
 	    case NOTOK: 
 		adios ("fork", "unable to");
@@ -1669,7 +1668,7 @@ static void
 post (char *file, int bccque, int talk, int eai, char *envelope,
       int oauth_flag, char *auth_svc)
 {
-    int	retval, i;
+    int retval;
     pid_t child_id;
 
     if (verbose) {
@@ -1686,8 +1685,7 @@ post (char *file, int bccque, int talk, int eai, char *envelope,
 	char **argp, *program;
 	int argc;
 
-	for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
-	    sleep (5);
+	child_id = fork();
 	switch (child_id) {
 	    case NOTOK: 
 		adios ("fork", "unable to");
@@ -1806,7 +1804,7 @@ verify_all_addresses (int talk, int eai, char *envelope, int oauth_flag,
 	puts(" -- Address Verification Successful --");
 
     if (!whomsw || checksw)
-	sm_end (DONE);
+	sm_end (whomsw ? OK : DONE);
 
     fflush (stdout);
     sigoff ();
@@ -1982,7 +1980,7 @@ static void
 fcc (char *file, char *folder)
 {
     pid_t child_id;
-    int i, status, argp;
+    int status, argp;
     char fold[BUFSIZ];
     char **arglist, *program;
 
@@ -1990,9 +1988,7 @@ fcc (char *file, char *folder)
 	printf ("  %sFcc %s: ", msgstate == RESENT ? "Resent-" : "", folder);
     fflush (stdout);
 
-    for (i = 0; (child_id = fork ()) == NOTOK && i < 5; i++)
-	sleep (5);
-
+    child_id = fork();
     switch (child_id) {
 	case NOTOK: 
 	    if (!verbose)