Removed a local variable from m_Eom().

[nmh] / uip / sendsbr.c

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index a7c398afbb2f92e2e43c1316c75270228a9bf825..2d4d0a8652c698de0281b6190aa702be40d74185 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -23,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 */
 
@@ -189,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;
@@ -452,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) {
@@ -532,7 +537,7 @@ alert (char *file, int out)
                if ((in = open (file, O_RDONLY)) == NOTOK) {
                    admonish (file, "unable to re-open");
                } else {
-                   lseek (out, (off_t) 0, SEEK_END);
+                   lseek(out, 0, SEEK_END);
                    strncpy (buf, "\nMessage not delivered to anyone.\n", sizeof(buf));
                    if (write (out, buf, strlen (buf)) < 0) {
                        advise (file, "write");
@@ -551,7 +556,7 @@ alert (char *file, int out)
                        admonish (buf, "unable to rename %s to", file);
                }
            }
-           lseek (out, (off_t) 0, SEEK_SET);
+           lseek(out, 0, SEEK_SET);
            dup2 (out, fileno (stdin));
            close (out);
            /* create subject for error notification */
@@ -709,7 +714,7 @@ annoaux (int fd)
        goto oops;
     }
 
-    lseek (fd, (off_t) 0, SEEK_SET);
+    lseek(fd, 0, SEEK_SET);
     if ((fp = fdopen (fd, "r")) == NULL) {
        if (debugsw)
            inform("unable to fdopen annotation list, continuing...");
@@ -882,8 +887,7 @@ get_from_header_info(const char *filename, const char **addr, const char **host,
 
         /* Use the hostformat that corresponds to the successful addrformat. */
         if ((*host = get_message_header_info(in, hostformat)) == NULL) {
-            fclose(in);
-            *message = "unable to find sender host in";
+            *message = "unable to find sender host";
             fclose(in);
             return NOTOK;
         }
@@ -1009,7 +1013,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);