X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=34359415cdb15ab0f8fc5da8022061055b2d7c6b;hp=aaa8877f12c5e06043860a2ecb9edd2887dc0c79;hb=c6b9d35ed9361e4defab9762a7480d5126405ae9;hpb=75254682ac295c8bd39ec01d8e96c5d9b0938682

diff --git a/main.c b/main.c
index aaa8877..3435941 100644
--- a/main.c
+++ b/main.c
@@ -19,6 +19,11 @@
 # 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 "mutt_curses.h"
 #include "keymap.h"
@@ -27,9 +32,6 @@
 #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 +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
@@ -229,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
@@ -297,7 +302,7 @@ static void show_version (void)
 #else
          "-USE_INODESORT   "
 #endif
-#if USE_HCACHE
+#ifdef USE_HCACHE
          "+USE_HCACHE  "
 #else
          "-USE_HCACHE  "
@@ -573,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));
@@ -600,8 +603,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 =
@@ -870,7 +873,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;
@@ -878,7 +881,7 @@ 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];
@@ -897,7 +900,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);
@@ -912,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)
@@ -925,7 +928,7 @@ int main (int argc, char **argv)
       }
     }
 
-    mem_free (&bodytext);
+    p_delete(&bodytext);
 
     if (attach) {
       LIST *t = attach;
@@ -1027,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);
   }