projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplifications.
[apps/madmutt.git]
/
muttlib.c
diff --git
a/muttlib.c
b/muttlib.c
index
c595af6
..
bf59e68
100644
(file)
--- a/
muttlib.c
+++ b/
muttlib.c
@@
-32,7
+32,7
@@
void mutt_adv_mktemp (const char* dir, char *s, ssize_t l)
{
int fd;
{
int fd;
- fd = m_tempfd(s, l, m_strisempty(dir) ? NONULL(
MC
ore.tmpdir) : dir, s);
+ fd = m_tempfd(s, l, m_strisempty(dir) ? NONULL(
mod_c
ore.tmpdir) : dir, s);
if (fd < 0) {
*s = '\0';
} else {
if (fd < 0) {
*s = '\0';
} else {
@@
-43,7
+43,7
@@
void mutt_adv_mktemp (const char* dir, char *s, ssize_t l)
void mutt_mktemp(char *s)
{
void mutt_mktemp(char *s)
{
- int fd = m_tempfd(s, _POSIX_PATH_MAX, NONULL(
MC
ore.tmpdir), NULL);
+ int fd = m_tempfd(s, _POSIX_PATH_MAX, NONULL(
mod_c
ore.tmpdir), NULL);
if (fd < 0) {
*s = '\0';
} else {
if (fd < 0) {
*s = '\0';
} else {
@@
-62,7
+62,7
@@
ssize_t _mutt_expand_path(char *buf, ssize_t len, const char *s, int rx)
switch (*s) {
case '~':
if (s[1] == '/' || s[1] == '\0') {
switch (*s) {
case '~':
if (s[1] == '/' || s[1] == '\0') {
- m_strcpy(p, sizeof(p),
MC
ore.homedir);
+ m_strcpy(p, sizeof(p),
mod_c
ore.homedir);
tail = s + 1;
} else {
struct passwd *pw;
tail = s + 1;
} else {
struct passwd *pw;
@@
-199,7
+199,7
@@
void mutt_pretty_mailbox (char *s)
*s++ = '=';
memmove (s, s + len, m_strlen(s + len) + 1);
}
*s++ = '=';
memmove (s, s + len, m_strlen(s + len) + 1);
}
- else if (m_strncmp(s,
MCore.homedir, (len = m_strlen(MC
ore.homedir))) == 0
+ else if (m_strncmp(s,
mod_core.homedir, (len = m_strlen(mod_c
ore.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);