X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=rfc1524.c;h=bc954c7b09f9819a41e2bb9c9b245d6a470c87ca;hp=86ffc062f5c0372f9aa6f8512db75b50d3ad3a8b;hb=4282401a0bcdc285a228da4ad635cbf7baf71488;hpb=bbc4fd52516a8afefbd14c77e34f8389d6f0a6ed diff --git a/rfc1524.c b/rfc1524.c index 86ffc06..bc954c7 100644 --- a/rfc1524.c +++ b/rfc1524.c @@ -21,16 +21,6 @@ # include "config.h" #endif -#include "mutt.h" -#include "ascii.h" -#include "rfc1524.h" -#include "attach.h" - -#include "lib/mem.h" -#include "lib/intl.h" -#include "lib/str.h" -#include "lib/debug.h" - #include #include #include @@ -40,6 +30,19 @@ #include #include +#include +#include +#include +#include +#include +#include + +#include + +#include "mutt.h" +#include "rfc1524.h" +#include "attach.h" + /* The command semantics include the following: * %s is the filename that contains the mail body data * %t is the content type, like text/plain @@ -61,12 +64,12 @@ int rfc1524_expand_command (BODY * a, char *filename, char *_type, char buf[LONG_STRING]; char type[LONG_STRING]; - strfcpy (type, _type, sizeof (type)); + m_strcpy(type, sizeof(type), _type); if (option (OPTMAILCAPSANITIZE)) mutt_sanitize_filename (type, 0); - while (command[x] && x < clen && y < sizeof (buf)) { + while (command[x] && x < clen && y < ssizeof (buf)) { if (command[x] == '\\') { x++; buf[y++] = command[x++]; @@ -80,12 +83,12 @@ int rfc1524_expand_command (BODY * a, char *filename, char *_type, int z = 0; x++; - while (command[x] && command[x] != '}' && z < sizeof (param)) + while (command[x] && command[x] != '}' && z < ssizeof (param)) param[z++] = command[x++]; param[z] = '\0'; _pvalue = mutt_get_parameter (param, a->parameter); - strfcpy (pvalue, NONULL (_pvalue), sizeof (pvalue)); + m_strcpy(pvalue, sizeof(pvalue), NONULL(_pvalue)); if (option (OPTMAILCAPSANITIZE)) mutt_sanitize_filename (pvalue, 0); @@ -104,7 +107,7 @@ int rfc1524_expand_command (BODY * a, char *filename, char *_type, buf[y++] = command[x++]; } buf[y] = '\0'; - strfcpy (command, buf, clen); + m_strcpy(command, clen, buf); return needspipe; } @@ -125,24 +128,23 @@ static char *get_field (char *s) s++; } else { - *ch++ = 0; - SKIPWS (ch); + *ch++ = '\0'; + ch = vskipspaces(ch); break; } } - str_skip_trailws (s); + m_strrtrim(s); return ch; } static int get_field_text (char *field, char **entry, char *type, char *filename, int line) { - field = str_skip_initws (field); + field = vskipspaces(field); if (*field == '=') { if (entry) { - field++; - field = str_skip_initws (field); - str_replace (entry, field); + field = vskipspaces(field + 1); + m_strreplace(entry, field); } return 1; } @@ -159,7 +161,7 @@ static int rfc1524_mailcap_parse (BODY * a, { FILE *fp; char *buf = NULL; - size_t buflen; + ssize_t buflen; char *ch; char *field; int found = FALSE; @@ -187,7 +189,7 @@ static int rfc1524_mailcap_parse (BODY * a, btlen = ch - type; if ((fp = fopen (filename, "r")) != NULL) { - while (!found && (buf = mutt_read_line (buf, &buflen, fp, &line)) != NULL) { + while (!found && (buf = mutt_read_line(buf, &buflen, fp, &line)) != NULL) { /* ignore comments */ if (*buf == '#') continue; @@ -196,14 +198,14 @@ static int rfc1524_mailcap_parse (BODY * a, /* check type */ ch = get_field (buf); if (ascii_strcasecmp (buf, type) && (ascii_strncasecmp (buf, type, btlen) || (buf[btlen] != 0 && /* implicit wild */ - str_cmp (buf + btlen, "/*")))) /* wildsubtype */ + m_strcmp(buf + btlen, "/*")))) /* wildsubtype */ continue; /* next field is the viewcommand */ field = ch; ch = get_field (ch); if (entry) - entry->command = str_dup (field); + entry->command = m_strdup(field); /* parse the optional fields */ found = TRUE; @@ -263,18 +265,18 @@ static int rfc1524_mailcap_parse (BODY * a, * if this is the right entry. */ char *test_command = NULL; - size_t len; + ssize_t len; if (get_field_text (field + 4, &test_command, type, filename, line) && test_command) { - len = str_len (test_command) + STRING; - mem_realloc (&test_command, len); + len = m_strlen(test_command) + STRING; + p_realloc(&test_command, len); rfc1524_expand_command (a, a->filename, type, test_command, len); if (mutt_system (test_command)) { /* a non-zero exit code means test failed */ found = FALSE; } - mem_free (&test_command); + p_delete(&test_command); } } } /* while (ch) */ @@ -299,13 +301,13 @@ static int rfc1524_mailcap_parse (BODY * a, if (!found) { /* reset */ if (entry) { - mem_free (&entry->command); - mem_free (&entry->composecommand); - mem_free (&entry->composetypecommand); - mem_free (&entry->editcommand); - mem_free (&entry->printcommand); - mem_free (&entry->nametemplate); - mem_free (&entry->convert); + p_delete(&entry->command); + p_delete(&entry->composecommand); + p_delete(&entry->composetypecommand); + p_delete(&entry->editcommand); + p_delete(&entry->printcommand); + p_delete(&entry->nametemplate); + p_delete(&entry->convert); entry->needsterminal = 0; entry->copiousoutput = 0; } @@ -313,27 +315,27 @@ static int rfc1524_mailcap_parse (BODY * a, } /* while (!found && (buf = mutt_read_line ())) */ fclose (fp); } /* if ((fp = fopen ())) */ - mem_free (&buf); + p_delete(&buf); return found; } rfc1524_entry *rfc1524_new_entry (void) { - return (rfc1524_entry *) mem_calloc (1, sizeof (rfc1524_entry)); + return p_new(rfc1524_entry, 1); } void rfc1524_free_entry (rfc1524_entry ** entry) { rfc1524_entry *p = *entry; - mem_free (&p->command); - mem_free (&p->testcommand); - mem_free (&p->composecommand); - mem_free (&p->composetypecommand); - mem_free (&p->editcommand); - mem_free (&p->printcommand); - mem_free (&p->nametemplate); - mem_free (entry); + p_delete(&p->command); + p_delete(&p->testcommand); + p_delete(&p->composecommand); + p_delete(&p->composetypecommand); + p_delete(&p->editcommand); + p_delete(&p->printcommand); + p_delete(&p->nametemplate); + p_delete(entry); } /* @@ -366,7 +368,7 @@ int rfc1524_mailcap_lookup (BODY * a, char *type, rfc1524_entry * entry, while (!found && *curr) { x = 0; - while (*curr && *curr != ':' && x < sizeof (path) - 1) { + while (*curr && *curr != ':' && x < ssizeof (path) - 1) { path[x++] = *curr; curr++; } @@ -401,15 +403,8 @@ int rfc1524_mailcap_lookup (BODY * a, char *type, rfc1524_entry * entry, * Returns 1 if newfile specified */ -static void strnfcpy (char *d, char *s, size_t siz, size_t len) -{ - if (len > siz) - len = siz - 1; - strfcpy (d, s, len); -} - int rfc1524_expand_filename (char *nametemplate, - char *oldfile, char *newfile, size_t nflen) + char *oldfile, char *newfile, ssize_t nflen) { int i, j, k, ps, r; char *s; @@ -430,7 +425,7 @@ int rfc1524_expand_filename (char *nametemplate, if (!nametemplate) { if (oldfile) - strfcpy (newfile, oldfile, nflen); + m_strcpy(newfile, nflen, oldfile); } else if (!oldfile) { mutt_expand_fmt (newfile, nflen, nametemplate, "mutt"); @@ -475,8 +470,8 @@ int rfc1524_expand_filename (char *nametemplate, rmatch = 1; - for (r = 0, j = str_len (oldfile) - 1, k = - str_len (nametemplate) - 1; + for (r = 0, j = m_strlen(oldfile) - 1, k = + m_strlen(nametemplate) - 1; j >= (lmatch ? i : 0) && k >= i + 2; j--, k--) { if (nametemplate[k] != oldfile[j]) { rmatch = 0; @@ -492,22 +487,22 @@ int rfc1524_expand_filename (char *nametemplate, if (lmatch) *left = 0; else - strnfcpy (left, nametemplate, sizeof (left), i); + m_strncpy(left, sizeof(left), nametemplate, i); if (rmatch) *right = 0; else - strfcpy (right, nametemplate + i + 2, sizeof (right)); + m_strcpy(right, sizeof(right), nametemplate + i + 2); snprintf (newfile, nflen, "%s%s%s", left, oldfile, right); } else { /* no "%s" in the name template. */ - strfcpy (newfile, nametemplate, nflen); + m_strcpy(newfile, nflen, nametemplate); } } - mutt_adv_mktemp (newfile, nflen); + mutt_adv_mktemp (NULL, newfile, nflen); if (rmatch && lmatch) return 0;