X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sendlib.c;h=c406c38c94d976b3f659489a423ee4159f1ed674;hp=032078da6d1b04016f7fcd284d27c64d20cfefee;hb=5d5c580eec880d5a67b9d4ab5bc399574dcc285e;hpb=0dbe922d4298aed78dcba64b7c770f315a64505e diff --git a/sendlib.c b/sendlib.c index 032078d..c406c38 100644 --- a/sendlib.c +++ b/sendlib.c @@ -7,44 +7,25 @@ * please see the file GPL in the top level source directory. */ -#define _SENDLIB_C 1 +#include -#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" -#include "mx.h" #include "copy.h" #include "pager.h" #include "charset.h" -#include #include "mutt_idna.h" #ifdef USE_LIBESMTP @@ -52,7 +33,7 @@ #endif /* USE_LIBESMTP */ #ifdef USE_NNTP -#include +#include #endif #ifdef HAVE_SYSEXITS_H @@ -61,19 +42,6 @@ #define EX_OK 0 #endif -/* If you are debugging this file, comment out the following line. */ -/*#define NDEBUG*/ - -#ifdef NDEBUG -#define assert(x) -#else -#include -#endif - -#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 +102,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; @@ -333,6 +301,7 @@ int mutt_write_mime_header (BODY * a, FILE * f) if (a->description) fprintf (f, "Content-Description: %s\n", a->description); +#define DISPOSITION(X) X==DISPATTACH?"attachment":"inline" fprintf (f, "Content-Disposition: %s", DISPOSITION (a->disposition)); if (a->use_disp) { @@ -366,8 +335,6 @@ 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) { const char *p; @@ -416,6 +383,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) @@ -424,6 +392,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); @@ -431,8 +400,6 @@ int mutt_write_mime_body (BODY * a, FILE * f) return (ferror (f) ? -1 : 0); } -#undef write_as_text_part - typedef struct { int from; int whitespace; @@ -550,9 +517,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 @@ -612,11 +576,7 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode, ib = bufi; 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)) { - assert (errno == EILSEQ || - (errno == EINVAL && ib == bufi && ibl < ssizeof (bufi))); + if (n == -1 && ((errno != EINVAL && errno != E2BIG) || ib == bufi)) { ret = -1; break; } @@ -629,8 +589,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 { @@ -1086,10 +1044,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) < @@ -1098,10 +1052,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) @@ -1111,22 +1061,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) { - const char *p = NULL; - - if (b && b->type != TYPETEXT) - return NULL; - - if (b) - p = parameter_getval(b->parameter, "charset"); + const char *p; - if (p) - charset_canonicalize (d, dlen, p); - else - m_strcpy(d, dlen, "us-ascii"); + if (b && b->type != TYPETEXT) + return NULL; - return d; + p = b ? parameter_getval(b->parameter, "charset") : NULL; + charset_canonicalize(d, dlen, p); + return d; } @@ -1239,23 +1183,8 @@ BODY *mutt_make_file_attach (const char *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) { body_list_wipe(&att); return NULL; @@ -1270,15 +1199,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) @@ -1406,6 +1334,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. @@ -1429,7 +1375,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)) @@ -1437,8 +1382,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 */ @@ -1456,7 +1399,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) { @@ -1467,7 +1410,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) { @@ -1480,30 +1423,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 */ @@ -1514,7 +1457,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) @@ -1544,8 +1487,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, ':'))) { @@ -1578,8 +1519,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); } @@ -1661,6 +1600,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 != '%') { @@ -1726,22 +1666,18 @@ 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]; - unsigned int localpart_length; const char *fqdn; - if (!(fqdn = mutt_fqdn (0))) - fqdn = NONULL (Hostname); + if (!(fqdn = mutt_fqdn(0))) + fqdn = NONULL(Hostname); - localpart_length = sizeof (buf) - m_strlen(fqdn) - 4; /* the 4 characters are '<', '@', '>' and '\0' */ - - mutt_gen_localpart (localpart, localpart_length, MsgIdFormat); - - snprintf (buf, sizeof (buf), "<%s@%s>", localpart, fqdn); - return (m_strdup(buf)); + mutt_gen_localpart(localpart, sizeof(localpart), MsgIdFormat); + snprintf(buf, sizeof(buf), "<%s@%s>", localpart, fqdn); + return m_strdup(buf); } static RETSIGTYPE alarm_handler (int sig) @@ -1789,17 +1725,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++) - close (fd); -#elif defined(_POSIX_OPEN_MAX) - for (fd = 0; fd < _POSIX_OPEN_MAX; fd++) + for (fd = 0; fd < getdtablesize(); fd++) close (fd); -#else - close (0); - close (1); - close (2); -#endif /* now the second fork() */ if ((pid = fork ()) == 0) { @@ -1826,7 +1753,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) { @@ -2052,58 +1979,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) { @@ -2254,41 +2129,6 @@ 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) {