X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=66c5f7ad4c2fe5d5903e75bde226b79e5b1d0b1e;hp=2fbb58edff9e728d153c41cd58a0f9c12a035443;hb=9342efc81d163ea56e079b4adf2ce17c41c853b0;hpb=e48e5f6eea09d24c11eab214cefadfd126da11dd diff --git a/main.c b/main.c index 2fbb58e..66c5f7a 100644 --- a/main.c +++ b/main.c @@ -19,6 +19,10 @@ # include "config.h" #endif +#include +#include +#include + #include "mutt.h" #include "mutt_curses.h" #include "keymap.h" @@ -27,9 +31,6 @@ #include "mutt_idna.h" #include "xterm.h" -#include "lib/mem.h" -#include "lib/intl.h" -#include "lib/str.h" #include "lib/debug.h" #include @@ -42,6 +43,9 @@ #ifdef HAVE_GETOPT_H #include +#else +extern char *optarg; +extern int optind; #endif #ifdef HAVE_LIBIDN @@ -56,7 +60,7 @@ #include #endif -#if USE_HCACHE +#ifdef USE_HCACHE #if HAVE_QDBM #include #elif HAVE_GDBM @@ -71,7 +75,11 @@ #endif #ifdef CRYPT_BACKEND_GPGME -#include +#include +#endif + +#ifdef USE_SSL +#include #endif static const char *ReachingUs = N_("\ @@ -85,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\ @@ -100,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) @@ -125,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\ @@ -141,8 +157,7 @@ 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"); + -c
\tspecify a carbon-copy (CC) address"); #if DEBUG puts _(" -d \tlog debugging output to ~/.muttngdebug0"); #endif @@ -153,14 +168,18 @@ options:\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\ @@ -178,7 +197,7 @@ static void show_version (void) char buf[STRING]; #endif - puts (mutt_make_version ()); + puts (mutt_make_version (1)); puts (_(Notice)); uname (&uts); @@ -214,7 +233,7 @@ static void show_version (void) printf (" libESMTP %s\n", buf); #endif -#if USE_HCACHE +#ifdef USE_HCACHE #if HAVE_QDBM printf (" qdbm %s\n", dpversion); #elif HAVE_GDBM @@ -229,6 +248,10 @@ static void show_version (void) 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 @@ -278,7 +301,7 @@ static void show_version (void) #else "-USE_INODESORT " #endif -#if USE_HCACHE +#ifdef USE_HCACHE "+USE_HCACHE " #else "-USE_HCACHE " @@ -320,11 +343,6 @@ static void show_version (void) #else "-USE_SASL " #endif -#ifdef USE_SASL2 - "+USE_SASL2 " -#else - "-USE_SASL2 " -#endif #ifdef USE_LIBESMTP "+USE_LIBESMTP " #else @@ -482,6 +500,7 @@ static void show_version (void) 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 @@ -492,8 +511,7 @@ static void show_version (void) 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); } @@ -558,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)); @@ -586,16 +602,16 @@ int main (int argc, char **argv) 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': @@ -632,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; @@ -704,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); } @@ -732,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; } @@ -759,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; @@ -852,7 +872,7 @@ int main (int argc, char **argv) } if (subject) - msg->env->subject = str_dup (subject); + msg->env->subject = m_strdup(subject); if (includeFile) infile = includeFile; @@ -860,7 +880,7 @@ int main (int argc, char **argv) if (infile || bodytext) { if (infile) { - if (str_cmp ("-", infile) == 0) + if (m_strcmp("-", infile) == 0) fin = stdin; else { char path[_POSIX_PATH_MAX]; @@ -879,7 +899,7 @@ int main (int argc, char **argv) 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); @@ -894,7 +914,7 @@ int main (int argc, char **argv) mutt_endwin (NULL); perror (tempfile); fclose (fin); - mem_free (&tempfile); + p_delete(&tempfile); exit (1); } if (fin) @@ -907,7 +927,7 @@ int main (int argc, char **argv) } } - mem_free (&bodytext); + p_delete(&bodytext); if (attach) { LIST *t = attach; @@ -1009,7 +1029,7 @@ int main (int argc, char **argv) if (option (OPTXTERMSETTITLES)) mutt_xterm_set_title (NONULL (XtermLeave)); if (Context) - mem_free (&Context); + p_delete(&Context); } mutt_endwin (Errorbuf); }