and even less very old hacks.

[apps/madmutt.git] / main.c

diff --git a/main.c b/main.c
index d703022..06a8a6f 100644 (file)
--- a/main.c
+++ b/main.c
@@ -20,18 +20,21 @@
 #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>
@@ -281,12 +284,6 @@ static void show_version (void)
 #else
          "-USE_DOTLOCK  "
 #endif
-#ifdef DL_STANDALONE
-         "+DL_STANDALONE  "
-#else
-         "-DL_STANDALONE  "
-#endif
-         "\n  "
 #ifdef USE_FCNTL
          "+USE_FCNTL  "
 #else
@@ -297,11 +294,6 @@ static void show_version (void)
 #else
          "-USE_FLOCK   "
 #endif
-#ifdef USE_INODESORT
-         "+USE_INODESORT   "
-#else
-         "-USE_INODESORT   "
-#endif
 #ifdef USE_HCACHE
          "+USE_HCACHE  "
 #else
@@ -359,11 +351,6 @@ static void show_version (void)
          "+USE_GNU_REGEX  "
 #else
          "-USE_GNU_REGEX  "
-#endif
-#ifdef USE_COMPRESSED
-         "+COMPRESSED  "
-#else
-         "-COMPRESSED  "
 #endif
          "\n  "
 #ifdef HAVE_COLOR
@@ -405,16 +392,6 @@ static void show_version (void)
     );
 
   puts (
-#ifdef CRYPT_BACKEND_CLASSIC_PGP
-         "  +CRYPT_BACKEND_CLASSIC_PGP  "
-#else
-         "  -CRYPT_BACKEND_CLASSIC_PGP  "
-#endif
-#ifdef CRYPT_BACKEND_CLASSIC_SMIME
-         "+CRYPT_BACKEND_CLASSIC_SMIME  "
-#else
-         "-CRYPT_BACKEND_CLASSIC_SMIME  "
-#endif
 #ifdef CRYPT_BACKEND_GPGME
          "+CRYPT_BACKEND_GPGME  "
 #else
@@ -424,11 +401,6 @@ static void show_version (void)
          "+BUFFY_SIZE "
 #else
          "-BUFFY_SIZE "
-#endif
-#ifdef SUN_ATTACHMENT
-         "+SUN_ATTACHMENT  "
-#else
-         "-SUN_ATTACHMENT  "
 #endif
          "\n  "
 #ifdef ENABLE_NLS
@@ -436,11 +408,6 @@ static void show_version (void)
 #else
          "-ENABLE_NLS  "
 #endif
-#ifdef LOCALES_HACK
-         "+LOCALES_HACK  "
-#else
-         "-LOCALES_HACK  "
-#endif
 #ifdef HAVE_WC_FUNCS
          "+HAVE_WC_FUNCS  "
 #else
@@ -486,12 +453,6 @@ static void show_version (void)
 
   puts (_("Built-In Defaults:"));
 
-#ifdef DOMAIN
-  printf ("  +DOMAIN=\"%s\"\n", DOMAIN);
-#else
-  puts ("  -DOMAIN");
-#endif
-
 #ifdef ISPELL
   printf ("  +ISPELL=\"%s\"\n", ISPELL);
 #else
@@ -503,7 +464,6 @@ static void show_version (void)
   printf ("  +PKGDATADIR=\"%s\"\n", PKGDATADIR);
   printf ("  +PKGDOCDIR=\"%s\"\n", PKGDOCDIR);
   printf ("  +SYSCONFDIR=\"%s\"\n", SYSCONFDIR);
-  printf ("  +EXECSHELL=\"%s\"\n", EXECSHELL);
 #ifdef MIXMASTER
   printf ("  +MIXMASTER=\"%s\"\n\n", MIXMASTER);
 #else
@@ -603,8 +563,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 =
@@ -628,11 +588,11 @@ int main (int argc, char **argv)
       break;
 
     case 'F':
-      str_replace (&Muttrc, optarg);
+      m_strreplace(&Muttrc, optarg);
       break;
 
     case 'f':
-      strfcpy (folder, optarg, sizeof (folder));
+      m_strcpy(folder, sizeof(folder), optarg);
       explicit_folder = 1;
       break;
 
@@ -785,7 +745,7 @@ int main (int argc, char **argv)
 
   if (alias_queries) {
     int rv = 0;
-    ADDRESS *a;
+    address_t *a;
 
     for (; alias_queries; alias_queries = alias_queries->next) {
       if ((a = mutt_lookup_alias (alias_queries->data))) {
@@ -817,7 +777,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 */
@@ -873,7 +833,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;
@@ -881,12 +841,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))
@@ -900,7 +860,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);
@@ -993,7 +953,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)) {
@@ -1005,8 +965,8 @@ int main (int argc, char **argv)
 #endif
       mutt_expand_path (folder, sizeof (folder));
 
-    str_replace (&CurrentFolder, folder);
-    str_replace (&LastFolder, folder);
+    m_strreplace(&CurrentFolder, folder);
+    m_strreplace(&LastFolder, folder);
 
     if (flags & M_IGNORE) {
       /* check to see if there are any messages in the folder */