# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/buffer.h>
+#include <lib-lib/file.h>
+
#include "mutt.h"
-#include "ascii.h"
-#include "buffer.h"
#include "enter.h"
#include "mutt_curses.h"
#include "mime.h"
#include "url.h"
#include "attach.h"
-#include "reldate.h"
#include "version.h"
#ifdef USE_IMAP
#include "mutt_crypt.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <string.h>
BODY *mutt_new_body (void)
{
- BODY *p = (BODY *) mem_calloc (1, sizeof (BODY));
+ BODY *p = p_new(BODY, 1);
p->disposition = DISPATTACH;
p->use_disp = 1;
size_t sl;
struct stat sb;
- strfcpy (buf, dir && *dir ? dir : NONULL (Tempdir), sizeof (buf));
+ m_strcpy(buf, sizeof(buf), m_strisempty(dir) ? NONULL(Tempdir) : dir);
mutt_expand_path (buf, sizeof (buf));
if (s[0] == '\0') {
snprintf (s, l, "%s/muttXXXXXX", buf);
mktemp (s);
}
else {
- strfcpy (tmp, s, sizeof (tmp));
+ m_strcpy(tmp, sizeof(tmp), s);
mutt_sanitize_filename (tmp, 1);
snprintf (s, l, "%s/%s", buf, tmp);
if (lstat (s, &sb) == -1 && errno == ENOENT)
mktemp (s);
if (period != NULL) {
*period = '.';
- sl = str_len (s);
- strfcpy (s + sl, period, l - sl);
+ sl = m_strlen(s);
+ m_strcpy(s + sl, l - sl, period);
}
}
}
if (src->filename) {
use_disp = 1;
- strfcpy (tmp, src->filename, sizeof (tmp));
+ m_strcpy(tmp, sizeof(tmp), src->filename);
}
else {
use_disp = 0;
b->parts = NULL;
b->next = NULL;
- b->filename = str_dup (tmp);
+ b->filename = m_strdup(tmp);
b->use_disp = use_disp;
b->unlink = 1;
if (mutt_is_text_part (b))
b->noconv = 1;
- b->xtype = str_dup (b->xtype);
- b->subtype = str_dup (b->subtype);
- b->form_name = str_dup (b->form_name);
- b->filename = str_dup (b->filename);
- b->d_filename = str_dup (b->d_filename);
- b->description = str_dup (b->description);
+ b->xtype = m_strdup(b->xtype);
+ b->subtype = m_strdup(b->subtype);
+ b->form_name = m_strdup(b->form_name);
+ b->filename = m_strdup(b->filename);
+ b->d_filename = m_strdup(b->d_filename);
+ b->description = m_strdup(b->description);
/*
* we don't seem to need the HEADER structure currently.
for (par = b->parameter, ppar = &b->parameter; par;
ppar = &(*ppar)->next, par = par->next) {
*ppar = mutt_new_parameter ();
- (*ppar)->attribute = str_dup (par->attribute);
- (*ppar)->value = str_dup (par->value);
+ (*ppar)->attribute = m_strdup(par->attribute);
+ (*ppar)->value = m_strdup(par->value);
}
mutt_stamp_attachment (b);
else if (b->filename)
debug_print (1, ("not unlinking %s.\n", b->filename));
- mem_free (&b->filename);
- mem_free (&b->content);
- mem_free (&b->xtype);
- mem_free (&b->subtype);
- mem_free (&b->description);
- mem_free (&b->form_name);
+ p_delete(&b->filename);
+ p_delete(&b->content);
+ p_delete(&b->xtype);
+ p_delete(&b->subtype);
+ p_delete(&b->description);
+ p_delete(&b->form_name);
if (b->hdr) {
/* Don't free twice (b->hdr->content = b->parts) */
if (b->parts)
mutt_free_body (&b->parts);
- mem_free (&b);
+ p_delete(&b);
}
*p = 0;
PARAMETER *o;
while (t) {
- mem_free (&t->attribute);
- mem_free (&t->value);
+ p_delete(&t->attribute);
+ p_delete(&t->value);
o = t;
t = t->next;
- mem_free (&o);
+ p_delete(&o);
}
*p = 0;
}
return;
mutt_free_envelope (&(*h)->env);
mutt_free_body (&(*h)->content);
- mem_free (&(*h)->maildir_flags);
- mem_free (&(*h)->tree);
- mem_free (&(*h)->path);
+ p_delete(&(*h)->maildir_flags);
+ p_delete(&(*h)->tree);
+ p_delete(&(*h)->path);
#ifdef MIXMASTER
mutt_free_list (&(*h)->chain);
#endif
#if defined USE_POP || defined USE_IMAP || defined USE_NNTP
- mem_free (&(*h)->data);
+ p_delete(&(*h)->data);
#endif
- mem_free (h);
+ p_delete(h);
}
/* returns true if the header contained in "s" is in list "t" */
int mutt_matches_ignore (const char *s, LIST * t)
{
for (; t; t = t->next) {
- if (!ascii_strncasecmp (s, t->data, str_len (t->data))
+ if (!ascii_strncasecmp (s, t->data, m_strlen(t->data))
|| *t->data == '*')
return 1;
}
return 0;
}
-/* prepend the path part of *path to *link */
-void mutt_expand_link (char *newpath, const char *path, const char *link)
+/* prepend the path part of *path to *lnk */
+void mutt_expand_link (char *newpath, const char *path, const char *lnk)
{
const char *lb = NULL;
size_t len;
- /* link is full path */
- if (*link == '/') {
- strfcpy (newpath, link, _POSIX_PATH_MAX);
+ /* lnk is full path */
+ if (*lnk == '/') {
+ m_strcpy(newpath, _POSIX_PATH_MAX, lnk);
return;
}
if ((lb = strrchr (path, '/')) == NULL) {
- /* no path in link */
- strfcpy (newpath, link, _POSIX_PATH_MAX);
+ /* no path in lnk */
+ m_strcpy(newpath, _POSIX_PATH_MAX, lnk);
return;
}
len = lb - path + 1;
memcpy (newpath, path, len);
- strfcpy (newpath + len, link, _POSIX_PATH_MAX - len);
+ m_strcpy(newpath + len, _POSIX_PATH_MAX - len, lnk);
}
char *mutt_expand_path (char *s, size_t slen)
char tmp[_POSIX_PATH_MAX];
char *t;
- char *tail = "";
+ const char *tail = "";
int recurse = 0;
case '~':
{
if (*(s + 1) == '/' || *(s + 1) == 0) {
- strfcpy (p, NONULL (Homedir), sizeof (p));
+ m_strcpy(p, sizeof(p), NONULL(Homedir));
tail = s + 1;
}
else {
*t = 0;
if ((pw = getpwnam (s + 1))) {
- strfcpy (p, pw->pw_dir, sizeof (p));
+ m_strcpy(p, sizeof(p), pw->pw_dir);
if (t) {
*t = '/';
tail = t;
#ifdef USE_IMAP
/* if folder = imap[s]://host/: don't append slash */
if (imap_is_magic (NONULL (Maildir), NULL) == M_IMAP &&
- Maildir[str_len (Maildir) - 1] == '/')
- strfcpy (p, NONULL (Maildir), sizeof (p));
+ Maildir[m_strlen(Maildir) - 1] == '/')
+ m_strcpy(p, sizeof(p), NONULL(Maildir));
else
#endif
snprintf (p, sizeof (p), "%s/", NONULL (Maildir));
case '>':
{
- strfcpy (p, NONULL (Inbox), sizeof (p));
+ m_strcpy(p, sizeof(p), NONULL(Inbox));
tail = s + 1;
}
break;
case '<':
{
- strfcpy (p, NONULL (Outbox), sizeof (p));
+ m_strcpy(p, sizeof(p), NONULL(Outbox));
tail = s + 1;
}
break;
case '!':
{
if (*(s + 1) == '!') {
- strfcpy (p, NONULL (LastFolder), sizeof (p));
+ m_strcpy(p, sizeof(p), NONULL(LastFolder));
tail = s + 2;
}
else {
- strfcpy (p, NONULL (Spoolfile), sizeof (p));
+ m_strcpy(p, sizeof(p), NONULL(Spoolfile));
tail = s + 1;
}
}
case '-':
{
- strfcpy (p, NONULL (LastFolder), sizeof (p));
+ m_strcpy(p, sizeof(p), NONULL(LastFolder));
tail = s + 1;
}
break;
case '^':
{
- strfcpy (p, NONULL (CurrentFolder), sizeof (p));
+ m_strcpy(p, sizeof(p), NONULL(CurrentFolder));
tail = s + 1;
}
break;
else
snprintf (tmp, sizeof (tmp), "%s%s", p, tail);
- strfcpy (s, tmp, slen);
+ m_strcpy(s, slen, tmp);
}
while (recurse);
if (!pw || !pw->pw_gecos)
return NULL;
- memset (dest, 0, destlen);
+ p_clear(dest, destlen);
if (GecosMask.rx) {
if (regexec (GecosMask.rx, pw->pw_gecos, 1, pat_match, 0) == 0)
- strfcpy (dest, pw->pw_gecos + pat_match[0].rm_so,
- MIN (pat_match[0].rm_eo - pat_match[0].rm_so + 1, destlen));
+ 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, ',')))
- strfcpy (dest, pw->pw_gecos, MIN (destlen, p - pw->pw_gecos + 1));
+ m_strcpy(dest, MIN(destlen, p - pw->pw_gecos + 1), pw->pw_gecos);
else
- strfcpy (dest, pw->pw_gecos, destlen);
+ m_strcpy(dest, destlen, pw->pw_gecos);
- pwnl = str_len (pw->pw_name);
+ pwnl = m_strlen(pw->pw_name);
for (idx = 0; dest[idx]; idx++) {
if (dest[idx] == '&') {
}
q = mutt_new_parameter ();
- q->attribute = str_dup (attribute);
- q->value = str_dup (value);
+ q->attribute = m_strdup(attribute);
+ q->value = m_strdup(value);
q->next = *p;
*p = q;
}
rfc822_free_address (&(*p)->reply_to);
rfc822_free_address (&(*p)->mail_followup_to);
- mem_free (&(*p)->list_post);
- mem_free (&(*p)->subject);
+ p_delete(&(*p)->list_post);
+ p_delete(&(*p)->subject);
/* real_subj is just an offset to subject and shouldn't be freed */
- mem_free (&(*p)->message_id);
- mem_free (&(*p)->supersedes);
- mem_free (&(*p)->date);
- mem_free (&(*p)->x_label);
- mem_free (&(*p)->organization);
+ p_delete(&(*p)->message_id);
+ p_delete(&(*p)->supersedes);
+ p_delete(&(*p)->date);
+ p_delete(&(*p)->x_label);
+ p_delete(&(*p)->organization);
#ifdef USE_NNTP
- mem_free (&(*p)->newsgroups);
- mem_free (&(*p)->xref);
- mem_free (&(*p)->followup_to);
- mem_free (&(*p)->x_comment_to);
+ p_delete(&(*p)->newsgroups);
+ p_delete(&(*p)->xref);
+ p_delete(&(*p)->followup_to);
+ p_delete(&(*p)->x_comment_to);
#endif
mutt_buffer_free (&(*p)->spam);
mutt_free_list (&(*p)->references);
mutt_free_list (&(*p)->in_reply_to);
mutt_free_list (&(*p)->userhdrs);
- mem_free (p);
+ p_delete(p);
}
/* move all the headers from extra not present in base into base */
while (*p) {
t = *p;
*p = (*p)->next;
- mem_free (&t->name);
+ p_delete(&t->name);
rfc822_free_address (&t->addr);
- mem_free (&t);
+ p_delete(&t);
}
}
}
*q = 0;
- if (str_ncmp (s, Maildir, (len = str_len (Maildir))) == 0 &&
+ if (m_strncmp(s, Maildir, (len = m_strlen(Maildir))) == 0 &&
s[len] == '/') {
*s++ = '=';
- memmove (s, s + len, str_len (s + len) + 1);
+ memmove (s, s + len, m_strlen(s + len) + 1);
}
- else if (str_ncmp (s, Homedir, (len = str_len (Homedir))) == 0 &&
+ else if (m_strncmp(s, Homedir, (len = m_strlen(Homedir))) == 0 &&
s[len] == '/') {
*s++ = '~';
- memmove (s, s + len - 1, str_len (s + len - 1) + 1);
+ memmove (s, s + len - 1, m_strlen(s + len - 1) + 1);
}
}
void mutt_pretty_size (char *s, size_t len, long n)
{
if (n == 0)
- strfcpy (s, "0K", len);
+ m_strcpy(s, len, "0K");
else if (n < 10189) /* 0.1K - 9.9K */
snprintf (s, len, "%3.1fK", (n < 103) ? 0.1 : n / 1024.0);
else if (n < 1023949) { /* 10K - 999K */
size_t slen;
int found = 0;
- slen = str_len (src);
+ slen = m_strlen(src);
destlen--;
for (p = fmt, d = dest; destlen && *p; p++) {
break;
case 's':
found = 1;
- strfcpy (d, src, destlen + 1);
+ m_strcpy(d, destlen + 1, src);
d += destlen > slen ? slen : destlen;
destlen -= destlen > slen ? slen : destlen;
p++;
*d = '\0';
if (!found && destlen > 0) {
- str_cat (dest, destlen, " ");
- str_cat (dest, destlen, src);
+ m_strcat(dest, destlen, " ");
+ m_strcat(dest, destlen, src);
}
}
char tmp[_POSIX_PATH_MAX];
struct stat st;
- strfcpy (fname, path, flen);
+ m_strcpy(fname, flen, path);
if (access (fname, F_OK) != 0)
return 0;
if (stat (fname, &st) != 0)
str_replace (directory, fname);
break;
case 1: /* yes */
- mem_free (directory);
+ p_delete(directory);
break;
case -1: /* abort */
- mem_free (directory);
+ p_delete(directory);
return -1;
case 2: /* no */
- mem_free (directory);
+ p_delete(directory);
return 1;
}
}
if (mutt_get_field (_("File under directory: "), tmp, sizeof (tmp),
M_FILE | M_CLEAR) != 0 || !tmp[0])
return (-1);
- mutt_concat_path (fname, path, tmp, flen);
+ mutt_concat_path(fname, flen, path, tmp);
}
else
- mutt_concat_path (fname, path, mutt_basename (attname), flen);
+ mutt_concat_path(fname, flen, path, mutt_basename(attname));
}
if (*append == 0 && access (fname, F_OK) == 0) {
void mutt_save_path (char *d, size_t dsize, ADDRESS * a)
{
if (a && a->mailbox) {
- strfcpy (d, a->mailbox, dsize);
+ m_strcpy(d, dsize, a->mailbox);
if (!option (OPTSAVEADDRESS)) {
char *p;
ret++;
s++;
}
- return (str_len (p));
+ return (m_strlen(p));
}
void mutt_FormatString (char *dest, /* output buffer */
if (count > col) {
count -= col; /* how many columns left on this line */
mutt_FormatString (buf, sizeof (buf), src, callback, data, flags);
- wid = str_len (buf);
+ wid = m_strlen(buf);
if (count > wid) {
count -= wid; /* how many chars to pad */
memset (wptr, ch, count);
break; /* skip rest of input */
}
else {
- short tolower = 0;
+ short lower = 0;
short nodots = 0;
while (ch == '_' || ch == ':') {
if (ch == '_')
- tolower = 1;
+ lower = 1;
else if (ch == ':')
nodots = 1;
callback (buf, sizeof (buf), ch, src, prefix, ifstring, elsestring,
data, flags);
- if (tolower)
+ if (lower)
str_tolower (buf);
if (nodots) {
char *p = buf;
*p = '_';
}
- if ((len = str_len (buf)) + wlen > destlen)
+ if ((len = m_strlen(buf)) + wlen > destlen)
len = (destlen - wlen > 0) ? (destlen - wlen) : 0;
memcpy (wptr, buf, len);
}
else {
unsigned int bar = mutt_skipchars (src, "%\\");
- char *bar2 = mem_malloc (bar + 1);
+ char *bar2 = p_dupstr(src, bar);
- strfcpy (bar2, src, bar + 1);
while (bar--) {
*wptr++ = *src++;
wlen++;
}
col += mutt_strwidth (bar2);
- mem_free (&bar2);
+ p_delete(&bar2);
}
}
*wptr = 0;
then we assume it is a commmand to run instead of a normal file. */
FILE *mutt_open_read (const char *path, pid_t * thepid)
{
- FILE *f;
- struct stat s;
-
- int len = str_len (path);
-
- if (path[len - 1] == '|') {
- /* read from a pipe */
-
- char *s = str_dup (path);
-
- s[len - 1] = 0;
- mutt_endwin (NULL);
- *thepid = mutt_create_filter (s, NULL, &f, NULL);
- mem_free (&s);
- }
- else {
- if (stat (path, &s) < 0)
- return (NULL);
- if (S_ISDIR (s.st_mode)) {
- errno = EINVAL;
- return (NULL);
+ int len = m_strlen(path);
+ FILE *f;
+
+ if (path[len - 1] == '|') {
+ char *s = m_strdup(path);
+
+ /* read from a pipe */
+
+ s[len - 1] = 0;
+ mutt_endwin (NULL);
+ *thepid = mutt_create_filter (s, NULL, &f, NULL);
+ p_delete(&s);
+ } else {
+ f = fopen (path, "r");
+ if (!f)
+ return NULL;
+ *thepid = -1;
}
- f = fopen (path, "r");
- *thepid = -1;
- }
- return (f);
+
+ return (f);
}
/* returns 0 if OK to proceed, -1 to abort, 1 to retry */
if (magic > 0 && !mx_access (s, W_OK)) {
if (option (OPTCONFIRMAPPEND) &&
- (!TrashPath || (str_cmp (s, TrashPath) != 0))) {
+ (!TrashPath || (m_strcmp(s, TrashPath) != 0))) {
/* if we're appending to the trash, there's no point in asking */
snprintf (tmp, sizeof (tmp), _("Append messages to %s?"), s);
if ((rc = mutt_yesorno (tmp, M_YES)) == M_NO)
static char vstring[STRING];
if (full)
- snprintf (vstring, sizeof (vstring), "Mutt-ng %s-r%s (based "
- "on Mutt 1.5.11/%s)", MUTT_VERSION, MUTT_REVISION,
- ReleaseDate);
+ snprintf (vstring, sizeof (vstring),
+ "Mutt-ng %s-r%s (based on Mutt 1.5.11)",
+ MUTT_VERSION, MUTT_REVISION);
else
snprintf (vstring, sizeof (vstring), "mutt-ng/%s-r%s",
MUTT_VERSION, MUTT_REVISION);
p = *list;
*list = (*list)->next;
rx_free (&p->rx);
- mem_free(&p->template);
- mem_free(&p);
+ p_delete(&p->template);
+ p_delete(&p);
}
}
for (; l; l = l->next) {
/* If this pattern needs more matches, expand pmatch. */
if (l->nmatch > nmatch) {
- mem_realloc (&pmatch, l->nmatch * sizeof (regmatch_t));
+ p_realloc(&pmatch, l->nmatch);
nmatch = l->nmatch;
}
int mutt_cmp_addr (const ADDRESS * a, const ADDRESS * b)
{
while (a && b) {
- if (str_cmp (a->mailbox, b->mailbox) ||
- str_cmp (a->personal, b->personal))
+ if (m_strcmp(a->mailbox, b->mailbox) ||
+ m_strcmp(a->personal, b->personal))
return (0);
a = a->next;
int mutt_cmp_list (const LIST * a, const LIST * b)
{
while (a && b) {
- if (str_cmp (a->data, b->data))
+ if (m_strcmp(a->data, b->data))
return (0);
a = a->next;
int mutt_cmp_env (const ENVELOPE * e1, const ENVELOPE * e2)
{
if (e1 && e2) {
- if (str_cmp (e1->message_id, e2->message_id) ||
- str_cmp (e1->subject, e2->subject) ||
+ if (m_strcmp(e1->message_id, e2->message_id) ||
+ m_strcmp(e1->subject, e2->subject) ||
!mutt_cmp_list (e1->references, e2->references) ||
!mutt_cmp_addr (e1->from, e2->from) ||
!mutt_cmp_addr (e1->sender, e2->sender) ||
int mutt_cmp_param (const PARAMETER * p1, const PARAMETER * p2)
{
while (p1 && p2) {
- if (str_cmp (p1->attribute, p2->attribute) ||
- str_cmp (p1->value, p2->value))
+ if (m_strcmp(p1->attribute, p2->attribute) ||
+ m_strcmp(p1->value, p2->value))
return (0);
p1 = p1->next;
{
if (b1->type != b2->type ||
b1->encoding != b2->encoding ||
- str_cmp (b1->subtype, b2->subtype) ||
- str_cmp (b1->description, b2->description) ||
+ m_strcmp(b1->subtype, b2->subtype) ||
+ m_strcmp(b1->description, b2->description) ||
!mutt_cmp_param (b1->parameter, b2->parameter) ||
b1->length != b2->length)
return (0);
projects / apps / madmutt.git / blobdiff