#include "nntp/nntp.h"
#endif
+#ifdef USE_LIBESMTP
+#include <libesmtp.h>
+#endif
+
+#if USE_HCACHE
+#if HAVE_QDBM
+#include <depot.h>
+#elif HAVE_GDBM
+#include <gdbm.h>
+#elif HAVE_DB4
+#include <db.h>
+#endif
+#endif
+
+#ifdef USE_GNUTLS
+#include <gnutls/gnutls.h>
+#endif
+
+#ifdef CRYPT_BACKEND_GPGME
+#include <gpgme/gpgme.h>
+#endif
+
static const char *ReachingUs = N_("\
To contact the developers, please mail to <mutt-ng-devel@lists.berlios.de>.\n\
To visit the Mutt-ng homepage go to http://www.muttng.org.\n\
static void mutt_usage (void)
{
- puts (mutt_make_version ());
+ puts (mutt_make_version (1));
puts
_
-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\n\
+ -D\t\tprint the value of all variables to stdout");
+#if DEBUG
+ puts _(" -d <level>\tlog debugging output to ~/.muttngdebug0");
+#endif
+ puts _("\
-e <command>\tspecify a command to be executed after initialization\n\
-f <file>\tspecify which mailbox to read\n\
- -F <file>\tspecify an alternate muttrc file\n\
+ -F <file>\tspecify an alternate muttrngc file\n\
-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\
static void show_version (void)
{
struct utsname uts;
+#ifdef USE_LIBESMTP
+ char buf[STRING];
+#endif
- puts (mutt_make_version ());
+ puts (mutt_make_version (1));
puts (_(Notice));
uname (&uts);
#ifdef _AIX
- printf ("System: %s %s.%s", uts.sysname, uts.version, uts.release);
+ printf ("System:\n %s %s.%s", uts.sysname, uts.version, uts.release);
#elif defined (SCO)
- printf ("System: SCO %s", uts.release);
+ printf ("System:\n SCO %s", uts.release);
#else
- printf ("System: %s %s", uts.sysname, uts.release);
+ printf ("System:\n %s %s", uts.sysname, uts.release);
#endif
- printf (" (%s)", uts.machine);
+ printf (" (%s)\nExternal Libraries:\n", uts.machine);
#ifdef NCURSES_VERSION
- printf (" [using ncurses %s]", NCURSES_VERSION);
+ printf (" ncurses %s\n", NCURSES_VERSION);
#elif defined(USE_SLANG_CURSES)
- printf (" [using slang %d]", SLANG_VERSION);
+ printf (" slang %d\n", SLANG_VERSION);
#endif
#ifdef _LIBICONV_VERSION
- printf (" [using libiconv %d.%d]", _LIBICONV_VERSION >> 8,
+ printf (" libiconv %d.%d\n", _LIBICONV_VERSION >> 8,
_LIBICONV_VERSION & 0xff);
#endif
#ifdef HAVE_LIBIDN
- printf (" [using libidn %s (compiled with %s)]",
+ printf (" libidn %s (compiled with %s)\n",
stringprep_check_version (NULL), STRINGPREP_VERSION);
#endif
- puts (_("\nCompile options:"));
+#ifdef USE_LIBESMTP
+ smtp_version (buf, sizeof (buf), 0);
+ printf (" libESMTP %s\n", buf);
+#endif
+
+#if USE_HCACHE
+#if HAVE_QDBM
+ printf (" qdbm %s\n", dpversion);
+#elif HAVE_GDBM
+ printf (" gdbm %s\n", gdbm_version);
+#elif HAVE_DB4
+ printf (" DB4 %d.%d.%d\n", DB_VERSION_MAJOR, DB_VERSION_MINOR,
+ DB_VERSION_PATCH);
+#endif
+#endif
-#ifdef DOMAIN
- printf ("DOMAIN=\"%s\"\n", DOMAIN);
-#else
- puts ("-DOMAIN");
+#ifdef USE_GNUTLS
+ printf (" gnutls %s\n", LIBGNUTLS_VERSION);
#endif
-#ifdef DEBUG
- puts ("+DEBUG");
-#else
- puts ("-DEBUG");
+#ifdef CRYPT_BACKEND_GPGME
+ printf (" gpgme %s\n", GPGME_VERSION);
#endif
+ puts (_("Compile Options:"));
+#ifdef DEBUG
+ puts (" +DEBUG");
+#else
+ puts (" -DEBUG");
+#endif
puts (
#ifdef HOMESPOOL
- "+HOMESPOOL "
+ " +HOMESPOOL "
#else
- "-HOMESPOOL "
+ " -HOMESPOOL "
#endif
#ifdef USE_SETGID
"+USE_SETGID "
#else
"-DL_STANDALONE "
#endif
- "\n"
+ "\n "
#ifdef USE_FCNTL
"+USE_FCNTL "
#else
);
puts (
#ifdef USE_POP
- "+USE_POP "
+ " +USE_POP "
#else
- "-USE_POP "
+ " -USE_POP "
#endif
#ifdef USE_NNTP
"+USE_NNTP "
#else
"-USE_LIBESMTP "
#endif
- "\n"
+ "\n "
#ifdef HAVE_REGCOMP
"+HAVE_REGCOMP "
#else
#else
"-COMPRESSED "
#endif
- "\n"
+ "\n "
#ifdef HAVE_COLOR
"+HAVE_COLOR "
#else
#else
"-HAVE_BKGDSET "
#endif
- "\n"
+ "\n "
#ifdef HAVE_CURS_SET
"+HAVE_CURS_SET "
#else
puts (
#ifdef CRYPT_BACKEND_CLASSIC_PGP
- "+CRYPT_BACKEND_CLASSIC_PGP "
+ " +CRYPT_BACKEND_CLASSIC_PGP "
#else
- "-CRYPT_BACKEND_CLASSIC_PGP "
+ " -CRYPT_BACKEND_CLASSIC_PGP "
#endif
#ifdef CRYPT_BACKEND_CLASSIC_SMIME
"+CRYPT_BACKEND_CLASSIC_SMIME "
#else
"-SUN_ATTACHMENT "
#endif
- "\n"
+ "\n "
#ifdef ENABLE_NLS
"+ENABLE_NLS "
#else
#else
"-HAVE_LANGINFO_YESEXPR "
#endif
- "\n"
+ "\n "
#if HAVE_ICONV
"+HAVE_ICONV "
#else
#endif
);
+ puts (_("Built-In Defaults:"));
+
+#ifdef DOMAIN
+ printf (" +DOMAIN=\"%s\"\n", DOMAIN);
+#else
+ puts (" -DOMAIN");
+#endif
+
#ifdef ISPELL
- printf ("ISPELL=\"%s\"\n", ISPELL);
+ printf (" +ISPELL=\"%s\"\n", ISPELL);
#else
- puts ("-ISPELL");
+ puts (" -ISPELL");
#endif
- printf ("SENDMAIL=\"%s\"\n", SENDMAIL);
- printf ("MAILPATH=\"%s\"\n", MAILPATH);
- printf ("PKGDATADIR=\"%s\"\n", PKGDATADIR);
- printf ("SYSCONFDIR=\"%s\"\n", SYSCONFDIR);
- printf ("EXECSHELL=\"%s\"\n", EXECSHELL);
+ printf (" +SENDMAIL=\"%s\"\n", SENDMAIL);
+ printf (" +MAILPATH=\"%s\"\n", MAILPATH);
+ printf (" +PKGDATADIR=\"%s\"\n", PKGDATADIR);
+ printf (" +SYSCONFDIR=\"%s\"\n", SYSCONFDIR);
+ printf (" +EXECSHELL=\"%s\"\n", EXECSHELL);
#ifdef MIXMASTER
- printf ("MIXMASTER=\"%s\"\n", MIXMASTER);
+ printf (" +MIXMASTER=\"%s\"\n\n", MIXMASTER);
#else
- puts ("-MIXMASTER");
+ puts (" -MIXMASTER\n");
#endif
puts (_(ReachingUs));
case 'd':
debug_setlevel(atoi(optarg));
#ifdef DEBUG
- if (atoi(optarg)<=3 && atoi(optoarg)>=0)
+ 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 (0-3)\n"))
+ printf(_("Please specify a valid debugging level ("
+ DEBUG_MIN_LEVEL_S "-" DEBUG_MAX_LEVEL_S ").\n"));
return 1;
}
#else
show_version ();
break;
default:
- puts (mutt_make_version ());
+ puts (mutt_make_version (1));
puts (_(Copyright));
puts (_(ReachingUs));
exit (0);
}
if (subject)
- msg->env->subject = safe_strdup (subject);
+ msg->env->subject = str_dup (subject);
if (includeFile)
infile = includeFile;
if (infile || bodytext) {
if (infile) {
- if (mutt_strcmp ("-", infile) == 0)
+ if (str_cmp ("-", infile) == 0)
fin = stdin;
else {
char path[_POSIX_PATH_MAX];
fin = NULL;
mutt_mktemp (buf);
- tempfile = safe_strdup (buf);
+ tempfile = str_dup (buf);
if (draftFile)
msg->env = mutt_read_rfc822_header (fin, NULL, 1, 0);
mutt_endwin (NULL);
perror (tempfile);
fclose (fin);
- FREE (&tempfile);
+ mem_free (&tempfile);
exit (1);
}
if (fin)
}
}
- FREE (&bodytext);
+ mem_free (&bodytext);
if (attach) {
LIST *t = attach;
if (option (OPTXTERMSETTITLES))
mutt_xterm_set_title (NONULL (XtermLeave));
if (Context)
- FREE (&Context);
+ mem_free (&Context);
}
mutt_endwin (Errorbuf);
}
projects / apps / madmutt.git / blobdiff