X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=659d764041c3cc4d2f057ca0306e524f22fa0666;hp=d920c61befe0014873bb39772d029cfb95872845;hb=96d53ff49c308769efbf708e1e65819077cb7af6;hpb=ee1d4d931ca3ebec494694b74a1868a7a2e631e3

diff --git a/main.c b/main.c
index d920c61..659d764 100644
--- a/main.c
+++ b/main.c
@@ -29,6 +29,7 @@
 #include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/str.h"
+#include "lib/debug.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -47,7 +48,7 @@
 #endif
 
 #ifdef USE_NNTP
-#include <nntp.h>
+#include "nntp/nntp.h"
 #endif
 
 static const char *ReachingUs = N_("\
@@ -62,17 +63,18 @@ Mutt is free software, and you are welcome to redistribute it\n\
 under certain conditions; type `muttng -vv' for details.\n");
 
 static const char *Copyright = N_("\
-Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n\
+Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n\
 Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n\
-Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n\
-Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n\
-Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n\
+Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n\
+Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n\
+Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n\
 Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n\
 Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n\n\
-Parts were written/modified by:\n\
-Andreas Krennmair <ak@synflood.at>\n\
-Nico Golde <nico@ngolde.de>\n\
-Rocco Rutte <pdmef@cs.tu-berlin.de>\n\
+Copyright (C) 2005:\n\
+  Parts were written/modified by:\n\
+     Andreas Krennmair <ak@synflood.at>\n\
+     Nico Golde <nico@ngolde.de>\n\
+     Rocco Rutte <pdmef@cs.tu-berlin.de>\n\
 \n\
 Lots of others not mentioned here contributed lots of code,\n\
 fixes, and suggestions.\n\
@@ -226,6 +228,11 @@ static void show_version (void)
          "+USE_INODESORT   "
 #else
          "-USE_INODESORT   "
+#endif
+#if USE_HCACHE
+         "+USE_HCACHE  "
+#else
+         "-USE_HCACHE  "
 #endif
     );
   puts (
@@ -244,11 +251,6 @@ static void show_version (void)
 #else
          "-USE_IMAP  "
 #endif
-#ifdef IMAP_EDIT_THREADS
-         "+IMAP_EDIT_THREADS  "
-#else
-         "-IMAP_EDIT_THREADS  "
-#endif
 #ifdef USE_GSS
          "+USE_GSS  "
 #else
@@ -264,11 +266,6 @@ static void show_version (void)
 #else
          "-USE_GNUTLS  "
 #endif
-#ifdef USE_GNUTLS
-         "+USE_GNUTLS  "
-#else
-         "-USE_GNUTLS  "
-#endif
 #ifdef USE_SASL
          "+USE_SASL  "
 #else
@@ -360,11 +357,6 @@ static void show_version (void)
 #else
          "-BUFFY_SIZE "
 #endif
-#ifdef EXACT_ADDRESS
-         "+EXACT_ADDRESS  "
-#else
-         "-EXACT_ADDRESS  "
-#endif
 #ifdef SUN_ATTACHMENT
          "+SUN_ATTACHMENT  "
 #else
@@ -421,16 +413,6 @@ static void show_version (void)
          "+HAVE_GETADDRINFO  "
 #else
          "-HAVE_GETADDRINFO  "
-#endif
-#if USE_HCACHE
-         "+USE_HCACHE  "
-#else
-         "-USE_HCACHE  "
-#endif
-#if USE_HCACHE
-         "+USE_HCACHE  "
-#else
-         "-USE_HCACHE  "
 #endif
     );
 
@@ -453,6 +435,7 @@ static void show_version (void)
 
   puts (_(ReachingUs));
 
+  puts (_("Mutt-ng is based on the following patches written for mutt:\n"));
   mutt_print_patchlist ();
 
   exit (0);
@@ -518,11 +501,16 @@ int main (int argc, char **argv)
   int version = 0;
   int i;
   int explicit_folder = 0;
+  long sek;
   extern char *optarg;
   extern int optind;
 
+  /* initialize random number for tmp file creation */ 
+  time (&sek);
+  srand (sek);
+  
   /* sanity check against stupid administrators */
-
+  
   if (getegid () != getgid ()) {
     fprintf (stderr, "%s: I don't want to run with privileges!\n", argv[0]);
     exit (1);
@@ -588,9 +576,9 @@ int main (int argc, char **argv)
       break;
 
     case 'd':
+      debug_setlevel(atoi(optarg));
 #ifdef DEBUG
-      debuglevel = atoi (optarg);
-      printf (_("Debugging at level %d.\n"), debuglevel);
+      printf (_("Debugging at level %d.\n"), atoi(optarg));
 #else
       printf _("DEBUG was not defined during compilation.  Ignored.\n");
 #endif
@@ -696,10 +684,11 @@ int main (int argc, char **argv)
     start_curses ();
 
   /* set defaults and read init files */
+  mx_init ();
   mutt_init (flags & M_NOSYSRC, commands);
   mutt_free_list (&commands);
 
-  /* Initialize crypto backends.  */
+  /* Initialize crypto */
   crypt_init ();
 
   if (queries)
@@ -743,7 +732,7 @@ int main (int argc, char **argv)
     mutt_expand_path (fpath, sizeof (fpath));
 #ifdef USE_IMAP
     /* we're not connected yet - skip mail folder creation */
-    if (!mx_is_imap (fpath))
+    if (mx_get_magic (fpath) != M_IMAP)
 #endif
       if (stat (fpath, &sb) == -1 && errno == ENOENT) {
         snprintf (msg, sizeof (msg), _("%s does not exist. Create it?"),
@@ -803,7 +792,7 @@ int main (int argc, char **argv)
 
     if (infile || bodytext) {
       if (infile) {
-        if (safe_strcmp ("-", infile) == 0)
+        if (mutt_strcmp ("-", infile) == 0)
           fin = stdin;
         else {
           char path[_POSIX_PATH_MAX];
@@ -882,13 +871,13 @@ int main (int argc, char **argv)
   }
   else {
     if (flags & M_BUFFY) {
-      if (!mutt_buffy_check (0)) {
+      if (!buffy_check (0)) {
         mutt_endwin _("No mailbox with new mail.");
 
         exit (1);
       }
       folder[0] = 0;
-      mutt_buffy (folder, sizeof (folder));
+      buffy_next (folder, sizeof (folder));
     }
     else if (flags & M_SELECT) {
 #ifdef USE_NNTP