#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 <lib-mime/mime.h>
#include "mutt.h"
-#include "ascii.h"
-#include "buffer.h"
#include "enter.h"
#include "mutt_curses.h"
-#include "mime.h"
#include "mx.h"
#include "url.h"
#include "attach.h"
-#include "reldate.h"
#include "version.h"
#ifdef USE_IMAP
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)
if (period != NULL) {
*period = '.';
sl = m_strlen(s);
- strfcpy (s + sl, period, l - sl);
+ 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;
/* lnk is full path */
if (*lnk == '/') {
- strfcpy (newpath, lnk, _POSIX_PATH_MAX);
+ m_strcpy(newpath, _POSIX_PATH_MAX, lnk);
return;
}
if ((lb = strrchr (path, '/')) == NULL) {
/* no path in lnk */
- strfcpy (newpath, lnk, _POSIX_PATH_MAX);
+ m_strcpy(newpath, _POSIX_PATH_MAX, lnk);
return;
}
len = lb - path + 1;
memcpy (newpath, path, len);
- strfcpy (newpath + len, lnk, _POSIX_PATH_MAX - len);
+ m_strcpy(newpath + len, _POSIX_PATH_MAX - len, lnk);
}
char *mutt_expand_path (char *s, size_t slen)
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;
/* if folder = imap[s]://host/: don't append slash */
if (imap_is_magic (NONULL (Maildir), NULL) == M_IMAP &&
Maildir[m_strlen(Maildir) - 1] == '/')
- strfcpy (p, NONULL (Maildir), sizeof (p));
+ m_strcpy(p, sizeof(p), NONULL(Maildir));
else
#endif
snprintf (p, sizeof (p), "%s/", NONULL (Maildir));
case '@':
{
HEADER *h;
- ADDRESS *alias;
+ address_t *alias;
if ((alias = mutt_lookup_alias (s + 1))) {
h = mutt_new_header ();
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 = m_strlen(pw->pw_name);
for (q = *p; q; q = q->next) {
if (ascii_strcasecmp (attribute, q->attribute) == 0) {
- str_replace (&q->value, value);
+ m_strreplace(&q->value, value);
return;
}
}
break;
case TYPEAPPLICATION:
- if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (m))
+ if (mutt_is_application_pgp (m))
return 0;
- if ((WithCrypto & APPLICATION_SMIME) && mutt_is_application_smime (m))
+ if (mutt_is_application_smime (m))
return 0;
break;
int t = b->type;
char *s = b->subtype;
- if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (b))
+ if (mutt_is_application_pgp (b))
return 0;
if (t == TYPETEXT)
return 1;
}
- if ((WithCrypto & APPLICATION_PGP) && t == TYPEAPPLICATION) {
+ if (t == TYPEAPPLICATION) {
if (!ascii_strcasecmp ("pgp-keys", s))
return 1;
}
{
if (!*p)
return;
- rfc822_free_address (&(*p)->return_path);
- rfc822_free_address (&(*p)->from);
- rfc822_free_address (&(*p)->to);
- rfc822_free_address (&(*p)->cc);
- rfc822_free_address (&(*p)->bcc);
- rfc822_free_address (&(*p)->sender);
- rfc822_free_address (&(*p)->reply_to);
- rfc822_free_address (&(*p)->mail_followup_to);
+ address_delete (&(*p)->return_path);
+ address_delete (&(*p)->from);
+ address_delete (&(*p)->to);
+ address_delete (&(*p)->cc);
+ address_delete (&(*p)->bcc);
+ address_delete (&(*p)->sender);
+ address_delete (&(*p)->reply_to);
+ address_delete (&(*p)->mail_followup_to);
p_delete(&(*p)->list_post);
p_delete(&(*p)->subject);
t = *p;
*p = (*p)->next;
p_delete(&t->name);
- rfc822_free_address (&t->addr);
+ address_delete (&t->addr);
p_delete(&t);
}
}
}
*q = 0;
- if (str_ncmp (s, Maildir, (len = m_strlen(Maildir))) == 0 &&
+ if (m_strncmp(s, Maildir, (len = m_strlen(Maildir))) == 0 &&
s[len] == '/') {
*s++ = '=';
memmove (s, s + len, m_strlen(s + len) + 1);
}
- else if (str_ncmp (s, Homedir, (len = m_strlen(Homedir))) == 0 &&
+ else if (m_strncmp(s, Homedir, (len = m_strlen(Homedir))) == 0 &&
s[len] == '/') {
*s++ = '~';
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 */
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)
(_("File is a directory, save under it? [(y)es, (n)o, (a)ll]"),
_("yna"))) {
case 3: /* all */
- str_replace (directory, fname);
+ m_strreplace(directory, fname);
break;
case 1: /* yes */
p_delete(directory);
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) {
return 0;
}
-void mutt_save_path (char *d, size_t dsize, ADDRESS * a)
+void mutt_save_path (char *d, size_t dsize, address_t * a)
{
if (a && a->mailbox) {
- strfcpy (d, a->mailbox, dsize);
+ m_strcpy(d, dsize, a->mailbox);
if (!option (OPTSAVEADDRESS)) {
char *p;
if ((p = strpbrk (d, "%@")))
*p = 0;
}
- str_tolower (d);
+ m_strtolower(d);
}
else
*d = 0;
}
-void mutt_safe_path (char *s, size_t l, ADDRESS * a)
+void mutt_safe_path (char *s, size_t l, address_t * a)
{
char *p;
data, flags);
if (lower)
- str_tolower (buf);
+ m_strtolower(buf);
if (nodots) {
char *p = buf;
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);
}
/* return 1 if address lists are strictly identical */
-int mutt_cmp_addr (const ADDRESS * a, const ADDRESS * b)
+int mutt_cmp_addr (const address_t * a, const address_t * 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);