X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=ea0d55f949719763d12d61e563eadc2c4c31e0f4;hp=e3a0b839d62255a056f8eae4f6c5770d3e4b7698;hb=284454918cc95058b026d057195eaa5279135c36;hpb=0d52617ab7fc6b2d78b5835ad5230edaf5aafa4f

diff --git a/main.c b/main.c
index e3a0b83..ea0d55f 100644
--- a/main.c
+++ b/main.c
@@ -15,25 +15,10 @@
 
 #define MAIN_C 1
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#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>
@@ -41,6 +26,7 @@
 #include <lib-ui/curses.h>
 
 #include "mutt.h"
+#include "alias.h"
 #include "mx.h"
 #include "buffy.h"
 #include "sort.h"
@@ -69,11 +55,11 @@ extern int optind;
 #endif
 
 #ifdef USE_HCACHE
-#if HAVE_QDBM
+#if defined(HAVE_QDBM)
 #include <depot.h>
-#elif HAVE_GDBM
+#elif defined(HAVE_GDBM)
 #include <gdbm.h>
-#elif HAVE_DB4
+#elif defined(HAVE_DB4)
 #include <db.h>
 #endif
 #endif
@@ -161,9 +147,6 @@ options:\n\
   -a <file>\tattach a file to the message\n\
   -b <address>\tspecify a blind carbon-copy (BCC) address\n\
   -c <address>\tspecify a carbon-copy (CC) address");
-#if DEBUG
-  puts _("  -d <level>\tlog debugging output to ~/.madmuttdebug0");
-#endif
   puts _("\
   -e <command>\tspecify a command to be executed after initialization\n\
   -f <file>\tspecify which mailbox to read\n\
@@ -236,11 +219,11 @@ static void show_version (void)
 #endif
 
 #ifdef USE_HCACHE
-#if HAVE_QDBM
+#if defined(HAVE_QDBM)
   printf ("  qdbm %s\n", dpversion);
-#elif HAVE_GDBM
+#elif defined(HAVE_GDBM)
   printf ("  gdbm %s\n", gdbm_version);
-#elif HAVE_DB4
+#elif defined(HAVE_DB4)
   printf ("  DB4 %d.%d.%d\n", DB_VERSION_MAJOR, DB_VERSION_MINOR,
           DB_VERSION_PATCH);
 #endif
@@ -260,12 +243,6 @@ static void show_version (void)
 
   puts (_("Compile Options:"));
 
-#ifdef DEBUG
-  puts ("  +DEBUG");
-#else
-  puts ("  -DEBUG");
-#endif
-
   puts (
 #ifdef HOMESPOOL
          "  +HOMESPOOL  "
@@ -379,11 +356,6 @@ static void show_version (void)
          "+CRYPT_BACKEND_GPGME  "
 #else
          "-CRYPT_BACKEND_GPGME  "
-#endif
-#ifdef BUFFY_SIZE
-         "+BUFFY_SIZE "
-#else
-         "-BUFFY_SIZE "
 #endif
          "\n  "
 #ifdef ENABLE_NLS
@@ -407,27 +379,22 @@ static void show_version (void)
          "-HAVE_LANGINFO_YESEXPR  "
 #endif
          "\n  "
-#if HAVE_ICONV
+#ifdef HAVE_ICONV
          "+HAVE_ICONV  "
 #else
          "-HAVE_ICONV  "
 #endif
-#if ICONV_NONTRANS
-         "+ICONV_NONTRANS  "
-#else
-         "-ICONV_NONTRANS  "
-#endif
-#if HAVE_LIBIDN
+#ifdef HAVE_LIBIDN
          "+HAVE_LIBIDN  "
 #else
          "-HAVE_LIBIDN  "
 #endif
-#if HAVE_GETSID
+#ifdef HAVE_GETSID
          "+HAVE_GETSID  "
 #else
          "-HAVE_GETSID  "
 #endif
-#if HAVE_GETADDRINFO
+#ifdef HAVE_GETADDRINFO
          "+HAVE_GETADDRINFO  "
 #else
          "-HAVE_GETADDRINFO  "
@@ -481,10 +448,10 @@ static void start_curses (void)
   keypad (stdscr, TRUE);
   cbreak ();
   noecho ();
-#if HAVE_TYPEAHEAD
+#ifdef HAVE_TYPEAHEAD
   typeahead (-1);               /* simulate smooth scrolling */
 #endif
-#if HAVE_META
+#ifdef HAVE_META
   meta (stdscr, TRUE);
 #endif
 }
@@ -518,7 +485,7 @@ int main (int argc, char **argv)
   int dump_variables = -1;
 
   /* initialize random number for tmp file creation */ 
-  srand ((unsigned int) time (NULL));
+  srand48((unsigned int) time (NULL));
   
   /* sanity check against stupid administrators */
   
@@ -538,7 +505,7 @@ int main (int argc, char **argv)
 
   mutt_error = mutt_nocurses_error;
   mutt_message = mutt_nocurses_error;
-  SRAND (time (NULL));
+  srand48 (time (NULL));
   umask (077);
 
   p_clear(Options, countof(Options));
@@ -547,10 +514,10 @@ int main (int argc, char **argv)
 #ifdef USE_NNTP
   while ((i =
           getopt (argc, argv,
-                  "A:a:b:F:f:c:d:e:g:GH:s:i:hm:npQ:RTtvyzZ")) != EOF)
+                  "A:a:b:F:f:c:e:g:GH:s:i:hm:npQ:RTtvyzZ")) != EOF)
 #else
   while ((i =
-          getopt (argc, argv, "A:a:b:F:f:c:d:e:H:s:i:hm:npQ:RTtvyzZ")) != EOF)
+          getopt (argc, argv, "A:a:b:F:f:c:e:H:s:i:hm:npQ:RTtvyzZ")) != EOF)
 #endif
     switch (i) {
     case 'A':
@@ -586,17 +553,6 @@ int main (int argc, char **argv)
         msg->env->cc = rfc822_parse_adrlist (msg->env->cc, optarg);
       break;
 
-    case 'd':
-      {
-        char buf[LONG_STRING];
-        int level = atoi (optarg);
-
-        snprintf (buf, sizeof (buf), "set debug_level=%d", level);
-        commands = mutt_add_list (commands, buf);
-        debug_setlevel (level);
-      }
-      break;
-
     case 't':
       dump_variables = 2;
       break;
@@ -704,7 +660,6 @@ int main (int argc, char **argv)
     start_curses ();
 
   /* set defaults and read init files */
-  mx_init ();
   mutt_init (flags & M_NOSYSRC, commands);
   string_list_wipe(&commands);
 
@@ -721,12 +676,12 @@ int main (int argc, char **argv)
     address_t *a;
 
     for (; alias_queries; alias_queries = alias_queries->next) {
-      if ((a = alias_lookup(alias_queries->data))) {
+      if ((a = address_list_dup(alias_lookup(alias_queries->data)))) {
         /* output in machine-readable form */
         mutt_addrlist_to_idna (a, NULL);
         mutt_write_address_list (a, stdout, 0, 0);
-      }
-      else {
+        address_list_wipe(&a);
+      } else {
         rv = 1;
         printf ("%s\n", alias_queries->data);
       }
@@ -910,7 +865,7 @@ int main (int argc, char **argv)
       }
       else
 #endif
-      if (!Incoming) {
+      if (!Incoming.len) {
         mutt_endwin _("No incoming mailboxes defined.");
 
         exit (1);