X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sendlib.c;h=0a63e3454ce891c1c51527a2a7ed5b286e60504b;hp=0f676b901b55b1ce75f53470afa277ba0bb118b0;hb=3132c5f07ae687b5daac6b570347369967850863;hpb=fc854762626c5e2dce8c5618860a882934ec81d2 diff --git a/sendlib.c b/sendlib.c index 0f676b9..0a63e34 100644 --- a/sendlib.c +++ b/sendlib.c @@ -12,6 +12,7 @@ #include #include +#include #include #include #include @@ -339,8 +340,8 @@ int mutt_write_mime_header (BODY * a, FILE * f) int mutt_write_mime_body (BODY * a, FILE * f) { const char *p; - char boundary[SHORT_STRING]; - char send_charset[SHORT_STRING]; + char boundary[STRING]; + char send_charset[STRING]; FILE *fpin; BODY *t; fgetconv_t *fc; @@ -982,7 +983,7 @@ static void transform_to_7bit (BODY * a, FILE * fpin) transform_to_7bit (a->parts, fpin); } - else if (mutt_is_message_type (a->type, a->subtype)) { + else if (mutt_is_message_type(a)) { mutt_message_to_7bit (a, fpin); } else { @@ -1018,7 +1019,7 @@ static void transform_to_7bit (BODY * a, FILE * fpin) /* determine which Content-Transfer-Encoding to use */ static void mutt_set_encoding (BODY * b, CONTENT * info) { - char send_charset[SHORT_STRING]; + char send_charset[STRING]; if (b->type == TYPETEXT) { char *chsname = @@ -1279,9 +1280,7 @@ mutt_write_address_list(address_t *addr, FILE *fp, int linelen, int display) while (addr) { char buf[LONG_STRING]; - int len; - - len = rfc822_write_address_single(buf, ssizeof(buf), addr, display); + int len = rfc822_addrcpy(buf, ssizeof(buf), addr, display); if (!first) { if (linelen + len > 74) { @@ -1378,7 +1377,7 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach, */ if (env->from && !privacy) { buffer[0] = 0; - rfc822_write_address (buffer, sizeof (buffer), env->from, 0); + rfc822_addrcat(buffer, sizeof(buffer), env->from, 0); fprintf (fp, "From: %s\n", buffer); } @@ -1507,7 +1506,7 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach, os = (uname(&un) == -1) ? "UNIX" : un.sysname; } /* Add a vanity header */ - fprintf (fp, "User-Agent: %s (%s)\n", mutt_make_version (0), os); + fprintf (fp, "User-Agent: %s (%s)\n", mutt_make_version(), os); } return (ferror (fp) == 0 ? 0 : -1); @@ -1551,8 +1550,7 @@ const char *mutt_fqdn (short may_hide_host) p++; /* sanity check: don't hide the host if - * the fqdn is something like detebe.org. - */ + the fqdn is something like detebe.org. */ if (!p || !(q = strchr (p, '.'))) p = Fqdn; @@ -1653,8 +1651,8 @@ static void mutt_gen_localpart(char *buf, unsigned int len, const char *fmt) static char *mutt_gen_msgid (void) { - char buf[SHORT_STRING]; - char localpart[SHORT_STRING]; + char buf[STRING]; + char localpart[STRING]; const char *fqdn; if (!(fqdn = mutt_fqdn(0))) @@ -1730,8 +1728,7 @@ send_msg(const char *path, const char **args, const char *msg, char **tempfile) /* redirect stderr to *tempfile too */ if (dup (1) < 0) _exit (S_ERR); - } - else { + } else { if (open ("/dev/null", O_WRONLY | O_APPEND) < 0) /* stdout */ _exit (S_ERR); if (open ("/dev/null", O_RDWR | O_APPEND) < 0) /* stderr */ @@ -1773,8 +1770,7 @@ send_msg(const char *path, const char **args, const char *msg, char **tempfile) unlink (*tempfile); /* no longer needed */ p_delete(tempfile); } - } - else { + } else { st = (SendmailWait > 0 && errno == EINTR && SigAlrm) ? S_BKG : S_ERR; if (SendmailWait > 0) { unlink (*tempfile); @@ -1836,32 +1832,29 @@ static int mutt_invoke_sendmail (address_t * from, /* the sender */ const char *msg, /* file containing message */ int eightbit) { /* message contains 8bit chars */ - char *ps = NULL, *path = NULL, *s = NULL, *childout = NULL; + char cmd[LONG_STRING]; + char *ps = NULL, *path = NULL, *childout = NULL; const char **args = NULL; ssize_t argslen = 0, argsmax = 0; int i; #ifdef USE_NNTP if (option (OPTNEWSSEND)) { - char cmd[LONG_STRING]; - - mutt_FormatString (cmd, sizeof (cmd), NONULL (Inews), nntp_format_str, 0, - 0); + m_strformat(cmd, sizeof(cmd), 0, Inews, nntp_format_str, 0, 0); if (m_strisempty(cmd)) { i = nntp_post (msg); unlink (msg); return i; } - - s = m_strdup(cmd); - } - else + } else #endif - s = m_strdup(Sendmail); + { + mlua_value(cmd, sizeof(cmd), "madmutt", "sendmail"); + } - ps = s; + ps = cmd; i = 0; - while ((ps = strtok (ps, " "))) { + while ((ps = strtok(ps, " "))) { if (argslen == argsmax) p_realloc(&args, argsmax += 5); @@ -1936,7 +1929,6 @@ static int mutt_invoke_sendmail (address_t * from, /* the sender */ p_delete(&childout); p_delete(&path); - p_delete(&s); p_delete(&args); if (i == (EX_OK & 0xff)) @@ -2005,20 +1997,20 @@ void mutt_prepare_envelope (ENVELOPE * env, int final) void mutt_unprepare_envelope (ENVELOPE * env) { - string_list_t *item; + string_list_t *item; - for (item = env->userhdrs; item; item = item->next) - rfc2047_decode (&item->data); + for (item = env->userhdrs; item; item = item->next) + rfc2047_decode(&item->data); - address_list_wipe(&env->mail_followup_to); + address_list_wipe(&env->mail_followup_to); - /* back conversions */ - rfc2047_decode_adrlist (env->to); - rfc2047_decode_adrlist (env->cc); - rfc2047_decode_adrlist (env->bcc); - rfc2047_decode_adrlist (env->from); - rfc2047_decode_adrlist (env->reply_to); - rfc2047_decode (&env->subject); + /* back conversions */ + rfc2047_decode_adrlist(env->to); + rfc2047_decode_adrlist(env->cc); + rfc2047_decode_adrlist(env->bcc); + rfc2047_decode_adrlist(env->from); + rfc2047_decode_adrlist(env->reply_to); + rfc2047_decode(&env->subject); } static int _mutt_bounce_message (FILE * fp, HEADER * h, address_t * to, @@ -2026,7 +2018,7 @@ static int _mutt_bounce_message (FILE * fp, HEADER * h, address_t * to, { int i, ret = 0; FILE *f; - char date[SHORT_STRING], tempfile[_POSIX_PATH_MAX]; + char date[STRING], tempfile[_POSIX_PATH_MAX]; MESSAGE *msg = NULL; if (!h) { @@ -2078,7 +2070,6 @@ static int _mutt_bounce_message (FILE * fp, HEADER * h, address_t * to, int mutt_bounce_message (FILE * fp, HEADER * h, address_t * to) { address_t *from; - const char *fqdn = mutt_fqdn (1); char resent_from[STRING]; int ret; char *err; @@ -2086,15 +2077,14 @@ int mutt_bounce_message (FILE * fp, HEADER * h, address_t * to) resent_from[0] = '\0'; from = mutt_default_from (); - if (fqdn) - rfc822_qualify (from, fqdn); + rfc822_qualify(from, mutt_fqdn(1)); - rfc2047_encode_adrlist (from, "Resent-From"); + rfc2047_encode_adrlist(from, "Resent-From"); if (mutt_addrlist_to_idna (from, &err)) { mutt_error (_("Bad IDN %s while preparing resent-from."), err); return -1; } - rfc822_write_address (resent_from, sizeof (resent_from), from, 0); + rfc822_addrcat(resent_from, sizeof(resent_from), from, 0); #ifdef USE_NNTP unset_option (OPTNEWSSEND); @@ -2155,8 +2145,7 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid, /* post == 1 => postpone message. Set mode = -1 in mutt_write_rfc822_header() * post == 0 => Normal mode. Set mode = 0 in mutt_write_rfc822_header() * */ - mutt_write_rfc822_header (msg->fp, hdr->env, hdr->content, post ? -post : 0, - 0); + mutt_write_rfc822_header(msg->fp, hdr->env, hdr->content, -post, 0); /* (postponment) if this was a reply of some sort, contians the * Message-ID: of message replied to. Save it using a special X-Mutt- @@ -2174,8 +2163,6 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid, fprintf (msg->fp, "X-Mutt-Fcc: %s\n", fcc); fprintf (msg->fp, "Status: RO\n"); - - /* (postponment) if the mail is to be signed or encrypted, save this info */ if (post && (hdr->security & APPLICATION_PGP)) { fputs ("X-Mutt-PGP: ", msg->fp); @@ -2263,8 +2250,7 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid, /* if there was an error, leave the temp version */ if (!r) unlink (tempfile); - } - else { + } else { fputc ('\n', msg->fp); /* finish off the header */ r = mutt_write_mime_body (hdr->content, msg->fp); }