X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/939dea68806ab22c29755091b16236b48876442f..5f34de43:/uip/sendsbr.c

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 33dd3451..c0b8105c 100644
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -1,6 +1,4 @@
-
-/*
- * sendsbr.c -- routines to help WhatNow/Send along
+/* sendsbr.c -- routines to help WhatNow/Send along
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -25,7 +23,12 @@
 
 #ifdef OAUTH_SUPPORT
 #include <h/oauth.h>
+#endif
+#include "../sbr/m_maildir.h"
+#include "../sbr/m_mktemp.h"
+#include "../sbr/message_id.h"
 
+#ifdef OAUTH_SUPPORT
 static int setup_oauth_params(char *[], int *, const char *, const char **);
 #endif /* OAUTH_SUPPORT */
 
@@ -191,7 +194,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
     int	compnum, nparts, partno, state, status;
     long pos, start;
     time_t clock;
-    char *cp, *dp, buffer[BUFSIZ], msgid[BUFSIZ];
+    char *cp, *dp, buffer[NMH_BUFSIZ], msgid[BUFSIZ];
     char subject[BUFSIZ];
     char name[NAMESZ], partnum[BUFSIZ];
     FILE *in;
@@ -432,8 +435,8 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st)
 	    snprintf (buf, sizeof(buf), "%d", fd2);
 	    vec[vecp++] = buf;
 	} else {
-	    admonish (NULL, "unable to create temporary file in %s "
-                      "for annotation list", get_temp_dir());
+	    inform("unable to create temporary file in %s for "
+		"annotation list, continuing...", get_temp_dir());
 	}
     }
     vec[vecp++] = drft;
@@ -454,7 +457,7 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st)
 	/*
 	 * child process -- send it
 	 *
-	 * If fd is ok, then we are pushing and fd points to temp
+	 * If fd is OK, then we are pushing and fd points to temp
 	 * file, so capture anything on stdout and stderr there.
 	 */
 	if (fd != NOTOK) {
@@ -484,7 +487,7 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st)
 		alert (drft, fd);
 		close (fd);
 	    } else {
-		advise (NULL, "message not delivered to anyone");
+		inform("message not delivered to anyone");
 	    }
 	    if (annotext && fd2 != NOTOK)
 		close (fd2);
@@ -522,6 +525,7 @@ alert (char *file, int out)
 	case NOTOK:
 	    /* oops -- fork error */
 	    advise ("fork", "unable to");
+	    /* FALLTHRU */
 
 	case OK:
 	    /* child process -- send it */
@@ -586,7 +590,7 @@ tmp_fd (void)
     if ((tfile = m_mktemp2(NULL, invo_name, &fd, NULL)) == NULL) return NOTOK;
 
     if (debugsw)
-	advise (NULL, "temporary file %s selected", tfile);
+	inform("temporary file %s selected", tfile);
     else
 	if (m_unlink (tfile) == NOTOK)
 	    advise (tfile, "unable to remove");
@@ -609,7 +613,7 @@ anno (int fd, struct stat *st)
 		|| st->st_dev != st2.st_dev
 		|| st->st_ino != st2.st_ino)) {
 	if (debugsw)
-	    admonish (NULL, "$mhaltmsg mismatch");
+	    inform("$mhaltmsg mismatch, continuing...");
 	return;
     }
 
@@ -617,10 +621,10 @@ anno (int fd, struct stat *st)
     switch (child_id) {
 	case NOTOK: 		/* oops */
 	    if (!debugsw)
-		advise (NULL,
-			    "unable to fork, so doing annotations by hand...");
+		inform("unable to fork, so doing annotations by hand...");
 	    if (cwd == NULL)
 		cwd = mh_xstrdup(pwd ());
+	    /* FALLTHRU */
 
 	case OK:
 	    /* block a few signals */
@@ -663,7 +667,7 @@ annoaux (int fd)
 
     if ((folder = getenv ("mhfolder")) == NULL || *folder == 0) {
 	if (debugsw)
-	    admonish (NULL, "$mhfolder not set");
+	    inform("$mhfolder not set, continuing...");
 	return;
     }
     maildir = m_maildir (folder);
@@ -674,20 +678,20 @@ annoaux (int fd)
     }
     if (!(mp = folder_read (folder, 0))) {
 	if (debugsw)
-	    admonish (NULL, "unable to read folder %s", folder);
+	    inform("unable to read folder %s, continuing...", folder);
 	return;
     }
 
     /* check for empty folder */
     if (mp->nummsg == 0) {
 	if (debugsw)
-	    admonish (NULL, "no messages in %s", folder);
+	    inform("no messages in %s, continuing...", folder);
 	goto oops;
     }
 
     if ((cp = getenv ("mhmessages")) == NULL || *cp == 0) {
 	if (debugsw)
-	    admonish (NULL, "$mhmessages not set");
+	    inform("$mhmessages not set, continuing...");
 	goto oops;
     }
     if (!debugsw			/* MOBY HACK... */
@@ -706,14 +710,14 @@ annoaux (int fd)
 	dup2 (fd2, fileno (stderr));
     if (mp->numsel == 0) {
 	if (debugsw)
-	    admonish (NULL, "no messages to annotate");
+	    inform("no messages to annotate, continuing...");
 	goto oops;
     }
 
     lseek (fd, (off_t) 0, SEEK_SET);
     if ((fp = fdopen (fd, "r")) == NULL) {
 	if (debugsw)
-	    admonish (NULL, "unable to fdopen annotation list");
+	    inform("unable to fdopen annotation list, continuing...");
 	goto oops;
     }
     cp = NULL;
@@ -722,12 +726,12 @@ annoaux (int fd)
     fclose (fp);
 
     if (debugsw)
-	advise (NULL, "annotate%s with %s: \"%s\"",
+	inform("annotate%s with %s: \"%s\"",
 		inplace ? " inplace" : "", annotext, cp);
     for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
 	if (is_selected(mp, msgnum)) {
 	    if (debugsw)
-		advise (NULL, "annotate message %d", msgnum);
+		inform("annotate message %d", msgnum);
             annotate (m_name (msgnum), annotext, cp, inplace, 1, -2, 0);
 	}
     }
@@ -1010,7 +1014,7 @@ merge_profile_entry(const char *addr, const char *host, char *vec[], int *vecp)
 }
 
 
-static void
+static void NORETURN
 armed_done (int status)
 {
     longjmp (env, status ? status : NOTOK);