X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=9af3581011300a468739333435cacf085df1cad5;hp=1d3d349a2d786f961e0f03de99fee8c7cd551b96;hb=308c7080ccca40d4865d8810f5528331d9ed61ff;hpb=afa60149c4d2bb71c8195091d3658b3bdc12d59d diff --git a/main.c b/main.c index 1d3d349..9af3581 100644 --- a/main.c +++ b/main.c @@ -19,6 +19,9 @@ # include "config.h" #endif +#include +#include + #include "mutt.h" #include "mutt_curses.h" #include "keymap.h" @@ -27,8 +30,6 @@ #include "mutt_idna.h" #include "xterm.h" -#include "lib/mem.h" -#include "lib/intl.h" #include "lib/str.h" #include "lib/debug.h" @@ -42,6 +43,9 @@ #ifdef HAVE_GETOPT_H #include +#else +extern char *optarg; +extern int optind; #endif #ifdef HAVE_LIBIDN @@ -52,6 +56,32 @@ #include "nntp/nntp.h" #endif +#ifdef USE_LIBESMTP +#include +#endif + +#ifdef USE_HCACHE +#if HAVE_QDBM +#include +#elif HAVE_GDBM +#include +#elif HAVE_DB4 +#include +#endif +#endif + +#ifdef USE_GNUTLS +#include +#endif + +#ifdef CRYPT_BACKEND_GPGME +#include +#endif + +#ifdef USE_SSL +#include +#endif + static const char *ReachingUs = N_("\ To contact the developers, please mail to .\n\ To visit the Mutt-ng homepage go to http://www.muttng.org.\n\ @@ -63,14 +93,16 @@ Mutt-ng comes with ABSOLUTELY NO WARRANTY; for details type `muttng -vv'.\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 \n\ Copyright (C) 1996-2002 Brandon Long \n\ Copyright (C) 1997-2005 Thomas Roessler \n\ Copyright (C) 1998-2005 Werner Koch \n\ Copyright (C) 1999-2005 Brendan Cully \n\ Copyright (C) 1999-2002 Tommi Komulainen \n\ -Copyright (C) 2000-2002 Edmund Grimley Evans \n\n\ +Copyright (C) 2000-2002 Edmund Grimley Evans \n"); + +static const char *Copyright_Mutt_NG = N_("\ Copyright (C) 2005:\n\ Parts were written/modified by:\n\ Andreas Krennmair \n\ @@ -78,21 +110,25 @@ Copyright (C) 2005:\n\ Rocco Rutte \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) @@ -103,14 +139,16 @@ void mutt_exit (int code) static void mutt_usage (void) { - puts (mutt_make_version ()); + puts (mutt_make_version (1)); puts - _ - ("usage: muttng [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f ]\n\ + _("usage: muttng [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f ]\n\ muttng [ -nR ] [ -e ] [ -F ] -Q [ -Q ] [...]\n\ muttng [ -nR ] [ -e ] [ -F ] -A [ -A ] [...]\n\ - muttng [ -nR ] [ -e ] [ -F ] -D\n\ + muttng [ -nR ] [ -e ] [ -F ] -t"); + puts + _("\ + muttng [ -nR ] [ -e ] [ -F ] -T\n\ muttng [ -nx ] [ -e ] [ -a ] [ -F ] [ -H ] [ -i ] [ -s ] [ -b ] [ -c ] [ ... ]\n\ muttng [ -n ] [ -e ] [ -F ] -p\n\ muttng -v[v]\n\ @@ -119,22 +157,29 @@ options:\n\ -A \texpand the given alias\n\ -a \tattach a file to the message\n\ -b
\tspecify a blind carbon-copy (BCC) address\n\ - -c
\tspecify a carbon-copy (CC) address\n\ - -D\t\tprint the value of all variables to stdout\n\ + -c
\tspecify a carbon-copy (CC) address"); +#if DEBUG + puts _(" -d \tlog debugging output to ~/.muttngdebug0"); +#endif + puts _("\ -e \tspecify a command to be executed after initialization\n\ -f \tspecify which mailbox to read\n\ - -F \tspecify an alternate muttrc file\n\ + -F \tspecify an alternate muttrngc file\n\ -g \tspecify a newsserver (if compiled with NNTP)\n\ -G\t\tselect a newsgroup (if compiled with NNTP)\n\ -H \tspecify a draft file to read header and body from\n\ - -i \tspecify a file which Mutt-ng should include in the body\n\ + -i \tspecify a file which Mutt-ng should include in the body"); + puts _("\ -d \t specify debugging level of Mutt-ng\n\ -m \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 \tquery a configuration variable\n\ -R\t\topen mailbox in read-only mode\n\ - -s \tspecify a subject (must be in quotes if it has spaces)\n\ + -s \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\ @@ -148,59 +193,82 @@ options:\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 -#ifdef DOMAIN - printf ("DOMAIN=\"%s\"\n", DOMAIN); -#else - puts ("-DOMAIN"); +#ifdef 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 DEBUG - puts ("+DEBUG"); -#else - puts ("-DEBUG"); +#ifdef USE_GNUTLS + 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 + + 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 " @@ -217,7 +285,7 @@ static void show_version (void) #else "-DL_STANDALONE " #endif - "\n" + "\n " #ifdef USE_FCNTL "+USE_FCNTL " #else @@ -233,7 +301,7 @@ static void show_version (void) #else "-USE_INODESORT " #endif -#if USE_HCACHE +#ifdef USE_HCACHE "+USE_HCACHE " #else "-USE_HCACHE " @@ -241,9 +309,9 @@ static void show_version (void) ); puts ( #ifdef USE_POP - "+USE_POP " + " +USE_POP " #else - "-USE_POP " + " -USE_POP " #endif #ifdef USE_NNTP "+USE_NNTP " @@ -275,17 +343,12 @@ static void show_version (void) #else "-USE_SASL " #endif -#ifdef USE_SASL2 - "+USE_SASL2 " -#else - "-USE_SASL2 " -#endif #ifdef USE_LIBESMTP "+USE_LIBESMTP " #else "-USE_LIBESMTP " #endif - "\n" + "\n " #ifdef HAVE_REGCOMP "+HAVE_REGCOMP " #else @@ -301,7 +364,7 @@ static void show_version (void) #else "-COMPRESSED " #endif - "\n" + "\n " #ifdef HAVE_COLOR "+HAVE_COLOR " #else @@ -322,7 +385,7 @@ static void show_version (void) #else "-HAVE_BKGDSET " #endif - "\n" + "\n " #ifdef HAVE_CURS_SET "+HAVE_CURS_SET " #else @@ -342,9 +405,9 @@ static void show_version (void) 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 " @@ -366,7 +429,7 @@ static void show_version (void) #else "-SUN_ATTACHMENT " #endif - "\n" + "\n " #ifdef ENABLE_NLS "+ENABLE_NLS " #else @@ -392,7 +455,7 @@ static void show_version (void) #else "-HAVE_LANGINFO_YESEXPR " #endif - "\n" + "\n " #if HAVE_ICONV "+HAVE_ICONV " #else @@ -420,27 +483,35 @@ static void show_version (void) #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 (" +PKGDOCDIR=\"%s\"\n", PKGDOCDIR); + 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)); - 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); } @@ -505,9 +576,7 @@ int main (int argc, char **argv) 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)); @@ -539,10 +608,10 @@ int main (int argc, char **argv) #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': @@ -579,21 +648,21 @@ int main (int argc, char **argv) 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; @@ -651,7 +720,7 @@ int main (int argc, char **argv) { 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); } @@ -679,14 +748,18 @@ int main (int argc, char **argv) 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; } @@ -706,8 +779,8 @@ int main (int argc, char **argv) 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; @@ -799,7 +872,7 @@ int main (int argc, char **argv) } if (subject) - msg->env->subject = safe_strdup (subject); + msg->env->subject = str_dup (subject); if (includeFile) infile = includeFile; @@ -807,7 +880,7 @@ int main (int argc, char **argv) if (infile || bodytext) { if (infile) { - if (mutt_strcmp ("-", infile) == 0) + if (str_cmp ("-", infile) == 0) fin = stdin; else { char path[_POSIX_PATH_MAX]; @@ -826,7 +899,7 @@ int main (int argc, char **argv) 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); @@ -841,7 +914,7 @@ int main (int argc, char **argv) mutt_endwin (NULL); perror (tempfile); fclose (fin); - FREE (&tempfile); + p_delete(&tempfile); exit (1); } if (fin) @@ -854,7 +927,7 @@ int main (int argc, char **argv) } } - FREE (&bodytext); + p_delete(&bodytext); if (attach) { LIST *t = attach; @@ -956,7 +1029,7 @@ int main (int argc, char **argv) if (option (OPTXTERMSETTITLES)) mutt_xterm_set_title (NONULL (XtermLeave)); if (Context) - FREE (&Context); + p_delete(&Context); } mutt_endwin (Errorbuf); }