projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move list.[hc] into lib-lib.
[apps/madmutt.git]
/
main.c
diff --git
a/main.c
b/main.c
index
aaa8877
..
66c5f7a
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-19,6
+19,10
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "mutt_curses.h"
#include "keymap.h"
#include "mutt.h"
#include "mutt_curses.h"
#include "keymap.h"
@@
-27,9
+31,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>
@@
-42,6
+43,9
@@
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#ifdef HAVE_GETOPT_H
#include <getopt.h>
+#else
+extern char *optarg;
+extern int optind;
#endif
#ifdef HAVE_LIBIDN
#endif
#ifdef HAVE_LIBIDN
@@
-56,7
+60,7
@@
#include <libesmtp.h>
#endif
#include <libesmtp.h>
#endif
-#if USE_HCACHE
+#if
def
USE_HCACHE
#if HAVE_QDBM
#include <depot.h>
#elif HAVE_GDBM
#if HAVE_QDBM
#include <depot.h>
#elif HAVE_GDBM
@@
-229,7
+233,7
@@
static void show_version (void)
printf (" libESMTP %s\n", buf);
#endif
printf (" libESMTP %s\n", buf);
#endif
-#if USE_HCACHE
+#if
def
USE_HCACHE
#if HAVE_QDBM
printf (" qdbm %s\n", dpversion);
#elif HAVE_GDBM
#if HAVE_QDBM
printf (" qdbm %s\n", dpversion);
#elif HAVE_GDBM
@@
-297,7
+301,7
@@
static void show_version (void)
#else
"-USE_INODESORT "
#endif
#else
"-USE_INODESORT "
#endif
-#if USE_HCACHE
+#if
def
USE_HCACHE
"+USE_HCACHE "
#else
"-USE_HCACHE "
"+USE_HCACHE "
#else
"-USE_HCACHE "
@@
-573,8
+577,6
@@
int main (int argc, char **argv)
int i;
int explicit_folder = 0;
int dump_variables = -1;
int i;
int explicit_folder = 0;
int dump_variables = -1;
- extern char *optarg;
- extern int optind;
/* initialize random number for tmp file creation */
srand ((unsigned int) time (NULL));
/* initialize random number for tmp file creation */
srand ((unsigned int) time (NULL));
@@
-600,8
+602,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 =
@@
-870,7
+872,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;
@@
-878,7
+880,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];
@@
-897,7
+899,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);
@@
-912,7
+914,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)
@@
-925,7
+927,7
@@
int main (int argc, char **argv)
}
}
}
}
-
mem_free
(&bodytext);
+
p_delete
(&bodytext);
if (attach) {
LIST *t = attach;
if (attach) {
LIST *t = attach;
@@
-1027,7
+1029,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);
}