From a742b680bdba8cb47d2b81ab3397cdbec7ed5b69 Mon Sep 17 00:00:00 2001 From: Pierre Habouzit Date: Thu, 16 Nov 2006 09:37:41 +0100 Subject: [PATCH] some dead code, old things, fix idna *again* Signed-off-by: Pierre Habouzit --- alias.c | 3 +- commands.c | 2 +- compose.c | 4 +-- init.c | 3 +- mutt_idna.c | 4 +-- mutt_idna.h | 4 +-- recvcmd.c | 2 +- send.c | 6 ++-- sendlib.c | 83 ++++++----------------------------------------------- sort.c | 2 +- 10 files changed, 24 insertions(+), 89 deletions(-) diff --git a/alias.c b/alias.c index 7706be0..4602176 100644 --- a/alias.c +++ b/alias.c @@ -251,7 +251,7 @@ void mutt_create_alias(ENVELOPE *cur, address_t *iadr) mutt_addrlist_to_idna(adr, NULL); do { - const char *err = NULL; + char *err = NULL; if (mutt_get_field(_("Address: "), buf, sizeof(buf), 0) || !buf[0]) { alias_list_wipe(&new); @@ -264,6 +264,7 @@ void mutt_create_alias(ENVELOPE *cur, address_t *iadr) if (mutt_addrlist_to_idna(new->addr, &err)) { mutt_error(_("Error: '%s' is a bad IDN."), err); + p_delete(&err); mutt_sleep(1); continue; } diff --git a/commands.c b/commands.c index b521342..6a05985 100644 --- a/commands.c +++ b/commands.c @@ -240,7 +240,7 @@ void ci_bounce_message (HEADER * h, int *redraw) char prompt[SHORT_STRING]; char buf[HUGE_STRING] = { 0 }; address_t *adr = NULL; - const char *err = NULL; + char *err = NULL; int rc; if (h) diff --git a/compose.c b/compose.c index de3e38b..f6039fb 100644 --- a/compose.c +++ b/compose.c @@ -313,7 +313,7 @@ static void draw_envelope (HEADER * msg, char *fcc) static int edit_address_list (int line, address_t ** addr) { char buf[HUGE_STRING] = ""; /* needs to be large for alias expansion */ - const char *err = NULL; + char *err = NULL; mutt_addrlist_to_local (*addr); rfc822_write_address (buf, sizeof (buf), *addr, 0); @@ -701,7 +701,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ if ((op == OP_COMPOSE_EDIT_HEADERS || (op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS)))) { const char *tag = NULL; - const char *err = NULL; + char *err = NULL; mutt_env_to_local (msg->env); mutt_edit_headers (NONULL (Editor), msg->content->filename, msg, diff --git a/init.c b/init.c index 4fe7d96..a40194d 100644 --- a/init.c +++ b/init.c @@ -1405,7 +1405,7 @@ static int parse_alias (BUFFER * buf, BUFFER * s, { alias_t *tmp = Aliases; alias_t *last = NULL; - const char *estr = NULL; + char *estr = NULL; if (!MoreArgs (s)) { m_strcpy(err->data, err->dsize, _("alias: no address")); @@ -1446,6 +1446,7 @@ static int parse_alias (BUFFER * buf, BUFFER * s, if (mutt_addrlist_to_idna (tmp->addr, &estr)) { snprintf (err->data, err->dsize, _("Warning: Bad IDN '%s' in alias '%s'.\n"), estr, tmp->name); + p_delete(&estr); return -1; } diff --git a/mutt_idna.c b/mutt_idna.c index 2950ff5..c5f791e 100644 --- a/mutt_idna.c +++ b/mutt_idna.c @@ -136,7 +136,7 @@ static int mbox_to_udomain (const char *mbx, char **user, char **domain) return 0; } -int mutt_addrlist_to_idna (address_t * a, const char **err) +int mutt_addrlist_to_idna (address_t * a, char **err) { char *user = NULL, *domain = NULL; char *tmp = NULL; @@ -249,7 +249,7 @@ void mutt_env_to_local (ENVELOPE * e) if (tag) *tag = #a; e = 1; err = NULL; \ } -int mutt_env_to_idna (ENVELOPE * env, const char **tag, const char **err) +int mutt_env_to_idna (ENVELOPE * env, const char **tag, char **err) { int e = 0; diff --git a/mutt_idna.h b/mutt_idna.h index b047e4b..58dbd2f 100644 --- a/mutt_idna.h +++ b/mutt_idna.h @@ -22,11 +22,11 @@ int mutt_idna_to_local (const char *, char **, int); int mutt_local_to_idna (const char *, char **); -int mutt_addrlist_to_idna (address_t *, const char **); +int mutt_addrlist_to_idna (address_t *, char **); int mutt_addrlist_to_local (address_t *); void mutt_env_to_local (ENVELOPE *); -int mutt_env_to_idna (ENVELOPE *, const char **, const char **); +int mutt_env_to_idna (ENVELOPE *, const char **, char **); const char *mutt_addr_for_display (address_t * a); diff --git a/recvcmd.c b/recvcmd.c index 79f42d0..046f83d 100644 --- a/recvcmd.c +++ b/recvcmd.c @@ -126,7 +126,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)), short i; char prompt[STRING]; char buf[HUGE_STRING]; - const char *err = NULL; + char *err = NULL; address_t *adr = NULL; int ret = 0; int p = 0; diff --git a/send.c b/send.c index 546cfb3..fd0341b 100644 --- a/send.c +++ b/send.c @@ -183,7 +183,7 @@ static address_t *find_mailing_lists (address_t * t, address_t * c) static int edit_address (address_t ** a, const char *field) { char buf[HUGE_STRING]; - const char *err = NULL; + char *err = NULL; int idna_ok = 0; do { @@ -1099,8 +1099,8 @@ int ci_send_message (int flags, /* send mode */ char *pgpkeylist = NULL; /* save current value of "pgp_sign_as" */ - char *signas = NULL; - const char *tag = NULL, *err = NULL; + char *signas = NULL, *err = NULL; + const char *tag = NULL; char *ctype; int rv = -1; diff --git a/sendlib.c b/sendlib.c index 032078d..e5bb57f 100644 --- a/sendlib.c +++ b/sendlib.c @@ -72,8 +72,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 +132,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; @@ -550,9 +548,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 @@ -613,8 +608,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; @@ -629,8 +623,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 +1078,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 +1086,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) @@ -1661,6 +1645,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 != '%') { @@ -1826,7 +1811,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 +2037,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) { @@ -2261,18 +2194,18 @@ address_t *mutt_remove_duplicates (address_t * addr) address_t *top = addr; address_t **last = ⊤ address_t *tmp; - int dup; + int dodup = 0; while (addr) { - for (tmp = top, dup = 0; tmp && tmp != addr; tmp = tmp->next) { + for (tmp = top; tmp && tmp != addr; tmp = tmp->next) { if (tmp->mailbox && addr->mailbox && !ascii_strcasecmp (addr->mailbox, tmp->mailbox)) { - dup = 1; + dodup = 1; break; } } - if (dup) { + if (dodup) { *last = addr->next; addr->next = NULL; diff --git a/sort.c b/sort.c index 6b6d737..9798823 100644 --- a/sort.c +++ b/sort.c @@ -90,7 +90,7 @@ int compare_subject (const void *a, const void *b) const char *mutt_get_name (address_t * a) { - address_t *ali; + const address_t *ali; const char *name = ""; if (a) { -- 2.20.1