From 6be673363a420d4f21e9ab1fbd5835ffba38a7ed Mon Sep 17 00:00:00 2001 From: Pierre Habouzit Date: Sat, 18 Nov 2006 18:33:55 +0100 Subject: [PATCH] remove useless things Signed-off-by: Pierre Habouzit --- main.c | 62 +++++++--------------------------------------------------- 1 file changed, 7 insertions(+), 55 deletions(-) diff --git a/main.c b/main.c index ea0d55f..9a4a3df 100644 --- a/main.c +++ b/main.c @@ -78,47 +78,11 @@ extern int optind; static const char *Notice = N_("\ Copyright (C) 1996-2002 Michael R. Elkins and others.\n\ -Madmutt comes with ABSOLUTELY NO WARRANTY; for details type `madmutt -vv'.\n\ -Mutt is free software, and you are welcome to redistribute it\n\ -under certain conditions; type `madmutt -vv' for details.\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"); - -static const char *Copyright_Mutt_NG = N_("\ -Copyright (C) 2005:\n\ - Parts were written/modified by:\n\ - Andreas Krennmair \n\ - Nico Golde \n\ - Rocco Rutte \n\ -\n\ -Lots of others not mentioned here contributed lots of code,\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"); - -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"); - -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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n\ -"); +Copyright (C) 2005 The Mutt-ng Team\n\ +Copyright (C) 2006 Pierre Habouzit undation, Inc.\n\ +This is free software. You may redistribute copies of it under the terms of\n\ +the GNU General Public License .\n\ +There is NO WARRANTY, to the extent permitted by law.\n"); void mutt_exit (int code) { @@ -140,7 +104,7 @@ static void mutt_usage (void) madmutt [ -nR ] [ -e ] [ -F ] -T\n\ madmutt [ -nx ] [ -e ] [ -a ] [ -F ] [ -H ] [ -i ] [ -s ] [ -b ] [ -c ] [ ... ]\n\ madmutt [ -n ] [ -e ] [ -F ] -p\n\ - madmutt -v[v]\n\ + madmutt -v\n\ \n\ options:\n\ -A \texpand the given alias\n\ @@ -632,20 +596,8 @@ int main (int argc, char **argv) mutt_usage (); } - switch (version) { - case 0: - break; - case 1: + if (version) { show_version (); - break; - default: - puts (mutt_make_version (1)); - puts (_(Copyright_Mutt)); - puts (_(Copyright_Mutt_NG)); - puts (_(Copyright_GPL_1)); - puts (_(Copyright_GPL_2)); - puts (_(Copyright_GPL_3)); - exit (0); } /* Check for a batch send. */ -- 2.20.1