aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--fetchmail.c15
2 files changed, 15 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index c16ac65e..50099bca 100644
--- a/NEWS
+++ b/NEWS
@@ -59,6 +59,7 @@ fetchmail 6.3.2 (to be released):
downstream debian/patches/01_man_page.dpatch. Matthias Andree.
* Add missing --help text for "--sslcertck" option. Matthias Andree.
* fetchmailconf.py: Accept --help and --version. Matthias Andree.
+* fetchmail --version now prints the copyright notice. Matthias Andree.
fetchmail 6.3.1 (released 2005-12-19):
diff --git a/fetchmail.c b/fetchmail.c
index 24c38141..62ea09fc 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -127,6 +127,16 @@ static RETSIGTYPE donothing(int sig)
lastsig = sig;
}
+static void printcopyright(FILE *fp) {
+ fprintf(fp, GT_("Copyright (C) 2002, 2003 Eric S. Raymond\n"
+ "Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham Wilson\n"
+ "Copyright (C) 2005 Matthias Andree, Sunil Shetye\n"
+ "Copyright (C) 2006 Matthias Andree\n"));
+ fprintf(fp, GT_("Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
+ "are welcome to redistribute it under certain conditions. For details,\n"
+ "please see the file COPYING in the source or documentation directory.\n"));
+}
+
const char *iana_charset;
int main(int argc, char **argv)
@@ -253,9 +263,12 @@ int main(int argc, char **argv)
#ifdef ENABLE_NLS
"+NLS"
#endif /* ENABLE_NLS */
- "\n";
+ ".\n";
printf(GT_("This is fetchmail release %s"), VERSION);
fputs(features, stdout);
+ puts("");
+ printcopyright(stdout);
+ puts("");
fputs("Fallback MDA: ", stdout);
#ifdef FALLBACK_MDA
fputs(FALLBACK_MDA, stdout);