projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove yet anoter round of str_* functions, replaced with their inlineable
[apps/madmutt.git]
/
muttlib.c
diff --git
a/muttlib.c
b/muttlib.c
index
7dc21d6
..
f2137a8
100644
(file)
--- a/
muttlib.c
+++ b/
muttlib.c
@@
-17,6
+17,7
@@
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-lib/buffer.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 "enter.h"
#include "mutt.h"
#include "enter.h"
@@
-722,12
+723,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);
@@
-802,8
+803,8
@@
void mutt_expand_fmt (char *dest, size_t destlen, const char *fmt,
*d = '\0';
if (!found && destlen > 0) {
*d = '\0';
if (!found && destlen > 0) {
-
str_cat
(dest, destlen, " ");
-
str_cat
(dest, destlen, src);
+
m_strcat
(dest, destlen, " ");
+
m_strcat
(dest, destlen, src);
}
}
}
}
@@
-852,10
+853,10
@@
int mutt_check_overwrite (const char *attname, const char *path,
if (mutt_get_field (_("File under directory: "), tmp, sizeof (tmp),
M_FILE | M_CLEAR) != 0 || !tmp[0])
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
}
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) {
}
if (*append == 0 && access (fname, F_OK) == 0) {