X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=rfc1524.c;h=cd089fc678ead334278eb44cd653a36395780102;hp=5466a75f41e19daecad2b79fffe56b935a698492;hb=06797b065bbd5d88bf473c4b9f8525dcb9990bb7;hpb=0f44dc85fc1280372ffab911d701e703d803fb4b diff --git a/rfc1524.c b/rfc1524.c index 5466a75..cd089fc 100644 --- a/rfc1524.c +++ b/rfc1524.c @@ -21,13 +21,6 @@ # include "config.h" #endif -#include "mutt.h" -#include "rfc1524.h" - -#include "lib/mem.h" -#include "lib/intl.h" -#include "lib/str.h" - #include #include #include @@ -37,6 +30,17 @@ #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 @@ -58,7 +62,7 @@ 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); @@ -82,7 +86,7 @@ int rfc1524_expand_command (BODY * a, char *filename, char *_type, 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); @@ -101,7 +105,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; } @@ -122,24 +126,23 @@ static char *get_field (char *s) s++; } else { - *ch++ = 0; - SKIPWS (ch); + *ch++ = '\0'; + ch = vskipspaces(ch); break; } } - mutt_remove_trailing_ws (s); + m_strrtrim(s); return ch; } static int get_field_text (char *field, char **entry, char *type, char *filename, int line) { - field = mutt_skip_whitespace (field); + field = vskipspaces(field); if (*field == '=') { if (entry) { - field++; - field = mutt_skip_whitespace (field); - str_replace (entry, field); + field = vskipspaces(field + 1); + m_strreplace(entry, field); } return 1; } @@ -188,19 +191,19 @@ static int rfc1524_mailcap_parse (BODY * a, /* ignore comments */ if (*buf == '#') continue; - dprint (2, (debugfile, "mailcap entry: %s\n", buf)); + debug_print (2, ("mailcap entry: %s\n", buf)); /* check type */ ch = get_field (buf); if (ascii_strcasecmp (buf, type) && (ascii_strncasecmp (buf, type, btlen) || (buf[btlen] != 0 && /* implicit wild */ - safe_strcmp (buf + btlen, "/*")))) /* wildsubtype */ + m_strcmp(buf + btlen, "/*")))) /* wildsubtype */ continue; /* next field is the viewcommand */ field = ch; ch = get_field (ch); if (entry) - entry->command = safe_strdup (field); + entry->command = m_strdup(field); /* parse the optional fields */ found = TRUE; @@ -212,7 +215,7 @@ static int rfc1524_mailcap_parse (BODY * a, while (ch) { field = ch; ch = get_field (ch); - dprint (2, (debugfile, "field: %s\n", field)); + debug_print (2, ("field: %s\n", field)); if (!ascii_strcasecmp (field, "needsterminal")) { if (entry) @@ -264,14 +267,14 @@ static int rfc1524_mailcap_parse (BODY * a, if (get_field_text (field + 4, &test_command, type, filename, line) && test_command) { - len = safe_strlen (test_command) + STRING; - safe_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; } - FREE (&test_command); + p_delete(&test_command); } } } /* while (ch) */ @@ -296,13 +299,13 @@ static int rfc1524_mailcap_parse (BODY * a, if (!found) { /* reset */ if (entry) { - FREE (&entry->command); - FREE (&entry->composecommand); - FREE (&entry->composetypecommand); - FREE (&entry->editcommand); - FREE (&entry->printcommand); - FREE (&entry->nametemplate); - 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; } @@ -310,27 +313,27 @@ static int rfc1524_mailcap_parse (BODY * a, } /* while (!found && (buf = mutt_read_line ())) */ fclose (fp); } /* if ((fp = fopen ())) */ - FREE (&buf); + p_delete(&buf); return found; } rfc1524_entry *rfc1524_new_entry (void) { - return (rfc1524_entry *) safe_calloc (1, sizeof (rfc1524_entry)); + return p_new(rfc1524_entry, 1); } void rfc1524_free_entry (rfc1524_entry ** entry) { rfc1524_entry *p = *entry; - FREE (&p->command); - FREE (&p->testcommand); - FREE (&p->composecommand); - FREE (&p->composetypecommand); - FREE (&p->editcommand); - FREE (&p->printcommand); - FREE (&p->nametemplate); - 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); } /* @@ -376,7 +379,7 @@ int rfc1524_mailcap_lookup (BODY * a, char *type, rfc1524_entry * entry, path[x] = '\0'; mutt_expand_path (path, sizeof (path)); - dprint (2, (debugfile, "Checking mailcap file: %s\n", path)); + debug_print (2, ("Checking mailcap file: %s\n", path)); found = rfc1524_mailcap_parse (a, path, type, entry, opt); } @@ -402,7 +405,7 @@ static void strnfcpy (char *d, char *s, size_t siz, size_t len) { if (len > siz) len = siz - 1; - strfcpy (d, s, len); + m_strcpy(d, len, s); } int rfc1524_expand_filename (char *nametemplate, @@ -427,7 +430,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"); @@ -472,8 +475,8 @@ int rfc1524_expand_filename (char *nametemplate, rmatch = 1; - for (r = 0, j = safe_strlen (oldfile) - 1, k = - safe_strlen (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; @@ -494,17 +497,17 @@ int rfc1524_expand_filename (char *nametemplate, 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;