X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=e3a0b839d62255a056f8eae4f6c5770d3e4b7698;hp=ada2c8d6fd0efb3bf1c2f2de62b43b303ff4258d;hb=10e80e482eff3762b0b8d41b0c7795b76704479c;hpb=7cf9f06d9ba7bcda54db3c668bfa0fde99abf34f

diff --git a/main.c b/main.c
index ada2c8d..e3a0b83 100644
--- a/main.c
+++ b/main.c
@@ -19,32 +19,36 @@
 # 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/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_curses.h"
 #include "keymap.h"
-#include "url.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
@@ -330,11 +334,6 @@ static void show_version (void)
          "+HAVE_REGCOMP  "
 #else
          "-HAVE_REGCOMP  "
-#endif
-#ifdef USE_GNU_REGEX
-         "+USE_GNU_REGEX  "
-#else
-         "-USE_GNU_REGEX  "
 #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 */
-  mutt_signal_init ();
+  mutt_signal_initialize ();
 #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 ();
@@ -510,10 +506,10 @@ int main (int argc, char **argv)
   char *draftFile = NULL;
   char *newMagic = NULL;
   HEADER *msg = NULL;
-  LIST *attach = NULL;
-  LIST *commands = NULL;
-  LIST *queries = NULL;
-  LIST *alias_queries = NULL;
+  string_list_t *attach = NULL;
+  string_list_t *commands = NULL;
+  string_list_t *queries = NULL;
+  string_list_t *alias_queries = NULL;
   int sendflags = 0;
   int flags = 0;
   int version = 0;
@@ -545,8 +541,8 @@ int main (int argc, char **argv)
   SRAND (time (NULL));
   umask (077);
 
-  p_clear(Options, sizeof(Options));
-  p_clear(QuadOptions, sizeof(QuadOptions));
+  p_clear(Options, countof(Options));
+  p_clear(QuadOptions, countof(QuadOptions));
 
 #ifdef USE_NNTP
   while ((i =
@@ -710,7 +706,7 @@ int main (int argc, char **argv)
   /* set defaults and read init files */
   mx_init ();
   mutt_init (flags & M_NOSYSRC, commands);
-  mutt_free_list (&commands);
+  string_list_wipe(&commands);
 
   /* Initialize crypto */
   crypt_init ();
@@ -725,7 +721,7 @@ int main (int argc, char **argv)
     address_t *a;
 
     for (; alias_queries; alias_queries = alias_queries->next) {
-      if ((a = mutt_lookup_alias (alias_queries->data))) {
+      if ((a = alias_lookup(alias_queries->data))) {
         /* output in machine-readable form */
         mutt_addrlist_to_idna (a, NULL);
         mutt_write_address_list (a, stdout, 0, 0);
@@ -866,7 +862,7 @@ int main (int argc, char **argv)
     p_delete(&bodytext);
 
     if (attach) {
-      LIST *t = attach;
+      string_list_t *t = attach;
       BODY *a = NULL;
 
       while (t) {
@@ -880,12 +876,12 @@ int main (int argc, char **argv)
           if (!option (OPTNOCURSES))
             mutt_endwin (NULL);
           fprintf (stderr, _("%s: unable to attach file.\n"), t->data);
-          mutt_free_list (&attach);
+          string_list_wipe(&attach);
           exit (1);
         }
         t = t->next;
       }
-      mutt_free_list (&attach);
+      string_list_wipe(&attach);
     }
 
     ci_send_message (sendflags, msg, tempfile, NULL, NULL);