I don't care about the release date.

[apps/madmutt.git] / main.c

diff --git a/main.c b/main.c
index d604a54..54899d8 100644 (file)
--- a/main.c
+++ b/main.c
@@ -19,17 +19,22 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+
 #include "mutt.h"
+#include "mx.h"
+#include "buffy.h"
+#include "sort.h"
+#include "mutt_crypt.h"
 #include "mutt_curses.h"
 #include "keymap.h"
 #include "url.h"
-#include "mutt_crypt.h"
 #include "mutt_idna.h"
 #include "xterm.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #include <string.h>
@@ -42,6 +47,9 @@
 
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#else
+extern char *optarg;
+extern int optind;
 #endif
 
 #ifdef HAVE_LIBIDN
@@ -56,7 +64,7 @@
 #include <libesmtp.h>
 #endif
 
-#if USE_HCACHE
+#ifdef USE_HCACHE
 #if HAVE_QDBM
 #include <depot.h>
 #elif HAVE_GDBM
@@ -74,6 +82,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 +237,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 +252,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 +305,7 @@ static void show_version (void)
 #else
          "-USE_INODESORT   "
 #endif
-#if USE_HCACHE
+#ifdef USE_HCACHE
          "+USE_HCACHE  "
 #else
          "-USE_HCACHE  "
@@ -499,8 +515,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 +581,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));
@@ -593,8 +606,8 @@ int main (int argc, char **argv)
   SRAND (time (NULL));
   umask (077);
 
-  memset (Options, 0, sizeof (Options));
-  memset (QuadOptions, 0, sizeof (QuadOptions));
+  p_clear(Options, sizeof(Options));
+  p_clear(QuadOptions, sizeof(QuadOptions));
 
 #ifdef USE_NNTP
   while ((i =
@@ -622,7 +635,7 @@ int main (int argc, char **argv)
       break;
 
     case 'f':
-      strfcpy (folder, optarg, sizeof (folder));
+      m_strcpy(folder, sizeof(folder), optarg);
       explicit_folder = 1;
       break;
 
@@ -640,9 +653,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;
 
@@ -804,7 +820,7 @@ int main (int argc, char **argv)
     char fpath[_POSIX_PATH_MAX];
     char msg[STRING];
 
-    strfcpy (fpath, Maildir, sizeof (fpath));
+    m_strcpy(fpath, sizeof(fpath), Maildir);
     mutt_expand_path (fpath, sizeof (fpath));
 #ifdef USE_IMAP
     /* we're not connected yet - skip mail folder creation */
@@ -860,7 +876,7 @@ int main (int argc, char **argv)
       }
 
       if (subject)
-        msg->env->subject = str_dup (subject);
+        msg->env->subject = m_strdup(subject);
 
       if (includeFile)
         infile = includeFile;
@@ -868,12 +884,12 @@ int main (int argc, char **argv)
 
     if (infile || bodytext) {
       if (infile) {
-        if (str_cmp ("-", infile) == 0)
+        if (m_strcmp("-", infile) == 0)
           fin = stdin;
         else {
           char path[_POSIX_PATH_MAX];
 
-          strfcpy (path, infile, sizeof (path));
+          m_strcpy(path, sizeof(path), infile);
           mutt_expand_path (path, sizeof (path));
           if ((fin = fopen (path, "r")) == NULL) {
             if (!option (OPTNOCURSES))
@@ -887,7 +903,7 @@ int main (int argc, char **argv)
         fin = NULL;
 
       mutt_mktemp (buf);
-      tempfile = str_dup (buf);
+      tempfile = m_strdup(buf);
 
       if (draftFile)
         msg->env = mutt_read_rfc822_header (fin, NULL, 1, 0);
@@ -902,7 +918,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 +931,7 @@ int main (int argc, char **argv)
       }
     }
 
-    mem_free (&bodytext);
+    p_delete(&bodytext);
 
     if (attach) {
       LIST *t = attach;
@@ -980,7 +996,7 @@ int main (int argc, char **argv)
     }
 
     if (!folder[0])
-      strfcpy (folder, NONULL (Spoolfile), sizeof (folder));
+      m_strcpy(folder, sizeof(folder), NONULL(Spoolfile));
 
 #ifdef USE_NNTP
     if (option (OPTNEWS)) {
@@ -1017,7 +1033,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);
   }