A first take at bringing copyright notices and credits into synch

with reality.

1 files changed, 28 insertions, 5 deletions

diff --git a/main.c b/main.c
index 2c85da3d..63b61af1 100644
--- a/main.c
+++ b/main.c
@@ -32,14 +32,20 @@
 #include <sys/stat.h>
 #include <sys/utsname.h>
 
+const char ReachingUs[] = "\
+To contact the developers, please mail to <mutt-dev@mutt.org>.\n";
+
 const char Notice[] = "\
-Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>\n\
+Copyright (C) 1996-8 Michael R. Elkins and others.\n\
 Mutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\n\
 Mutt is free software, and you are welcome to redistribute it\n\
 under certain conditions; type `mutt -vv' for details.\n";
 
 const char Copyright[] = "\
 Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>\n\
+Copyright (C) 1997-8 Thomas Roessler <roessler@guug.de>\n\
+Copyright (C) 1998   Werner Koch <wk@isil.d.shuttle.de>\n\
+Copyright (C) 1998   Ruslan Ermilov <ru@ucb.crimea.ua>\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\
@@ -53,7 +59,24 @@ Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>\n\
 \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., 675 Mass Ave, Cambridge, MA 02139, USA.\n";
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n\
+"
+#ifdef _PGPPATH
+"\n\
+SHA1 implementation Copyright (C) 1995-7 Eric A. Young <eay@cryptsoft.com>\n\
+\n\
+    Redistribution and use in source and binary forms, with or without\n\
+    modification, are permitted under certain conditions.\n\
+\n\
+    The SHA1 implementation comes AS IS, and ANY EXPRESS OR IMPLIED\n\
+    WARRANTIES, including, but not limited to, the implied warranties of\n\
+    merchantability and fitness for a particular purpose ARE DISCLAIMED.\n\
+\n\
+    You should have received a copy of the full distribution terms\n\
+    along with this program; if not, write to the program's developers.\n\
+"
+#endif
+;
 
 void mutt_exit (int code)
 {
@@ -240,13 +263,12 @@ static void show_version (void)
   printf ("_PGPV3PATH=\"%s\"\n", _PGPV3PATH);
 # endif
 # ifdef _PGPGPPATH
-  pritnf ("_PGPGPGPATH=\"%s\"\n", _PGPGPGPATH);
+  printf ("_PGPGPGPATH=\"%s\"\n", _PGPGPGPATH);
 # endif
 #endif
 
 
-
-  puts ("\nMail bug reports along with this output to <mutt-dev@mutt.org>.");
+  puts(ReachingUs);
 
   exit (0);
 }
@@ -428,6 +450,7 @@ int main (int argc, char **argv)
     default:
       printf ("Mutt %s (%s)\n", VERSION, ReleaseDate);
       puts (Copyright);
+      puts (ReachingUs);
       exit (0);
   }