Replaced snprintf() to convert an int with m_name().

[nmh] / uip / sendsbr.c

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 1acb7dc0499fbcf799baeed6b2061ec17e8ee6b9..2d4d0a8652c698de0281b6190aa702be40d74185 100644 (file)
--- 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
  *
  * 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>
 
 #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 */
 
 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;
     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;
     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 {
            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;
        }
     }
     vec[vecp++] = drft;


@@ -454,7 +457,7 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st)
        /*
         * child process -- send it
         *
        /*
         * 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) {
         * file, so capture anything on stdout and stderr there.
         */
        if (fd != NOTOK) {


@@ -534,7 +537,7 @@ alert (char *file, int out)
                if ((in = open (file, O_RDONLY)) == NOTOK) {
                    admonish (file, "unable to re-open");
                } else {
                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");
                    strncpy (buf, "\nMessage not delivered to anyone.\n", sizeof(buf));
                    if (write (out, buf, strlen (buf)) < 0) {
                        advise (file, "write");


@@ -553,7 +556,7 @@ alert (char *file, int out)
                        admonish (buf, "unable to rename %s to", file);
                }
            }
                        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 */
            dup2 (out, fileno (stdin));
            close (out);
            /* create subject for error notification */


@@ -610,7 +613,7 @@ anno (int fd, struct stat *st)
                || st->st_dev != st2.st_dev
                || st->st_ino != st2.st_ino)) {
        if (debugsw)
                || st->st_dev != st2.st_dev
                || st->st_ino != st2.st_ino)) {
        if (debugsw)

-           admonish (NULL, "$mhaltmsg mismatch");
+           inform("$mhaltmsg mismatch, continuing...");

        return;
     }
 
        return;
     }
 


@@ -664,7 +667,7 @@ annoaux (int fd)
 
     if ((folder = getenv ("mhfolder")) == NULL || *folder == 0) {
        if (debugsw)
 
     if ((folder = getenv ("mhfolder")) == NULL || *folder == 0) {
        if (debugsw)

-           admonish (NULL, "$mhfolder not set");
+           inform("$mhfolder not set, continuing...");

        return;
     }
     maildir = m_maildir (folder);
        return;
     }
     maildir = m_maildir (folder);


@@ -675,20 +678,20 @@ annoaux (int fd)
     }
     if (!(mp = folder_read (folder, 0))) {
        if (debugsw)
     }
     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)
        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)
        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... */
        goto oops;
     }
     if (!debugsw                       /* MOBY HACK... */


@@ -707,14 +710,14 @@ annoaux (int fd)
        dup2 (fd2, fileno (stderr));
     if (mp->numsel == 0) {
        if (debugsw)
        dup2 (fd2, fileno (stderr));
     if (mp->numsel == 0) {
        if (debugsw)

-           admonish (NULL, "no messages to annotate");
+           inform("no messages to annotate, continuing...");

        goto oops;
     }
 
        goto oops;
     }
 

-    lseek (fd, (off_t) 0, SEEK_SET);
+    lseek(fd, 0, SEEK_SET);

     if ((fp = fdopen (fd, "r")) == NULL) {
        if (debugsw)
     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;
        goto oops;
     }
     cp = NULL;


@@ -884,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) {
 
         /* 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;
         }
             fclose(in);
             return NOTOK;
         }


@@ -1011,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);
 armed_done (int status)
 {
     longjmp (env, status ? status : NOTOK);