We don't need a function for mutt_make_version().

[apps/madmutt.git] / main.c

diff --git a/main.c b/main.c
index f53dc03..afa5ef8 100644 (file)
--- a/main.c
+++ b/main.c
@@ -45,10 +45,6 @@ extern int optind;
 #include <stringprep.h>
 #endif
 
-#ifdef USE_NNTP
-#include "nntp.h"
-#endif
-
 #ifdef USE_HCACHE
 #if defined(HAVE_QDBM)
 #include <depot.h>
@@ -68,7 +64,7 @@ void mutt_exit(int code)
 
 static void mutt_usage (void)
 {
-    puts(mutt_make_version());
+    puts(madmutt_version);
 
     puts(_("\
 usage: madmutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -f <file> ]\n\
@@ -83,10 +79,6 @@ usage: madmutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -f <file> ]\n\
     puts(_("  -e <command>  specify a command to be executed after initialization"));
     puts(_("  -f <file>     specify which mailbox to read"));
     puts(_("  -F <file>     specify an alternate Madmuttrc file"));
-#ifdef USE_NNTP
-    puts(_("  -g <server>   specify a newsserver"));
-    puts(_("  -G            select a newsgroup"));
-#endif
     puts(_("  -H <file>     specify a draft file to read header and body from"));
     puts(_("  -i <file>     specify a file which Madmutt should include in the body"));
     puts(_("  -n            causes Madmutt not to read the system Madmuttrc"));
@@ -94,7 +86,6 @@ usage: madmutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -f <file> ]\n\
     puts(_("  -R            open mailbox in read-only mode"));
     puts(_("  -s <subj>     specify a subject (must be in quotes if it has spaces)"));
     puts(_("  -v            show version and compile-time definitions"));
-    puts(_("  -y            select a mailbox specified in your `mailboxes' list"));
     puts(_("  -z            exit immediately if there are no messages in the mailbox"));
     puts(_("  -Z            open the first folder with new message, exit immediately if none"));
     puts(_("  -h            this help message"));
@@ -107,7 +98,7 @@ static void show_version (void)
     struct utsname uts;
     uname(&uts);
 
-    puts(mutt_make_version());
+    puts(madmutt_version);
     puts(_("  Copyright (C) 1996-2002 Michael R. Elkins and others."));
     puts(_("  Copyright (C) 2005      The Mutt-ng Team"));
     puts(_("  Copyright (C) 2006-2007 Pierre Habouzit"));
@@ -153,11 +144,6 @@ static void show_version (void)
 #else
         "  -USE_HCACHE"
 #endif
-#ifdef USE_NNTP
-        "  +USE_NNTP"
-#else
-        "  -USE_NNTP"
-#endif
 #ifdef HAVE_LIBIDN
         "  +HAVE_LIBIDN"
 #else
@@ -184,8 +170,6 @@ static void show_version (void)
 #define M_BUFFY   (1<<1)        /* -Z */
 #define M_NOSYSRC (1<<2)        /* -n */
 #define M_RO      (1<<3)        /* -R */
-#define M_SELECT  (1<<4)        /* -y */
-#define M_NEWS    (1<<5)        /* -g and -G */
 
 __attribute__((format(printf, 1, 0)))
 static void mutt_nocurses_error (const char *fmt, ...)
@@ -232,11 +216,7 @@ int main (int argc, char **argv)
   srand48 (time (NULL));
   umask (077);
 
-  while ((i = getopt(argc, argv, "a:b:F:f:c:e:H:s:i:hnpRTtvyzZ"
-#ifdef USE_NNTP
-                                                                    "g:G"
-#endif
-                    )) >= 0)
+  while ((i = getopt(argc, argv, "a:b:F:f:c:e:H:s:i:hnpRTtvzZ")) >= 0)
     switch (i) {
     case 'a':
       if (strlen(optarg)<=512)
@@ -300,24 +280,6 @@ int main (int argc, char **argv)
       version++;
       break;
 
-    case 'y':                  /* My special hack mode */
-      flags |= M_SELECT;
-      break;
-
-#ifdef USE_NNTP
-    case 'g':                  /* Specify a newsserver */
-      {
-        char buf[LONG_STRING];
-
-        snprintf (buf, sizeof (buf), "set nntp_host=%s", optarg);
-        commands = mutt_add_list (commands, buf);
-      }
-
-    case 'G':                  /* List of newsgroups */
-      flags |= M_SELECT | M_NEWS;
-      break;
-#endif
-
     case 'z':
       flags |= M_IGNORE;
       break;
@@ -510,42 +472,11 @@ int main (int argc, char **argv)
       folder[0] = 0;
       buffy_next (folder, sizeof (folder));
     }
-    else if (flags & M_SELECT) {
-#ifdef USE_NNTP
-      if (flags & M_NEWS) {
-        set_option (OPTNEWS);
-        if (!(CurrentNewsSrv = mutt_select_newsserver (NewsServer))) {
-          mutt_endwin (Errorbuf);
-          exit (1);
-        }
-      } else
-#endif
-      if (!Incoming.len) {
-        mutt_endwin _("No incoming mailboxes defined.");
-
-        exit (1);
-      }
-      folder[0] = 0;
-      mutt_select_file(folder, sizeof(folder), M_SEL_FOLDER | M_SEL_BUFFY,
-                       NULL, NULL);
-      if (!folder[0]) {
-        mutt_endwin (NULL);
-        exit (0);
-      }
-    }
 
     if (!folder[0])
       m_strcpy(folder, sizeof(folder), NONULL(Spoolfile));
 
-#ifdef USE_NNTP
-    if (option (OPTNEWS)) {
-      unset_option (OPTNEWS);
-      nntp_expand_path (folder, sizeof (folder),
-                        &CurrentNewsSrv->conn->account);
-    } else
-#endif
-      mutt_expand_path (folder, sizeof (folder));
-
+    mutt_expand_path (folder, sizeof (folder));
     m_strreplace(&CurrentFolder, folder);
     m_strreplace(&LastFolder, folder);