X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=d703022ed4d0b30b030378aec705200704ef796e;hp=d604a5441aa736df7ac2426944cc302d1136d8f1;hb=8e037c67a88cb4680c4391134c578e3b55a80f8a;hpb=e5c642efe8f2f698b7f0a4720c73d2e52f9fc9d8

diff --git a/main.c b/main.c
index d604a54..d703022 100644
--- a/main.c
+++ b/main.c
@@ -19,6 +19,8 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+
 #include "mutt.h"
 #include "mutt_curses.h"
 #include "keymap.h"
@@ -42,6 +44,9 @@
 
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#else
+extern char *optarg;
+extern int optind;
 #endif
 
 #ifdef HAVE_LIBIDN
@@ -56,7 +61,7 @@
 #include <libesmtp.h>
 #endif
 
-#if USE_HCACHE
+#ifdef USE_HCACHE
 #if HAVE_QDBM
 #include <depot.h>
 #elif HAVE_GDBM
@@ -74,6 +79,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 +234,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 +249,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 +302,7 @@ static void show_version (void)
 #else
          "-USE_INODESORT   "
 #endif
-#if USE_HCACHE
+#ifdef USE_HCACHE
          "+USE_HCACHE  "
 #else
          "-USE_HCACHE  "
@@ -499,8 +512,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 +578,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 +650,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;
 
@@ -902,7 +915,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 +928,7 @@ int main (int argc, char **argv)
       }
     }
 
-    mem_free (&bodytext);
+    p_delete(&bodytext);
 
     if (attach) {
       LIST *t = attach;
@@ -1017,7 +1030,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);
   }