X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=muttlib.c;h=1dcd5eb1ae1bd48e6bf0c6671d6af2722591c288;hp=9afd5cd6dd04c717037ae4713934b9e97a0d7859;hb=00f34116b32751764d42f81159c292d850c74bac;hpb=f3cbb9f51357972f6e74244494236a41dc4d84cd diff --git a/muttlib.c b/muttlib.c index 9afd5cd..1dcd5eb 100644 --- a/muttlib.c +++ b/muttlib.c @@ -13,24 +13,15 @@ #include #include -#include -#include +#include #include #include -#include +#include #include "alias.h" #include "mutt.h" #include "attach.h" -#include "version.h" - -#include - -#include - -#define SW (option(OPTMBOXPANE)?SidebarWidth:0) - /* Modified by blong to accept a "suggestion" for file name. If * that file exists, then construct one with unique name but * keep any extension. This might fail, I guess. @@ -41,7 +32,7 @@ void mutt_adv_mktemp (const char* dir, char *s, ssize_t l) { int fd; - fd = m_tempfd(s, l, m_strisempty(dir) ? NONULL(Tempdir) : dir, s); + fd = m_tempfd(s, l, m_strisempty(dir) ? NONULL(mod_core.tmpdir) : dir, s); if (fd < 0) { *s = '\0'; } else { @@ -50,114 +41,108 @@ void mutt_adv_mktemp (const char* dir, char *s, ssize_t l) } } -/* returns true if the header contained in "s" is in list "t" */ -int mutt_matches_ignore (const char *s, string_list_t * t) +void mutt_mktemp(char *s) { - for (; t; t = t->next) { - if (!ascii_strncasecmp (s, t->data, m_strlen(t->data)) - || *t->data == '*') - return 1; - } - return 0; + int fd = m_tempfd(s, _POSIX_PATH_MAX, NONULL(mod_core.tmpdir), NULL); + if (fd < 0) { + *s = '\0'; + } else { + close(fd); + unlink(s); + } } -ssize_t _mutt_expand_path(char *s, ssize_t slen, int rx) +ssize_t _mutt_expand_path(char *buf, ssize_t len, const char *s, int rx) { char p[_POSIX_PATH_MAX] = ""; char tmp[_POSIX_PATH_MAX]; const char *tail = ""; + const address_t *alias; - do { - const address_t *alias; - - switch (*s) { - case '~': - if (s[1] == '/' || s[1] == '\0') { - m_strcpy(p, sizeof(p), Homedir); - tail = s + 1; - } else { - struct passwd *pw; - tail = m_strchrnul(s + 1, '/'); + switch (*s) { + case '~': + if (s[1] == '/' || s[1] == '\0') { + m_strcpy(p, sizeof(p), mod_core.homedir); + tail = s + 1; + } else { + struct passwd *pw; + tail = m_strchrnul(s + 1, '/'); - m_strncpy(tmp, sizeof(tmp), s + 1, tail - s - 1); + m_strncpy(tmp, sizeof(tmp), s + 1, tail - s - 1); - if ((pw = getpwnam(tmp))) { - m_strcpy(p, sizeof(p), pw->pw_dir); - } else { - /* user not found! */ - tail = s; - } - } - break; - - case '=': - case '+': - /* if folder = imap[s]://host/: don't append slash */ - if (imap_is_magic(NONULL(Maildir), NULL) == M_IMAP - && Maildir[m_strlen(Maildir) - 1] == '/') { - m_strcpy(p, sizeof(p), Maildir); + if ((pw = getpwnam(tmp))) { + m_strcpy(p, sizeof(p), pw->pw_dir); } else { - snprintf(p, sizeof(p), "%s/", NONULL(Maildir)); + /* user not found! */ + tail = s; } + } + break; - tail = s + 1; - break; - - /* elm compatibility, @ expands alias to user name */ - - case '@': - if ((alias = alias_lookup(s + 1))) { - HEADER h; - header_init(&h); - h.env = envelope_new(); - h.env->from = h.env->to = (address_t *)alias; - mutt_default_save(p, sizeof (p), &h); - h.env->from = h.env->to = NULL; - header_wipe(&h); - - if (*p != '@') { - /* recurse iff the result do not starts with '@' */ - m_strcpy(s, slen, p); - continue; - } - } - break; + case '=': + case '+': + /* if folder = imap[s]://host/: don't append slash */ + if (imap_is_magic(NONULL(Maildir), NULL) == M_IMAP + && Maildir[m_strlen(Maildir) - 1] == '/') { + m_strcpy(p, sizeof(p), Maildir); + } else { + snprintf(p, sizeof(p), "%s/", NONULL(Maildir)); + } - case '>': - m_strcpy(p, sizeof(p), Inbox); - tail = s + 1; - break; + tail = s + 1; + break; - case '<': - m_strcpy(p, sizeof(p), Outbox); - tail = s + 1; - break; + /* elm compatibility, @ expands alias to user name */ - case '!': - if (s[1] == '!') { - m_strcpy(p, sizeof(p), LastFolder); - tail = s + 2; - } else { - m_strcpy(p, sizeof(p), Spoolfile); - tail = s + 1; - } - break; + case '@': + if ((alias = alias_lookup(s + 1))) { + HEADER h; + header_init(&h); + h.env = envelope_new(); + h.env->from = h.env->to = (address_t *)alias; + mutt_default_save(p, sizeof (p), &h); + h.env->from = h.env->to = NULL; + header_wipe(&h); - case '-': - m_strcpy(p, sizeof(p), NONULL(LastFolder)); - tail = s + 1; - break; + if (*p != '@') + return _mutt_expand_path(buf, len, p, rx); + } + break; - case '^': - m_strcpy(p, sizeof(p), NONULL(CurrentFolder)); - tail = s + 1; - break; + case '>': + m_strcpy(p, sizeof(p), Inbox); + tail = s + 1; + break; + + case '<': + m_strcpy(p, sizeof(p), MAlias.record); + tail = s + 1; + break; - default: - *p = '\0'; - tail = s; + case '!': + if (s[1] == '!') { + m_strcpy(p, sizeof(p), LastFolder); + tail = s + 2; + } else { + m_strcpy(p, sizeof(p), Spoolfile); + tail = s + 1; } - } while (0); + break; + + case '-': + m_strcpy(p, sizeof(p), NONULL(LastFolder)); + tail = s + 1; + break; + + case '^': + m_strcpy(p, sizeof(p), NONULL(CurrentFolder)); + tail = s + 1; + break; + + default: + *p = '\0'; + tail = s; + } if (rx) { char q[_POSIX_PATH_MAX]; @@ -167,18 +152,7 @@ ssize_t _mutt_expand_path(char *s, ssize_t slen, int rx) snprintf(tmp, sizeof(tmp), "%s%s", p, tail); } - return m_strcpy(s, slen, tmp); -} - -void mutt_mktemp(char *s) -{ - int fd = m_tempfd(s, _POSIX_PATH_MAX, NONULL(Tempdir), NULL); - if (fd < 0) { - *s = '\0'; - } else { - close(fd); - unlink(s); - } + return m_strcpy(buf, len, tmp); } /* collapse the pathname using ~ or = when possible */ @@ -225,8 +199,8 @@ void mutt_pretty_mailbox (char *s) *s++ = '='; memmove (s, s + len, m_strlen(s + len) + 1); } - else if (m_strncmp(s, Homedir, (len = m_strlen(Homedir))) == 0 && - s[len] == '/') { + else if (m_strncmp(s, mod_core.homedir, (len = m_strlen(mod_core.homedir))) == 0 + && s[len] == '/') { *s++ = '~'; memmove (s, s + len - 1, m_strlen(s + len - 1) + 1); } @@ -304,13 +278,7 @@ int mutt_check_overwrite (const char *attname, const char *path, void mutt_save_path(char *d, ssize_t dsize, address_t *a) { if (a && a->mailbox) { - m_strcpy(d, dsize, a->mailbox); - - if (!option(OPTSAVEADDRESS)) { - char *p = strpbrk(d, "%@"); - if (p) - *p = '\0'; - } + m_strncpy(d, dsize, a->mailbox, strcspn(d, "%@")); m_strtolower(d); } else { *d = '\0'; @@ -328,211 +296,6 @@ void mutt_safe_path(char *s, ssize_t l, address_t *a) } } -void mutt_FormatString (char *dest, /* output buffer */ - ssize_t destlen, /* output buffer len */ - const char *src, /* template string */ - format_t * callback, /* callback for processing */ - unsigned long data, /* callback data */ - format_flag flags) -{ /* callback flags */ - char prefix[SHORT_STRING], buf[LONG_STRING], *cp, *wptr = dest, ch; - char ifstring[SHORT_STRING], elsestring[SHORT_STRING]; - ssize_t wlen, wid, count, col, len; - - prefix[0] = '\0'; - destlen--; /* save room for the terminal \0 */ - wlen = (flags & M_FORMAT_ARROWCURSOR && option (OPTARROWCURSOR)) ? 3 : 0; - col = wlen; - - while (*src && wlen < destlen) { - if (*src == '%') { - if (*++src == '%') { - *wptr++ = '%'; - wlen++; - col++; - src++; - continue; - } - - if (*src == '?') { - flags |= M_FORMAT_OPTIONAL; - src++; - } - else { - flags &= ~M_FORMAT_OPTIONAL; - - /* eat the format string */ - cp = prefix; - count = 0; - while (count < ssizeof (prefix) && - (isdigit ((unsigned char) *src) || *src == '.' || *src == '-')) - { - *cp++ = *src++; - count++; - } - *cp = 0; - } - - if (!*src) - break; /* bad format */ - - ch = *src++; /* save the character to switch on */ - - if (flags & M_FORMAT_OPTIONAL) { - if (*src != '?') - break; /* bad format */ - src++; - - /* eat the `if' part of the string */ - cp = ifstring; - count = 0; - while (count < ssizeof (ifstring) && *src && *src != '?' - && *src != '&') { - *cp++ = *src++; - count++; - } - *cp = 0; - - /* eat the `else' part of the string (optional) */ - if (*src == '&') - src++; /* skip the & */ - cp = elsestring; - count = 0; - while (count < ssizeof (elsestring) && *src && *src != '?') { - *cp++ = *src++; - count++; - } - *cp = 0; - - if (!*src) - break; /* bad format */ - - src++; /* move past the trailing `?' */ - } - - /* handle generic cases first */ - if (ch == '>') { - /* right justify to EOL */ - ch = *src++; /* pad char */ - /* calculate space left on line. if we've already written more data - than will fit on the line, ignore the rest of the line */ - if (DrawFullLine || option (OPTSTATUSONTOP)) - count = (COLS < destlen ? COLS : destlen); - else - count = ((COLS - SW) < destlen ? (COLS - SW) : destlen); - if (count > col) { - count -= col; /* how many columns left on this line */ - mutt_FormatString (buf, sizeof (buf), src, callback, data, flags); - wid = m_strlen(buf); - if (count > wid) { - count -= wid; /* how many chars to pad */ - memset (wptr, ch, count); - wptr += count; - col += count; - } - if (wid + wlen > destlen) - len = destlen - wlen; - else - len = wid; - memcpy (wptr, buf, len); - wptr += len; - wlen += len; - col += mutt_strwidth (buf); - } - break; /* skip rest of input */ - } - else if (ch == '|') { - /* pad to EOL */ - ch = *src++; - if (destlen > COLS) - destlen = COLS; - if (destlen > wlen) { - count = destlen - wlen; - memset (wptr, ch, count); - wptr += count; - } - break; /* skip rest of input */ - } - else { - short lower = 0; - short nodots = 0; - - while (ch == '_' || ch == ':') { - if (ch == '_') - lower = 1; - else if (ch == ':') - nodots = 1; - - ch = *src++; - } - - /* use callback function to handle this case */ - src = - callback (buf, sizeof (buf), ch, src, prefix, ifstring, elsestring, - data, flags); - - if (lower) - m_strtolower(buf); - if (nodots) { - char *p = buf; - - for (; *p; p++) - if (*p == '.') - *p = '_'; - } - - if ((len = m_strlen(buf)) + wlen > destlen) - len = (destlen - wlen > 0) ? (destlen - wlen) : 0; - - memcpy (wptr, buf, len); - wptr += len; - wlen += len; - col += mutt_strwidth (buf); - } - } - else if (*src == '\\') { - if (!*++src) - break; - switch (*src) { - case 'n': - *wptr = '\n'; - break; - case 't': - *wptr = '\t'; - break; - case 'r': - *wptr = '\r'; - break; - case 'f': - *wptr = '\f'; - break; - case 'v': - *wptr = '\v'; - break; - default: - *wptr = *src; - break; - } - src++; - wptr++; - wlen++; - col++; - } - else { - unsigned int bar = strcspn(src, "%\\"); - char *bar2 = p_dupstr(src, bar); - - while (bar--) { - *wptr++ = *src++; - wlen++; - } - col += mutt_strwidth (bar2); - p_delete(&bar2); - } - } - *wptr = 0; -} - /* returns 0 if OK to proceed, -1 to abort, 1 to retry */ int mutt_save_confirm (const char *s, struct stat *st) { @@ -549,14 +312,6 @@ int mutt_save_confirm (const char *s, struct stat *st) return 1; } -#ifdef USE_NNTP - if (magic == M_NNTP) { - mutt_error _("Can't save message to newsserver."); - - return 0; - } -#endif - if (magic > 0 && !mx_access (s, W_OK)) { if (option (OPTCONFIRMAPPEND) && (!TrashPath || (m_strcmp(s, TrashPath) != 0))) { @@ -594,8 +349,6 @@ int mutt_save_confirm (const char *s, struct stat *st) } } } - - CLEARLINE (LINES - 1); return (ret); } @@ -604,17 +357,10 @@ void mutt_sleep (short s) sleep(MAX(s, SleepTime)); } -const char *mutt_make_version (int full) +const char *mutt_make_version(void) { static char vstring[STRING]; - - if (full) - snprintf (vstring, sizeof (vstring), - "Madmutt/%s-r%s (based on Mutt 1.5.11)", - MUTT_VERSION, MUTT_REVISION); - else - snprintf (vstring, sizeof (vstring), "Madmutt/%s-%s", - MUTT_VERSION, MUTT_REVISION); + snprintf(vstring, sizeof (vstring), "Madmutt/%s", MUTT_VERSION); return vstring; } @@ -725,7 +471,6 @@ int mutt_extract_token(BUFFER *dest, BUFFER *tok, int flags) if ((ISSPACE(ch) && !(flags & M_TOKEN_SPACE)) || (ch == '#' && !(flags & M_TOKEN_COMMENT)) || (ch == '=' && (flags & M_TOKEN_EQUAL)) - || (ch == ';' && !(flags & M_TOKEN_SEMICOLON)) || ((flags & M_TOKEN_PATTERN) && strchr("~=!|", ch))) { break; @@ -750,7 +495,7 @@ int mutt_extract_token(BUFFER *dest, BUFFER *tok, int flags) if (!*tok->dptr) return -1; /* premature end of token */ mutt_buffer_addch(dest, - (ascii_toupper(*tok->dptr) - 'A' + 1) & 0x7f); + (toupper((unsigned char)*tok->dptr) - 'A' + 1) & 0x7f); tok->dptr++; break; case 'r': @@ -792,7 +537,7 @@ int mutt_extract_token(BUFFER *dest, BUFFER *tok, int flags) mutt_buffer_addch(dest, '\033'); } else if (isalpha((unsigned char)ch)) { - mutt_buffer_addch(dest, ascii_toupper(ch) - 'A' + 1); + mutt_buffer_addch(dest, toupper((unsigned char)ch) - 'A' + 1); } else { mutt_buffer_addch(dest, '^'); mutt_buffer_addch(dest, ch);