projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make some functions a bit shorter.
[apps/madmutt.git]
/
main.c
diff --git
a/main.c
b/main.c
index
ada2c8d
..
4ea57e1
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-19,32
+19,36
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <string.h>
+#include <stdlib.h>
+#include <locale.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <sys/utsname.h>
+
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
+#include <lib-lib/debug.h>
+#include <lib-lib/url.h>
+
+#include <lib-sys/mutt_signal.h>
+
+#include <lib-mime/mime.h>
+
+#include <lib-ui/curses.h>
#include "mutt.h"
#include "mx.h"
#include "buffy.h"
#include "sort.h"
#include <lib-crypt/crypt.h>
#include "mutt.h"
#include "mx.h"
#include "buffy.h"
#include "sort.h"
#include <lib-crypt/crypt.h>
-#include "mutt_curses.h"
#include "keymap.h"
#include "keymap.h"
-#include "url.h"
#include "mutt_idna.h"
#include "xterm.h"
#include "mutt_idna.h"
#include "xterm.h"
-#include "lib/debug.h"
-
-#include <string.h>
-#include <stdlib.h>
-#include <locale.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/utsname.h>
-
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#else
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#else
@@
-330,11
+334,6
@@
static void show_version (void)
"+HAVE_REGCOMP "
#else
"-HAVE_REGCOMP "
"+HAVE_REGCOMP "
#else
"-HAVE_REGCOMP "
-#endif
-#ifdef USE_GNU_REGEX
- "+USE_GNU_REGEX "
-#else
- "-USE_GNU_REGEX "
#endif
"\n "
#ifdef HAVE_COLOR
#endif
"\n "
#ifdef HAVE_COLOR
@@
-470,17
+469,14
@@
static void start_curses (void)
#else
/* should come before initscr() so that ncurses 4.2 doesn't try to install
its own SIGWINCH handler */
#else
/* should come before initscr() so that ncurses 4.2 doesn't try to install
its own SIGWINCH handler */
- mutt_signal_init ();
+ mutt_signal_init
ialize
();
#endif
if (initscr () == NULL) {
puts _("Error initializing terminal.");
exit (1);
}
#endif
if (initscr () == NULL) {
puts _("Error initializing terminal.");
exit (1);
}
-#if 1 /* USE_SLANG_CURSES - commenting out suggested in #455. */
- /* slang requires the signal handlers to be set after initializing */
- mutt_signal_init ();
-#endif
+ mutt_signal_initialize ();
ci_start_color ();
keypad (stdscr, TRUE);
cbreak ();
ci_start_color ();
keypad (stdscr, TRUE);
cbreak ();
@@
-545,8
+541,8
@@
int main (int argc, char **argv)
SRAND (time (NULL));
umask (077);
SRAND (time (NULL));
umask (077);
- p_clear(Options,
size
of(Options));
- p_clear(QuadOptions,
size
of(QuadOptions));
+ p_clear(Options,
count
of(Options));
+ p_clear(QuadOptions,
count
of(QuadOptions));
#ifdef USE_NNTP
while ((i =
#ifdef USE_NNTP
while ((i =
@@
-725,7
+721,7
@@
int main (int argc, char **argv)
address_t *a;
for (; alias_queries; alias_queries = alias_queries->next) {
address_t *a;
for (; alias_queries; alias_queries = alias_queries->next) {
- if ((a =
mutt_lookup_alias (
alias_queries->data))) {
+ if ((a =
alias_lookup(Aliases,
alias_queries->data))) {
/* output in machine-readable form */
mutt_addrlist_to_idna (a, NULL);
mutt_write_address_list (a, stdout, 0, 0);
/* output in machine-readable form */
mutt_addrlist_to_idna (a, NULL);
mutt_write_address_list (a, stdout, 0, 0);