# 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>
#ifdef HAVE_GETOPT_H
#include <getopt.h>
+#else
+extern char *optarg;
+extern int optind;
#endif
#ifdef HAVE_LIBIDN
#include <libesmtp.h>
#endif
-#if USE_HCACHE
+#ifdef USE_HCACHE
#if HAVE_QDBM
#include <depot.h>
#elif HAVE_GDBM
#endif
#ifdef CRYPT_BACKEND_GPGME
-#include <gpgme/gpgme.h>
+#include <gpgme.h>
+#endif
+
+#ifdef USE_SSL
+#include <openssl/opensslv.h>
#endif
static const char *ReachingUs = N_("\
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_("\
+static const char *Copyright_Mutt = 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-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\
+Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n");
+
+static const char *Copyright_Mutt_NG = N_("\
Copyright (C) 2005:\n\
Parts were written/modified by:\n\
Andreas Krennmair <ak@synflood.at>\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\
+fixes, and suggestions.");
+
+static const char* Copyright_GPL_1 = N_("\
\n\
This program is free software; you can redistribute it and/or modify\n\
it under the terms of the GNU General Public License as published by\n\
the Free Software Foundation; either version 2 of the License, or\n\
- (at your option) any later version.\n\
-\n\
+ (at your option) any later version.\n");
+
+static const char* Copyright_GPL_2 = N_("\
This program is distributed in the hope that it will be useful,\n\
but WITHOUT ANY WARRANTY; without even the implied warranty of\n\
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\
- GNU General Public License for more details.\n\
-\n\
+ GNU General Public License for more details.\n");
+
+static const char* Copyright_GPL_3 = N_("\
You should have received a copy of the GNU General Public License\n\
along with this program; if not, write to the Free Software\n\
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n\
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n\
");
void mutt_exit (int code)
static void mutt_usage (void)
{
- puts (mutt_make_version ());
+ puts (mutt_make_version (1));
puts
- _
- ("usage: muttng [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f <file> ]\n\
+ _("usage: muttng [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f <file> ]\n\
muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] [...]\n\
muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] [...]\n\
- muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n\
+ muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -t");
+ puts
+ _("\
+ muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -T\n\
muttng [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] [ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n\
muttng [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n\
muttng -v[v]\n\
-A <alias>\texpand the given alias\n\
-a <file>\tattach a file to the message\n\
-b <address>\tspecify a blind carbon-copy (BCC) address\n\
- -c <address>\tspecify a carbon-copy (CC) address\n\
- -D\t\tprint the value of all variables to stdout");
+ -c <address>\tspecify a carbon-copy (CC) address");
#if DEBUG
puts _(" -d <level>\tlog debugging output to ~/.muttngdebug0");
#endif
-g <server>\tspecify a newsserver (if compiled with NNTP)\n\
-G\t\tselect a newsgroup (if compiled with NNTP)\n\
-H <file>\tspecify a draft file to read header and body from\n\
- -i <file>\tspecify a file which Mutt-ng should include in the body\n\
+ -i <file>\tspecify a file which Mutt-ng should include in the body");
+ puts _("\
-d <level>\t specify debugging level of Mutt-ng\n\
-m <type>\tspecify a default mailbox type\n\
-n\t\tcauses Mutt-ng not to read the system Muttngrc\n\
-p\t\trecall a postponed message\n\
-Q <variable>\tquery a configuration variable\n\
-R\t\topen mailbox in read-only mode\n\
- -s <subj>\tspecify a subject (must be in quotes if it has spaces)\n\
+ -s <subj>\tspecify a subject (must be in quotes if it has spaces)");
+ puts _("\
+ -t\t\tprint the value of all variables to stdout\n\
+ -T\t\tprint the value of all changed variables to stdout\n\
-v\t\tshow version and compile-time definitions\n\
-x\t\tsimulate the mailx send mode\n\
-y\t\tselect a mailbox specified in your `mailboxes' list\n\
char buf[STRING];
#endif
- puts (mutt_make_version ());
+ puts (mutt_make_version (1));
puts (_(Notice));
uname (&uts);
printf (" libESMTP %s\n", buf);
#endif
-#if USE_HCACHE
+#ifdef USE_HCACHE
#if HAVE_QDBM
printf (" qdbm %s\n", dpversion);
#elif HAVE_GDBM
- printf (" gdbm %s\n", gbdm_version);
+ printf (" gdbm %s\n", gdbm_version);
#elif HAVE_DB4
printf (" DB4 %d.%d.%d\n", DB_VERSION_MAJOR, DB_VERSION_MINOR,
DB_VERSION_PATCH);
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
#else
"-USE_INODESORT "
#endif
-#if USE_HCACHE
+#ifdef USE_HCACHE
"+USE_HCACHE "
#else
"-USE_HCACHE "
#else
"-USE_SASL "
#endif
-#ifdef USE_SASL2
- "+USE_SASL2 "
-#else
- "-USE_SASL2 "
-#endif
#ifdef USE_LIBESMTP
"+USE_LIBESMTP "
#else
printf (" +SENDMAIL=\"%s\"\n", SENDMAIL);
printf (" +MAILPATH=\"%s\"\n", MAILPATH);
printf (" +PKGDATADIR=\"%s\"\n", PKGDATADIR);
+ printf (" +PKGDOCDIR=\"%s\"\n", PKGDOCDIR);
printf (" +SYSCONFDIR=\"%s\"\n", SYSCONFDIR);
printf (" +EXECSHELL=\"%s\"\n", EXECSHELL);
#ifdef MIXMASTER
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);
}
int version = 0;
int i;
int explicit_folder = 0;
- int dump_variables = 0;
- extern char *optarg;
- extern int optind;
+ int dump_variables = -1;
/* initialize random number for tmp file creation */
srand ((unsigned int) time (NULL));
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 =
getopt (argc, argv,
- "A:a:b:F:f:c:Dd:e:g:GH:s:i:hm:npQ:RvxyzZ")) != EOF)
+ "A:a:b:F:f:c:d:e:g:GH:s:i:hm:npQ:RTtvxyzZ")) != EOF)
#else
while ((i =
- getopt (argc, argv, "A:a:b:F:f:c:Dd:e:H:s:i:hm:npQ:RvxyzZ")) != EOF)
+ getopt (argc, argv, "A:a:b:F:f:c:d:e:H:s:i:hm:npQ:RTtvxyzZ")) != EOF)
#endif
switch (i) {
case 'A':
break;
case 'f':
- strfcpy (folder, optarg, sizeof (folder));
+ m_strcpy(folder, sizeof(folder), optarg);
explicit_folder = 1;
break;
break;
case 'd':
- debug_setlevel(atoi(optarg));
-#ifdef DEBUG
- if (atoi(optarg) <= DEBUG_MAX_LEVEL && atoi(optarg) >= DEBUG_MIN_LEVEL)
- printf (_("Debugging at level %d.\n"), atoi(optarg));
- else {
- printf(_("Please specify a valid debugging level ("
- DEBUG_MIN_LEVEL_S "-" DEBUG_MAX_LEVEL_S ").\n"));
- return 1;
+ {
+ 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);
}
-#else
- printf _("DEBUG was not defined during compilation. Ignored.\n");
-#endif
break;
- case 'D':
+ case 't':
+ dump_variables = 2;
+ break;
+
+ case 'T':
dump_variables = 1;
break;
{
char buf[LONG_STRING];
- snprintf (buf, sizeof (buf), "set news_server=%s", optarg);
+ snprintf (buf, sizeof (buf), "set nntp_host=%s", optarg);
commands = mutt_add_list (commands, buf);
}
show_version ();
break;
default:
- puts (mutt_make_version ());
- puts (_(Copyright));
+ puts (mutt_make_version (1));
+ puts (_(Copyright_Mutt));
+ puts (_(Copyright_Mutt_NG));
+ puts (_(Copyright_GPL_1));
+ puts (_(Copyright_GPL_2));
+ puts (_(Copyright_GPL_3));
puts (_(ReachingUs));
exit (0);
}
/* Check for a batch send. */
- if (!isatty (0) || queries || alias_queries || dump_variables) {
+ if (!isatty (0) || queries || alias_queries || dump_variables > 0) {
set_option (OPTNOCURSES);
sendflags = SENDBATCH;
}
if (queries)
return mutt_query_variables (queries);
- if (dump_variables)
- return (mutt_dump_variables ());
+ if (dump_variables > 0)
+ return (mutt_dump_variables (dump_variables-1));
if (alias_queries) {
int rv = 0;
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 */
}
if (subject)
- msg->env->subject = str_dup (subject);
+ msg->env->subject = m_strdup(subject);
if (includeFile)
infile = includeFile;
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))
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);
mutt_endwin (NULL);
perror (tempfile);
fclose (fin);
- mem_free (&tempfile);
+ p_delete(&tempfile);
exit (1);
}
if (fin)
}
}
- mem_free (&bodytext);
+ p_delete(&bodytext);
if (attach) {
LIST *t = attach;
}
if (!folder[0])
- strfcpy (folder, NONULL (Spoolfile), sizeof (folder));
+ m_strcpy(folder, sizeof(folder), NONULL(Spoolfile));
#ifdef USE_NNTP
if (option (OPTNEWS)) {
if (option (OPTXTERMSETTITLES))
mutt_xterm_set_title (NONULL (XtermLeave));
if (Context)
- mem_free (&Context);
+ p_delete(&Context);
}
mutt_endwin (Errorbuf);
}
projects / apps / madmutt.git / blobdiff