Rewrite norm_charmap(), moving code into data.

[nmh] / uip / sendsbr.c

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 792ac12f7243f3be5b5f6c0ae539437ec9816106..c0b8105c827dd80b852c00668b64b9bad184a2a8 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -23,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 */
 


@@ -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;
     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;


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