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]
/
main.c
diff --git
a/main.c
b/main.c
index
022d5ec
..
3435941
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-19,6
+19,11
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+
#include "mutt.h"
#include "mutt_curses.h"
#include "keymap.h"
#include "mutt.h"
#include "mutt_curses.h"
#include "keymap.h"
@@
-27,9
+32,6
@@
#include "mutt_idna.h"
#include "xterm.h"
#include "mutt_idna.h"
#include "xterm.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <string.h>
#include "lib/debug.h"
#include <string.h>
@@
-601,8
+603,8
@@
int main (int argc, char **argv)
SRAND (time (NULL));
umask (077);
SRAND (time (NULL));
umask (077);
-
memset (Options, 0, sizeof
(Options));
-
memset (QuadOptions, 0, sizeof
(QuadOptions));
+
p_clear(Options, sizeof
(Options));
+
p_clear(QuadOptions, sizeof
(QuadOptions));
#ifdef USE_NNTP
while ((i =
#ifdef USE_NNTP
while ((i =
@@
-871,7
+873,7
@@
int main (int argc, char **argv)
}
if (subject)
}
if (subject)
- msg->env->subject =
str_dup
(subject);
+ msg->env->subject =
m_strdup
(subject);
if (includeFile)
infile = includeFile;
if (includeFile)
infile = includeFile;
@@
-879,7
+881,7
@@
int main (int argc, char **argv)
if (infile || bodytext) {
if (infile) {
if (infile || bodytext) {
if (infile) {
- if (
str_cmp
("-", infile) == 0)
+ if (
m_strcmp
("-", infile) == 0)
fin = stdin;
else {
char path[_POSIX_PATH_MAX];
fin = stdin;
else {
char path[_POSIX_PATH_MAX];
@@
-898,7
+900,7
@@
int main (int argc, char **argv)
fin = NULL;
mutt_mktemp (buf);
fin = NULL;
mutt_mktemp (buf);
- tempfile =
str_dup
(buf);
+ tempfile =
m_strdup
(buf);
if (draftFile)
msg->env = mutt_read_rfc822_header (fin, NULL, 1, 0);
if (draftFile)
msg->env = mutt_read_rfc822_header (fin, NULL, 1, 0);
@@
-913,7
+915,7
@@
int main (int argc, char **argv)
mutt_endwin (NULL);
perror (tempfile);
fclose (fin);
mutt_endwin (NULL);
perror (tempfile);
fclose (fin);
-
mem_free
(&tempfile);
+
p_delete
(&tempfile);
exit (1);
}
if (fin)
exit (1);
}
if (fin)
@@
-926,7
+928,7
@@
int main (int argc, char **argv)
}
}
}
}
-
mem_free
(&bodytext);
+
p_delete
(&bodytext);
if (attach) {
LIST *t = attach;
if (attach) {
LIST *t = attach;
@@
-1028,7
+1030,7
@@
int main (int argc, char **argv)
if (option (OPTXTERMSETTITLES))
mutt_xterm_set_title (NONULL (XtermLeave));
if (Context)
if (option (OPTXTERMSETTITLES))
mutt_xterm_set_title (NONULL (XtermLeave));
if (Context)
-
mem_free
(&Context);
+
p_delete
(&Context);
}
mutt_endwin (Errorbuf);
}
}
mutt_endwin (Errorbuf);
}