X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sendlib.c;h=6f40ea15b0c42fd0f04032beff8ad49061aa7f27;hp=e92b825374bd4c76ef484b2debd32933381f52dd;hb=284454918cc95058b026d057195eaa5279135c36;hpb=01bd0a7410e476abaebf03d820bcf31a5ec4c7c0 diff --git a/sendlib.c b/sendlib.c index e92b825..6f40ea1 100644 --- a/sendlib.c +++ b/sendlib.c @@ -9,34 +9,18 @@ #define _SENDLIB_C 1 -#if HAVE_CONFIG_H -# include "config.h" -#endif +#include -#include -#include -#include -#include -#include -#include #include -#include -#include #include -#include -#include -#include -#include -#include - #include #include - #include - #include +#include + #include "mutt.h" #include "handler.h" #include "recvattach.h" @@ -44,7 +28,6 @@ #include "copy.h" #include "pager.h" #include "charset.h" -#include #include "mutt_idna.h" #ifdef USE_LIBESMTP @@ -72,8 +55,6 @@ #define DISPOSITION(X) X==DISPATTACH?"attachment":"inline" -static char MsgIdPfx = 'A'; - static void transform_to_7bit (BODY * a, FILE * fpin); static void encode_quoted (fgetconv_t * fc, FILE * fout, int istext) @@ -134,7 +115,7 @@ static void encode_quoted (fgetconv_t * fc, FILE * fout, int istext) fputs (line, fout); } else { - int savechar = line[linelen - 1]; + savechar = line[linelen - 1]; line[linelen - 1] = '='; line[linelen] = 0; @@ -284,7 +265,7 @@ int mutt_write_mime_header (BODY * a, FILE * f) fprintf (f, "Content-Type: %s/%s", TYPE (a), a->subtype); if (a->parameter) { - PARAMETER *p; + parameter_t *p; len = 25 + m_strlen(a->subtype); /* approximate len. of content-type */ @@ -366,11 +347,10 @@ int mutt_write_mime_header (BODY * a, FILE * f) return (ferror (f) ? -1 : 0); } -# define write_as_text_part(a) (mutt_is_text_part(a) || mutt_is_application_pgp(a)) - int mutt_write_mime_body (BODY * a, FILE * f) { - char *p, boundary[SHORT_STRING]; + const char *p; + char boundary[SHORT_STRING]; char send_charset[SHORT_STRING]; FILE *fpin; BODY *t; @@ -378,7 +358,7 @@ int mutt_write_mime_body (BODY * a, FILE * f) if (a->type == TYPEMULTIPART) { /* First, find the boundary to use */ - if (!(p = mutt_get_parameter ("boundary", a->parameter))) { + if (!(p = parameter_getval(a->parameter, "boundary"))) { mutt_error _("No boundary parameter found! [report this error]"); return (-1); @@ -415,6 +395,7 @@ int mutt_write_mime_body (BODY * a, FILE * f) else fc = fgetconv_open (fpin, 0, 0, 0); +#define write_as_text_part(a) (mutt_is_text_part(a) || mutt_is_application_pgp(a)) if (a->encoding == ENCQUOTEDPRINTABLE) encode_quoted (fc, f, write_as_text_part (a)); else if (a->encoding == ENCBASE64) @@ -423,6 +404,7 @@ int mutt_write_mime_body (BODY * a, FILE * f) encode_8bit (fc, f, write_as_text_part (a)); else mutt_copy_stream (fpin, f); +#undef write_as_text_part fgetconv_close (&fc); fclose (fpin); @@ -430,23 +412,6 @@ int mutt_write_mime_body (BODY * a, FILE * f) return (ferror (f) ? -1 : 0); } -#undef write_as_text_part - -#define BOUNDARYLEN 16 -void mutt_generate_boundary (PARAMETER ** parm) -{ - char rs[BOUNDARYLEN + 1]; - char *p = rs; - int i; - - rs[BOUNDARYLEN] = 0; - for (i = 0; i < BOUNDARYLEN; i++) - *p++ = __m_b64chars[lrand48() % sizeof(__m_b64chars)]; - *p = 0; - - mutt_set_parameter ("boundary", rs, parm); -} - typedef struct { int from; int whitespace; @@ -564,9 +529,6 @@ static void update_content_info (CONTENT * info, CONTENT_STATE * s, char *d, } -/* Define as 1 if iconv sometimes returns -1(EILSEQ) instead of transcribing. */ -#define BUGGY_ICONV 1 - /* * Find the best charset conversion of the file from fromcode into one * of the tocodes. If successful, set *tocode and CONTENT *info and @@ -627,8 +589,7 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode, ob = bufu, obl = sizeof (bufu); n = my_iconv(cd1, ibl ? &ib : 0, &ibl, &ob, &obl); assert (n == -1 || !n); - if (n == -1 && - ((errno != EINVAL && errno != E2BIG) || ib == bufi)) { + if (n == -1 && ((errno != EINVAL && errno != E2BIG) || ib == bufi)) { assert (errno == EILSEQ || (errno == EINVAL && ib == bufi && ibl < ssizeof (bufi))); ret = -1; @@ -643,8 +604,6 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode, ob = bufo, obl = sizeof (bufo); n = my_iconv(cd[i], (ibl || ubl) ? &ub : 0, &ubl, &ob, &obl); if (n == -1) { - assert (errno == E2BIG || - (BUGGY_ICONV && (errno == EILSEQ || errno == ENOENT))); score[i] = -1; } else { @@ -820,7 +779,7 @@ CONTENT *mutt_get_content_info (const char *fname, BODY * b) p_clear(&state, 1); if (b != NULL && b->type == TYPETEXT && (!b->noconv && !b->force_charset)) { - char *chs = mutt_get_parameter ("charset", b->parameter); + const char *chs = parameter_getval(b->parameter, "charset"); char *fchs = b->use_disp ? ((FileCharset && *FileCharset) ? FileCharset : Charset) : Charset; if (Charset && (chs || SendCharset) && @@ -828,7 +787,7 @@ CONTENT *mutt_get_content_info (const char *fname, BODY * b) &fromcode, &tocode, info) != -1) { if (!chs) { charset_canonicalize (chsbuf, sizeof (chsbuf), tocode); - mutt_set_parameter ("charset", chsbuf, &b->parameter); + parameter_setval(&b->parameter, "charset", chsbuf); } b->file_charset = fromcode; p_delete(&tocode); @@ -845,10 +804,9 @@ CONTENT *mutt_get_content_info (const char *fname, BODY * b) safe_fclose (&fp); if (b != NULL && b->type == TYPETEXT && (!b->noconv && !b->force_charset)) - mutt_set_parameter ("charset", (!info->hibin ? "us-ascii" : - Charset - && !charset_is_us_ascii (Charset) ? Charset : - "unknown-8bit"), &b->parameter); + parameter_setval(&b->parameter, "charset", + (!info->hibin ? "us-ascii" + : Charset && !charset_is_us_ascii(Charset) ? Charset : "unknown-8bit")); return info; } @@ -1020,7 +978,7 @@ cleanup: return; } a->length = sb.st_size; - mutt_free_body (&a->parts); + body_list_wipe(&a->parts); a->hdr->content = NULL; } @@ -1101,10 +1059,6 @@ static void mutt_set_encoding (BODY * b, CONTENT * info) && ascii_strcasecmp (b->subtype, "pgp-keys") == 0) b->encoding = ENC7BIT; else -#if 0 - if (info->lobin || info->hibin || info->binary || info->linemax > 990 - || info->cr || ( /* option (OPTENCODEFROM) && */ info->from)) -#endif { /* Determine which encoding is smaller */ if (1.33 * (float) (info->lobin + info->hibin + info->ascii) < @@ -1113,10 +1067,6 @@ static void mutt_set_encoding (BODY * b, CONTENT * info) else b->encoding = ENCQUOTEDPRINTABLE; } -#if 0 - else - b->encoding = ENC7BIT; -#endif } void mutt_stamp_attachment (BODY * a) @@ -1126,22 +1076,16 @@ void mutt_stamp_attachment (BODY * a) /* Get a body's character set */ -char *mutt_get_body_charset (char *d, ssize_t dlen, BODY * b) +char *mutt_get_body_charset(char *d, ssize_t dlen, BODY * b) { - char *p = NULL; - - if (b && b->type != TYPETEXT) - return NULL; + const char *p; - if (b) - p = mutt_get_parameter ("charset", b->parameter); + if (b && b->type != TYPETEXT) + return NULL; - if (p) - charset_canonicalize (d, dlen, NONULL (p)); - else - m_strcpy(d, dlen, "us-ascii"); - - return d; + p = b ? parameter_getval(b->parameter, "charset") : NULL; + charset_canonicalize(d, dlen, p); + return d; } @@ -1156,7 +1100,7 @@ void mutt_update_encoding (BODY * a) a->noconv = 0; if (!a->force_charset && !a->noconv) - mutt_delete_parameter ("charset", &a->parameter); + parameter_delval(&a->parameter, "charset"); if ((info = mutt_get_content_info (a->filename, a)) == NULL) return; @@ -1187,7 +1131,7 @@ BODY *mutt_make_message_attach (CONTEXT * ctx, HEADER * hdr, int attach_msg) if ((fp = safe_fopen (buffer, "w+")) == NULL) return NULL; - body = mutt_new_body (); + body = body_new(); body->type = TYPEMESSAGE; body->subtype = m_strdup("rfc822"); body->filename = m_strdup(buffer); @@ -1248,31 +1192,16 @@ BODY *mutt_make_file_attach (const char *path) BODY *att; CONTENT *info; - att = mutt_new_body (); + att = body_new(); att->filename = m_strdup(path); /* Attempt to determine the appropriate content-type based on the filename * suffix. */ - -#if 0 - - if ((n = - mutt_lookup_mime_type (buf, sizeof (buf), xbuf, sizeof (xbuf), - path)) != TYPEOTHER || *xbuf != '\0') { - att->type = n; - att->subtype = m_strdup(buf); - att->xtype = m_strdup(xbuf); - } - -#else - mutt_lookup_mime_type (att, path); -#endif - if ((info = mutt_get_content_info (path, att)) == NULL) { - mutt_free_body (&att); + body_list_wipe(&att); return NULL; } @@ -1285,15 +1214,14 @@ BODY *mutt_make_file_attach (const char *path) */ att->type = TYPETEXT; att->subtype = m_strdup("plain"); - } - else { + } else { att->type = TYPEAPPLICATION; att->subtype = m_strdup("octet-stream"); } } mutt_update_encoding (att); - return (att); + return att; } static int get_toplevel_encoding (BODY * a) @@ -1314,11 +1242,11 @@ BODY *mutt_make_multipart (BODY * b) { BODY *new; - new = mutt_new_body (); + new = body_new(); new->type = TYPEMULTIPART; new->subtype = m_strdup("mixed"); new->encoding = get_toplevel_encoding (b); - mutt_generate_boundary (&new->parameter); + parameter_set_boundary(&new->parameter); new->use_disp = 0; new->disposition = DISPINLINE; new->parts = b; @@ -1335,7 +1263,7 @@ BODY *mutt_remove_multipart (BODY * b) t = b; b = b->parts; t->parts = NULL; - mutt_free_body (&t); + body_list_wipe(&t); } return b; } @@ -1421,6 +1349,24 @@ void mutt_write_references (string_list_t * r, FILE * f) p_delete(&ref); } +static int edit_header(int mode, const char *s) +{ + const char *p; + int slen = m_strlen(s); + + if (mode != 1 || option(OPTXMAILTO)) + return 1; + + p = skipspaces(EditorHeaders); + while (*p) { + if (!ascii_strncasecmp(p, s, slen) && p[slen - 1] == ':') + return 1; + p = skipspaces(p + slen); + } + + return 0; +} + /* Note: all RFC2047 encoding should be done outside of this routine, except * for the "real name." This will allow this routine to be used more than * once, if necessary. @@ -1444,7 +1390,6 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach, char *p; string_list_t *tmp = env->userhdrs; int has_agent = 0; /* user defined user-agent header field exists */ - list2_t* hdrs = list_from_str (EditorHeaders, " "); #ifdef USE_NNTP if (!option (OPTNEWSSEND)) @@ -1452,8 +1397,6 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach, if (mode == 0 && !privacy) fputs (mutt_make_date (buffer, sizeof (buffer)), fp); -#define EDIT_HEADER(x) (mode != 1 || option(OPTXMAILTO) || (mode == 1 && list_lookup(hdrs,(list_lookup_t*) ascii_strcasecmp,x) >= 0)) - /* OPTUSEFROM is not consulted here so that we can still write a From: * field if the user sets it with the `my_hdr' command */ @@ -1471,7 +1414,7 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach, #ifdef USE_NNTP if (!option (OPTNEWSSEND)) #endif - if (EDIT_HEADER("To:")) + if (edit_header(mode, "To:")) fputs ("To:\n", fp); if (env->cc) { @@ -1482,7 +1425,7 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach, #ifdef USE_NNTP if (!option (OPTNEWSSEND)) #endif - if (EDIT_HEADER("Cc:")) + if (edit_header(mode, "Cc:")) fputs ("Cc:\n", fp); if (env->bcc) { @@ -1495,30 +1438,30 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach, #ifdef USE_NNTP if (!option (OPTNEWSSEND)) #endif - if (EDIT_HEADER("Bcc:")) + if (edit_header(mode, "Bcc:")) fputs ("Bcc:\n", fp); #ifdef USE_NNTP if (env->newsgroups) fprintf (fp, "Newsgroups: %s\n", env->newsgroups); - else if (mode == 1 && option (OPTNEWSSEND) && EDIT_HEADER("Newsgroups:")) + else if (mode == 1 && option (OPTNEWSSEND) && edit_header(mode, "Newsgroups:")) fputs ("Newsgroups:\n", fp); if (env->followup_to) fprintf (fp, "Followup-To: %s\n", env->followup_to); - else if (mode == 1 && option (OPTNEWSSEND) && EDIT_HEADER("Followup-To:")) + else if (mode == 1 && option (OPTNEWSSEND) && edit_header(mode, "Followup-To:")) fputs ("Followup-To:\n", fp); if (env->x_comment_to) fprintf (fp, "X-Comment-To: %s\n", env->x_comment_to); else if (mode == 1 && option (OPTNEWSSEND) && option (OPTXCOMMENTTO) && - EDIT_HEADER("X-Comment-To:")) + edit_header(mode, "X-Comment-To:")) fputs ("X-Comment-To:\n", fp); #endif if (env->subject) fprintf (fp, "Subject: %s\n", env->subject); - else if (mode == 1 && EDIT_HEADER("Subject:")) + else if (mode == 1 && edit_header(mode, "Subject:")) fputs ("Subject:\n", fp); /* save message id if the user has set it */ @@ -1529,7 +1472,7 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach, fputs ("Reply-To: ", fp); mutt_write_address_list (env->reply_to, fp, 10, 0); } - else if (mode > 0 && EDIT_HEADER("Reply-To:")) + else if (mode > 0 && edit_header(mode, "Reply-To:")) fputs ("Reply-To:\n", fp); if (env->mail_followup_to) @@ -1559,8 +1502,6 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach, fputc ('\n', fp); } -#undef EDIT_HEADER - /* Add any user defined headers */ for (; tmp; tmp = tmp->next) { if ((p = strchr (tmp->data, ':'))) { @@ -1593,8 +1534,6 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach, fprintf (fp, "User-Agent: %s (%s)\n", mutt_make_version (0), os); } - list_del (&hdrs, (list_del_t*)xmemfree); - return (ferror (fp) == 0 ? 0 : -1); } @@ -1676,6 +1615,7 @@ static void mutt_gen_localpart(char *buf, unsigned int len, const char *fmt) tm = gmtime (&now); while (*fmt) { + static char MsgIdPfx = 'A'; int c = *fmt++; if (c != '%') { @@ -1741,7 +1681,7 @@ static void mutt_gen_localpart(char *buf, unsigned int len, const char *fmt) #undef APPEND_FMT } -char *mutt_gen_msgid (void) +static char *mutt_gen_msgid (void) { char buf[SHORT_STRING]; char localpart[SHORT_STRING]; @@ -1804,17 +1744,8 @@ send_msg(const char *path, const char **args, const char *msg, char **tempfile) setsid (); /* next we close all open files */ -#if defined(OPEN_MAX) - for (fd = 0; fd < OPEN_MAX; fd++) + for (fd = 0; fd < getdtablesize(); fd++) close (fd); -#elif defined(_POSIX_OPEN_MAX) - for (fd = 0; fd < _POSIX_OPEN_MAX; fd++) - close (fd); -#else - close (0); - close (1); - close (2); -#endif /* now the second fork() */ if ((pid = fork ()) == 0) { @@ -1841,7 +1772,7 @@ send_msg(const char *path, const char **args, const char *msg, char **tempfile) _exit (S_ERR); } - execv (path, args); + execv (path, (char**)args); _exit (S_ERR); } else if (pid == -1) { @@ -2067,58 +1998,6 @@ int mutt_invoke_mta (address_t * from, /* the sender */ return mutt_invoke_sendmail (from, to, cc, bcc, msg, eightbit); } -/* appends string 'b' to string 'a', and returns the pointer to the new - string. */ -char *mutt_append_string (char *a, const char *b) -{ - ssize_t la = m_strlen(a); - - p_realloc(&a, la + m_strlen(b) + 1); - strcpy (a + la, b); /* __STRCPY_CHECKED__ */ - return (a); -} - -/* returns 1 if char `c' needs to be quoted to protect from shell - interpretation when executing commands in a subshell */ -#define INVALID_CHAR(c) (!isalnum ((unsigned char)c) && !strchr ("@.+-_,:", c)) - -/* returns 1 if string `s' contains characters which could cause problems - when used on a command line to execute a command */ -int mutt_needs_quote (const char *s) -{ - while (*s) { - if (INVALID_CHAR (*s)) - return 1; - s++; - } - return 0; -} - -/* Quote a string to prevent shell escapes when this string is used on the - command line to send mail. */ -char *mutt_quote_string (const char *s) -{ - char *r, *pr; - ssize_t rlen; - - rlen = m_strlen(s) + 3; - pr = r = p_new(char, rlen); - *pr++ = '"'; - while (*s) { - if (INVALID_CHAR (*s)) { - ssize_t o = pr - r; - - p_realloc(&r, ++rlen); - pr = r + o; - *pr++ = '\\'; - } - *pr++ = *s++; - } - *pr++ = '"'; - *pr = 0; - return (r); -} - /* For postponing (!final) do the necessary encodings only */ void mutt_prepare_envelope (ENVELOPE * env, int final) { @@ -2269,51 +2148,13 @@ int mutt_bounce_message (FILE * fp, HEADER * h, address_t * to) return ret; } - -/* given a list of addresses, return a list of unique addresses */ -address_t *mutt_remove_duplicates (address_t * addr) -{ - address_t *top = addr; - address_t **last = ⊤ - address_t *tmp; - int dup; - - while (addr) { - for (tmp = top, dup = 0; tmp && tmp != addr; tmp = tmp->next) { - if (tmp->mailbox && addr->mailbox && - !ascii_strcasecmp (addr->mailbox, tmp->mailbox)) { - dup = 1; - break; - } - } - - if (dup) { - *last = addr->next; - - addr->next = NULL; - address_list_wipe(&addr); - - addr = *last; - } - else { - last = &addr->next; - addr = addr->next; - } - } - - return (top); -} - static void set_noconv_flags (BODY * b, short flag) { for (; b; b = b->next) { if (b->type == TYPEMESSAGE || b->type == TYPEMULTIPART) set_noconv_flags (b->parts, flag); else if (b->type == TYPETEXT && b->noconv) { - if (flag) - mutt_set_parameter ("x-mutt-noconv", "yes", &b->parameter); - else - mutt_delete_parameter ("x-mutt-noconv", &b->parameter); + parameter_setval(&b->parameter, "x-mutt-noconv", flag ? "yes" : NULL); } } }