projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
less horrible strncpy's
[apps/madmutt.git]
/
alias.c
diff --git
a/alias.c
b/alias.c
index
1ef818e
..
f791206
100644
(file)
--- a/
alias.c
+++ b/
alias.c
@@
-17,6
+17,7
@@
#include <lib-lib/mem.h>
#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
#include <lib-lib/mem.h>
#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
+#include <lib-lib/file.h>
#include <lib-lib/macros.h>
#include "lib/rx.h"
#include <lib-lib/macros.h>
#include "lib/rx.h"
@@
-66,7
+67,7
@@
static ADDRESS *mutt_expand_aliases_r (ADDRESS * a, LIST ** expn)
if (t) {
i = 0;
for (u = *expn; u; u = u->next) {
if (t) {
i = 0;
for (u = *expn; u; u = u->next) {
- if (
str_cmp
(a->mailbox, u->data) == 0) { /* alias already found */
+ if (
m_strcmp
(a->mailbox, u->data) == 0) { /* alias already found */
debug_print(1, ("loop in alias found for '%s'\n", a->mailbox));
i = 1;
break;
debug_print(1, ("loop in alias found for '%s'\n", a->mailbox));
i = 1;
break;
@@
-403,7
+404,7
@@
int mutt_alias_complete (char *s, size_t buflen)
#define min(a,b) ((a<b)?a:b)
if (s[0] != 0) { /* avoid empty string as strstr argument */
#define min(a,b) ((a<b)?a:b)
if (s[0] != 0) { /* avoid empty string as strstr argument */
-
memset (bestname, 0, sizeof
(bestname));
+
p_clear(bestname, sizeof
(bestname));
while (a) {
if (a->name && strstr (a->name, s) == a->name) {
while (a) {
if (a->name && strstr (a->name, s) == a->name) {
@@
-419,7
+420,7
@@
int mutt_alias_complete (char *s, size_t buflen)
}
if (bestname[0] != 0) {
}
if (bestname[0] != 0) {
- if (
str_cmp
(bestname, s) != 0) {
+ if (
m_strcmp
(bestname, s) != 0) {
/* we are adding something to the completion */
strfcpy (s, bestname, m_strlen(bestname) + 1);
return 1;
/* we are adding something to the completion */
strfcpy (s, bestname, m_strlen(bestname) + 1);
return 1;