projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
the C gods blessed us with a preprocessor, use it.
[apps/madmutt.git]
/
muttlib.c
diff --git
a/muttlib.c
b/muttlib.c
index
45dd76d
..
04c0b3a
100644
(file)
--- a/
muttlib.c
+++ b/
muttlib.c
@@
-27,7
+27,6
@@
#include "url.h"
#include "attach.h"
#include "url.h"
#include "attach.h"
-#include "reldate.h"
#include "version.h"
#ifdef USE_IMAP
#include "version.h"
#ifdef USE_IMAP
@@
-77,14
+76,14
@@
void mutt_adv_mktemp (const char* dir, char *s, size_t l)
size_t sl;
struct stat sb;
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 {
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)
mutt_sanitize_filename (tmp, 1);
snprintf (s, l, "%s/%s", buf, tmp);
if (lstat (s, &sb) == -1 && errno == ENOENT)
@@
-96,7
+95,7
@@
void mutt_adv_mktemp (const char* dir, char *s, size_t l)
if (period != NULL) {
*period = '.';
sl = m_strlen(s);
if (period != NULL) {
*period = '.';
sl = m_strlen(s);
-
strfcpy (s + sl, period, l - sl
);
+
m_strcpy(s + sl, l - sl, period
);
}
}
}
}
}
}
@@
-114,7
+113,7
@@
int mutt_copy_body (FILE * fp, BODY ** tgt, BODY * src)
if (src->filename) {
use_disp = 1;
if (src->filename) {
use_disp = 1;
-
strfcpy (tmp, src->filename, sizeof (tmp)
);
+
m_strcpy(tmp, sizeof(tmp), src->filename
);
}
else {
use_disp = 0;
}
else {
use_disp = 0;
@@
-269,19
+268,19
@@
void mutt_expand_link (char *newpath, const char *path, const char *lnk)
/* lnk is full path */
if (*lnk == '/') {
/* 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 */
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);
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)
}
char *mutt_expand_path (char *s, size_t slen)
@@
-307,7
+306,7
@@
char *_mutt_expand_path (char *s, size_t slen, int rx)
case '~':
{
if (*(s + 1) == '/' || *(s + 1) == 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 {
tail = s + 1;
}
else {
@@
-317,7
+316,7
@@
char *_mutt_expand_path (char *s, size_t slen, int rx)
*t = 0;
if ((pw = getpwnam (s + 1))) {
*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 (t) {
*t = '/';
tail = t;
@@
-343,7
+342,7
@@
char *_mutt_expand_path (char *s, size_t slen, int rx)
/* if folder = imap[s]://host/: don't append slash */
if (imap_is_magic (NONULL (Maildir), NULL) == M_IMAP &&
Maildir[m_strlen(Maildir) - 1] == '/')
/* 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));
else
#endif
snprintf (p, sizeof (p), "%s/", NONULL (Maildir));
@@
-377,14
+376,14
@@
char *_mutt_expand_path (char *s, size_t slen, int rx)
case '>':
{
case '>':
{
-
strfcpy (p, NONULL (Inbox), sizeof (p
));
+
m_strcpy(p, sizeof(p), NONULL(Inbox
));
tail = s + 1;
}
break;
case '<':
{
tail = s + 1;
}
break;
case '<':
{
-
strfcpy (p, NONULL (Outbox), sizeof (p
));
+
m_strcpy(p, sizeof(p), NONULL(Outbox
));
tail = s + 1;
}
break;
tail = s + 1;
}
break;
@@
-392,11
+391,11
@@
char *_mutt_expand_path (char *s, size_t slen, int rx)
case '!':
{
if (*(s + 1) == '!') {
case '!':
{
if (*(s + 1) == '!') {
-
strfcpy (p, NONULL (LastFolder), sizeof (p
));
+
m_strcpy(p, sizeof(p), NONULL(LastFolder
));
tail = s + 2;
}
else {
tail = s + 2;
}
else {
-
strfcpy (p, NONULL (Spoolfile), sizeof (p
));
+
m_strcpy(p, sizeof(p), NONULL(Spoolfile
));
tail = s + 1;
}
}
tail = s + 1;
}
}
@@
-404,14
+403,14
@@
char *_mutt_expand_path (char *s, size_t slen, int rx)
case '-':
{
case '-':
{
-
strfcpy (p, NONULL (LastFolder), sizeof (p
));
+
m_strcpy(p, sizeof(p), NONULL(LastFolder
));
tail = s + 1;
}
break;
case '^':
{
tail = s + 1;
}
break;
case '^':
{
-
strfcpy (p, NONULL (CurrentFolder), sizeof (p
));
+
m_strcpy(p, sizeof(p), NONULL(CurrentFolder
));
tail = s + 1;
}
break;
tail = s + 1;
}
break;
@@
-430,7
+429,7
@@
char *_mutt_expand_path (char *s, size_t slen, int rx)
else
snprintf (tmp, sizeof (tmp), "%s%s", p, tail);
else
snprintf (tmp, sizeof (tmp), "%s%s", p, tail);
-
strfcpy (s, tmp, slen
);
+
m_strcpy(s, slen, tmp
);
}
while (recurse);
}
while (recurse);
@@
-459,13
+458,13
@@
char *mutt_gecos_name (char *dest, size_t destlen, struct passwd *pw)
if (GecosMask.rx) {
if (regexec (GecosMask.rx, pw->pw_gecos, 1, pat_match, 0) == 0)
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, ',')))
}
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
else
-
strfcpy (dest, pw->pw_gecos, destlen
);
+
m_strcpy(dest, destlen, pw->pw_gecos
);
pwnl = m_strlen(pw->pw_name);
pwnl = m_strlen(pw->pw_name);
@@
-723,12
+722,12
@@
void mutt_pretty_mailbox (char *s)
}
*q = 0;
}
*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);
}
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);
s[len] == '/') {
*s++ = '~';
memmove (s, s + len - 1, m_strlen(s + len - 1) + 1);
@@
-738,7
+737,7
@@
void mutt_pretty_mailbox (char *s)
void mutt_pretty_size (char *s, size_t len, long n)
{
if (n == 0)
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 */
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 */
@@
-783,7
+782,7
@@
void mutt_expand_fmt (char *dest, size_t destlen, const char *fmt,
break;
case 's':
found = 1;
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 += destlen > slen ? slen : destlen;
destlen -= destlen > slen ? slen : destlen;
p++;
@@
-818,7
+817,7
@@
int mutt_check_overwrite (const char *attname, const char *path,
char tmp[_POSIX_PATH_MAX];
struct stat st;
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)
if (access (fname, F_OK) != 0)
return 0;
if (stat (fname, &st) != 0)
@@
-882,7
+881,7
@@
int mutt_check_overwrite (const char *attname, const char *path,
void mutt_save_path (char *d, size_t dsize, ADDRESS * a)
{
if (a && a->mailbox) {
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;
if (!option (OPTSAVEADDRESS)) {
char *p;
@@
-1296,9
+1295,9
@@
const char *mutt_make_version (int full)
static char vstring[STRING];
if (full)
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);
else
snprintf (vstring, sizeof (vstring), "mutt-ng/%s-r%s",
MUTT_VERSION, MUTT_REVISION);