X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=muttlib.c;h=7e89aff0ff6c72cec08eddc8174e03a60437cb47;hp=6d8b87418f17e497f893c7d27e6c17dbc579a017;hb=28dbd9fbf148be07366048163fffbf7f55a57def;hpb=03fe827a7d4a7ad79ac235654414aa339a9a2c9a diff --git a/muttlib.c b/muttlib.c index 6d8b874..7e89aff 100644 --- a/muttlib.c +++ b/muttlib.c @@ -12,16 +12,18 @@ # include "config.h" #endif -#include #include -#include -#include -#include #include -#include #include -#include +#include +#include +#include +#include +#include #include +#include +#include +#include #include #include @@ -30,16 +32,16 @@ #include #include #include -#include +#include #include #include #include +#include "alias.h" #include "mutt.h" #include "mx.h" -#include "url.h" #include "attach.h" #include "version.h" @@ -67,12 +69,12 @@ BODY *mutt_new_body (void) * Renamed to mutt_adv_mktemp so I only have to change where it's * called, and not all possible cases. */ -void mutt_adv_mktemp (const char* dir, char *s, size_t l) +void mutt_adv_mktemp (const char* dir, char *s, ssize_t l) { char buf[_POSIX_PATH_MAX]; char tmp[_POSIX_PATH_MAX]; char *period; - size_t sl; + ssize_t sl; struct stat sb; m_strcpy(buf, sizeof(buf), m_strisempty(dir) ? NONULL(Tempdir) : dir); @@ -176,13 +178,10 @@ void mutt_free_body (BODY ** p) a = a->next; if (b->parameter) - parameter_delete(&b->parameter); + parameter_list_wipe(&b->parameter); if (b->unlink && b->filename) { - debug_print (1, ("unlinking %s.\n", b->filename)); unlink (b->filename); } - else if (b->filename) - debug_print (1, ("not unlinking %s.\n", b->filename)); p_delete(&b->filename); p_delete(&b->content); @@ -216,7 +215,7 @@ HEADER *mutt_dup_header (HEADER * h) } /* returns true if the header contained in "s" is in list "t" */ -int mutt_matches_ignore (const char *s, LIST * t) +int mutt_matches_ignore (const char *s, string_list_t * t) { for (; t; t = t->next) { if (!ascii_strncasecmp (s, t->data, m_strlen(t->data)) @@ -230,7 +229,7 @@ int mutt_matches_ignore (const char *s, LIST * t) void mutt_expand_link (char *newpath, const char *path, const char *lnk) { const char *lb = NULL; - size_t len; + ssize_t len; /* lnk is full path */ if (*lnk == '/') { @@ -249,12 +248,12 @@ void mutt_expand_link (char *newpath, const char *path, const char *lnk) m_strcpy(newpath + len, _POSIX_PATH_MAX - len, lnk); } -char *mutt_expand_path (char *s, size_t slen) +char *mutt_expand_path (char *s, ssize_t slen) { return _mutt_expand_path (s, slen, 0); } -char *_mutt_expand_path (char *s, size_t slen, int rx) +char *_mutt_expand_path (char *s, ssize_t slen, int rx) { char p[_POSIX_PATH_MAX] = ""; char q[_POSIX_PATH_MAX] = ""; @@ -320,9 +319,10 @@ char *_mutt_expand_path (char *s, size_t slen, int rx) case '@': { HEADER *h; + /* FIXME: BUG ? */ address_t *alias; - if ((alias = mutt_lookup_alias (s + 1))) { + if ((alias = alias_lookup(s + 1))) { h = header_new(); h->env = envelope_new(); h->env->from = h->env->to = alias; @@ -387,7 +387,7 @@ char *_mutt_expand_path (char *s, size_t slen, int rx) } if (rx && *p && !recurse) { - mutt_rx_sanitize_string (q, sizeof (q), p); + rx_sanitize_string (q, sizeof (q), p); snprintf (tmp, sizeof (tmp), "%s%s", q, tail); } else @@ -400,51 +400,6 @@ char *_mutt_expand_path (char *s, size_t slen, int rx) return (s); } -/* Extract the real name from /etc/passwd's GECOS field. - * When set, honor the regular expression in GecosMask, - * otherwise assume that the GECOS field is a - * comma-separated list. - * Replace "&" by a capitalized version of the user's login - * name. - */ - -char *mutt_gecos_name (char *dest, ssize_t destlen, struct passwd *pw) -{ - regmatch_t pat_match[1]; - ssize_t pwnl; - int idx; - char *p; - - if (!pw || !pw->pw_gecos) - return NULL; - - p_clear(dest, destlen); - - if (GecosMask.rx) { - if (regexec (GecosMask.rx, pw->pw_gecos, 1, pat_match, 0) == 0) - m_strcpy(dest, MIN(pat_match[0].rm_eo - pat_match[0].rm_so + 1, destlen), - pw->pw_gecos + pat_match[0].rm_so); - } - else if ((p = strchr (pw->pw_gecos, ','))) - m_strcpy(dest, MIN(destlen, p - pw->pw_gecos + 1), pw->pw_gecos); - else - m_strcpy(dest, destlen, pw->pw_gecos); - - pwnl = m_strlen(pw->pw_name); - - for (idx = 0; dest[idx]; idx++) { - if (dest[idx] == '&') { - memmove (&dest[idx + pwnl], &dest[idx + 1], - MAX (destlen - idx - pwnl - 1, 0)); - memcpy (&dest[idx], pw->pw_name, MIN (destlen - idx - 1, pwnl)); - dest[idx] = toupper ((unsigned char) dest[idx]); - } - } - - return dest; -} - - char *mutt_get_parameter (const char *s, PARAMETER * p) { for (; p; p = p->next) @@ -486,7 +441,7 @@ void mutt_delete_parameter (const char *attribute, PARAMETER ** p) if (ascii_strcasecmp (attribute, q->attribute) == 0) { *p = q->next; q->next = NULL; - parameter_delete(&q); + parameter_list_wipe(&q); return; } } @@ -579,7 +534,7 @@ void mutt_merge_envelopes(ENVELOPE* base, ENVELOPE** extra) /* spam and user headers should never be hashed, and the new envelope may * have better values. Use new versions regardless. */ mutt_buffer_free (&base->spam); - mutt_free_list (&base->userhdrs); + string_list_wipe(&base->userhdrs); MOVE_ELEM(spam); MOVE_ELEM(userhdrs); #undef MOVE_ELEM @@ -593,28 +548,14 @@ void _mutt_mktemp (char *s, const char *src, int line) snprintf (s, _POSIX_PATH_MAX, "%s/madmutt-%s-%d-%d-%d-%x%x", NONULL (Tempdir), NONULL (Hostname), (int) getuid (), (int) getpid (), Counter++, (unsigned int) rand(), (unsigned int) rand()); - debug_print (1, ("%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s)); unlink (s); } -void mutt_free_alias (ALIAS ** p) -{ - ALIAS *t; - - while (*p) { - t = *p; - *p = (*p)->next; - p_delete(&t->name); - address_delete (&t->addr); - p_delete(&t); - } -} - /* collapse the pathname using ~ or = when possible */ void mutt_pretty_mailbox (char *s) { char *p = s, *q = s; - size_t len; + ssize_t len; url_scheme_t scheme; scheme = url_check_scheme (s); @@ -661,7 +602,7 @@ void mutt_pretty_mailbox (char *s) } } -void mutt_pretty_size (char *s, size_t len, long n) +void mutt_pretty_size (char *s, ssize_t len, long n) { if (n == 0) m_strcpy(s, len, "0K"); @@ -680,7 +621,7 @@ void mutt_pretty_size (char *s, size_t len, long n) } } -void mutt_expand_file_fmt (char *dest, size_t destlen, const char *fmt, +void mutt_expand_file_fmt (char *dest, ssize_t destlen, const char *fmt, const char *src) { char tmp[LONG_STRING]; @@ -689,12 +630,12 @@ void mutt_expand_file_fmt (char *dest, size_t destlen, const char *fmt, mutt_expand_fmt (dest, destlen, fmt, tmp); } -void mutt_expand_fmt (char *dest, size_t destlen, const char *fmt, +void mutt_expand_fmt (char *dest, ssize_t destlen, const char *fmt, const char *src) { const char *p; char *d; - size_t slen; + ssize_t slen; int found = 0; slen = m_strlen(src); @@ -737,7 +678,7 @@ void mutt_expand_fmt (char *dest, size_t destlen, const char *fmt, /* return 0 on success, -1 on abort, 1 on error */ int mutt_check_overwrite (const char *attname, const char *path, - char *fname, size_t flen, int *append, + char *fname, ssize_t flen, int *append, char **directory) { int rc = 0; @@ -805,7 +746,7 @@ int mutt_check_overwrite (const char *attname, const char *path, return 0; } -void mutt_save_path (char *d, size_t dsize, address_t * a) +void mutt_save_path (char *d, ssize_t dsize, address_t * a) { if (a && a->mailbox) { m_strcpy(d, dsize, a->mailbox); @@ -821,7 +762,7 @@ void mutt_save_path (char *d, size_t dsize, address_t * a) *d = 0; } -void mutt_safe_path (char *s, size_t l, address_t * a) +void mutt_safe_path (char *s, ssize_t l, address_t * a) { char *p; @@ -1262,11 +1203,8 @@ int mutt_match_spam_list (const char *s, SPAM_LIST * l, char *text, int x) } /* Does this pattern match? */ - if (regexec - (l->rx->rx, s, (size_t) l->nmatch, (regmatch_t *) pmatch, - (int) 0) == 0) { - debug_print (5, ("%s matches %s\n%d subst", s, l->rx->pattern, l->rx->rx->re_nsub)); - + if (regexec(l->rx->rx, s, l->nmatch, (regmatch_t *)pmatch, (int) 0) == 0) + { /* Copy template into text, with substitutions. */ for (p = l->template; *p;) { if (*p == '%') { @@ -1281,7 +1219,6 @@ int mutt_match_spam_list (const char *s, SPAM_LIST * l, char *text, int x) } } text[tlen] = '\0'; - debug_print (5, ("\"%s\"\n", text)); return 1; } } @@ -1330,7 +1267,7 @@ int mutt_cmp_addr (const address_t * a, const address_t * b) return (1); } -int mutt_cmp_list (const LIST * a, const LIST * b) +int mutt_cmp_list (const string_list_t * a, const string_list_t * b) { while (a && b) { if (m_strcmp(a->data, b->data))