X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=9af3581011300a468739333435cacf085df1cad5;hp=24eb705334c29cc9ccfe93db3ac5b48d3cfca8b0;hb=308c7080ccca40d4865d8810f5528331d9ed61ff;hpb=fc6abafa44b6725ab210f045a00c10634bacc8c5

diff --git a/main.c b/main.c
index 24eb705..9af3581 100644
--- a/main.c
+++ b/main.c
@@ -19,6 +19,9 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 #include "mutt_curses.h"
 #include "keymap.h"
@@ -27,8 +30,6 @@
 #include "mutt_idna.h"
 #include "xterm.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 
@@ -42,6 +43,9 @@
 
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#else
+extern char *optarg;
+extern int optind;
 #endif
 
 #ifdef HAVE_LIBIDN
@@ -56,7 +60,7 @@
 #include <libesmtp.h>
 #endif
 
-#if USE_HCACHE
+#ifdef USE_HCACHE
 #if HAVE_QDBM
 #include <depot.h>
 #elif HAVE_GDBM
@@ -74,6 +78,10 @@
 #include <gpgme.h>
 #endif
 
+#ifdef USE_SSL
+#include <openssl/opensslv.h>
+#endif
+
 static const char *ReachingUs = N_("\
 To contact the developers, please mail to <mutt-ng-devel@lists.berlios.de>.\n\
 To visit the Mutt-ng homepage go to http://www.muttng.org.\n\
@@ -225,7 +233,7 @@ static void show_version (void)
   printf ("  libESMTP %s\n", buf);
 #endif
 
-#if USE_HCACHE
+#ifdef USE_HCACHE
 #if HAVE_QDBM
   printf ("  qdbm %s\n", dpversion);
 #elif HAVE_GDBM
@@ -240,6 +248,10 @@ static void show_version (void)
   printf ("  gnutls %s\n", LIBGNUTLS_VERSION);
 #endif
 
+#ifdef USE_SSL
+  printf ("  %s\n",OPENSSL_VERSION_TEXT);
+#endif
+
 #ifdef CRYPT_BACKEND_GPGME
   printf ("  gpgme %s\n", GPGME_VERSION);
 #endif
@@ -289,7 +301,7 @@ static void show_version (void)
 #else
          "-USE_INODESORT   "
 #endif
-#if USE_HCACHE
+#ifdef USE_HCACHE
          "+USE_HCACHE  "
 #else
          "-USE_HCACHE  "
@@ -499,8 +511,7 @@ static void show_version (void)
 
   puts (_(ReachingUs));
 
-  puts (_("Mutt-ng is based on the following patches written for mutt:\n"));
-  mutt_print_patchlist ();
+  puts (_("MadMutt is based on Mutt-ng wich was based on Mutt before\n"));
 
   exit (0);
 }
@@ -566,8 +577,6 @@ int main (int argc, char **argv)
   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));
@@ -640,9 +649,12 @@ int main (int argc, char **argv)
 
     case 'd':
       {
-        char puke[20];
-        snprintf (puke, sizeof (puke), "set debug_level=%d", atoi (optarg));
-        commands = mutt_add_list (commands, puke);
+        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;
 
@@ -708,7 +720,7 @@ int main (int argc, char **argv)
       {
         char buf[LONG_STRING];
 
-        snprintf (buf, sizeof (buf), "set news_server=%s", optarg);
+        snprintf (buf, sizeof (buf), "set nntp_host=%s", optarg);
         commands = mutt_add_list (commands, buf);
       }
 
@@ -902,7 +914,7 @@ int main (int argc, char **argv)
             mutt_endwin (NULL);
           perror (tempfile);
           fclose (fin);
-          mem_free (&tempfile);
+          p_delete(&tempfile);
           exit (1);
         }
         if (fin)
@@ -915,7 +927,7 @@ int main (int argc, char **argv)
       }
     }
 
-    mem_free (&bodytext);
+    p_delete(&bodytext);
 
     if (attach) {
       LIST *t = attach;
@@ -1017,7 +1029,7 @@ int main (int argc, char **argv)
       if (option (OPTXTERMSETTITLES))
         mutt_xterm_set_title (NONULL (XtermLeave));
       if (Context)
-        mem_free (&Context);
+        p_delete(&Context);
     }
     mutt_endwin (Errorbuf);
   }