[cvs] bogofilter/src bogoconfig.c,1.147,1.148 bogolexer.c,1.61,1.62 bogotune.c,1.100,1.101 bogoutil.
Fast Bayesian spam filter along lines suggested by Paul Graham
Brought to you by:
m-a
Menu
▾
▴
[cvs] bogofilter/src bogoconfig.c,1.147,1.148 bogolexer.c,1.61,1.62 bogotune.c,1.100,1.101 bogoutil.c,1.93,1.94
|
From: <re...@pr...> - 2004-01-31 05:25:13
|
Update of /cvsroot/bogofilter/bogofilter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26596 Modified Files: bogoconfig.c bogolexer.c bogotune.c bogoutil.c Log Message: Further copyright notice clean-ups. Index: bogoconfig.c =================================================================== RCS file: /cvsroot/bogofilter/bogofilter/src/bogoconfig.c,v retrieving revision 1.147 retrieving revision 1.148 diff -u -d -r1.147 -r1.148 --- bogoconfig.c 30 Jan 2004 04:39:58 -0000 1.147 +++ bogoconfig.c 30 Jan 2004 05:06:08 -0000 1.148 @@ -431,12 +431,13 @@ (void)fprintf(stderr, "Copyright (C) 2002-2004 Eric S. Raymond,\n" "David Relson, Matthias Andree, Greg Louis\n\n" - "%s comes with ABSOLUTELY NO WARRANTY. " - "This is free software, and you\nare welcome to " - "redistribute it under the General Public License. " - "See the\nCOPYING file with the source distribution for " + + "%s comes with ABSOLUTELY NO WARRANTY. " + "This is free software, and\nyou are welcome to " + "redistribute it under the General Public License. " + "See\nthe COPYING file with the source distribution for " "details.\n" - "\n", + "\n", PACKAGE); } Index: bogolexer.c =================================================================== RCS file: /cvsroot/bogofilter/bogofilter/src/bogolexer.c,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- bogolexer.c 30 Jan 2004 04:39:58 -0000 1.61 +++ bogolexer.c 30 Jan 2004 05:06:08 -0000 1.62 @@ -30,9 +30,7 @@ #include "token.h" #include "mime.h" -#define PROGNAME "bogolexer" - -const char *progname = PROGNAME; +const char *progname = "bogolexer"; /* prevent larger inclusions */ @@ -115,12 +113,12 @@ (void)fprintf(stderr, "%s version %s\n" "Copyright (C) 2002-2004 David Relson\n\n" - "%s comes with ABSOLUTELY NO WARRANTY. " - "This is free software, and you\nare welcome to " - "redistribute it under the General Public License. " - "See the\nCOPYING file with the source distribution for " + "%s comes with ABSOLUTELY NO WARRANTY. " + "This is free software, and\nyou are welcome to " + "redistribute it under the General Public License. " + "See\nthe COPYING file with the source distribution for " "details.\n" - "\n", + "\n", progname, version, PACKAGE); } Index: bogotune.c =================================================================== RCS file: /cvsroot/bogofilter/bogofilter/src/bogotune.c,v retrieving revision 1.100 retrieving revision 1.101 diff -u -d -r1.100 -r1.101 --- bogotune.c 30 Jan 2004 04:39:58 -0000 1.100 +++ bogotune.c 30 Jan 2004 05:06:08 -0000 1.101 @@ -773,11 +773,13 @@ "%s version %s\n" " Database: %s\n" "Copyright (C) 2002-2004 Greg Louis, David Relson\n\n" - "%s comes with ABSOLUTELY NO WARRANTY.\n" - "This is free software, and you are welcome to redistribute\n" - "it under the General Public License.\n" - "See the COPYING file with the source distribution for details.\n\n", - progtype, version); + "%s comes with ABSOLUTELY NO WARRANTY. " + "This is free software, and\nyou are welcome to " + "redistribute it under the General Public License. " + "See\nthe COPYING file with the source distribution for " + "details.\n" + "\n", + progtype, version, ds_version_str(), PACKAGE); } static void help(void) Index: bogoutil.c =================================================================== RCS file: /cvsroot/bogofilter/bogofilter/src/bogoutil.c,v retrieving revision 1.93 retrieving revision 1.94 diff -u -d -r1.93 -r1.94 --- bogoutil.c 30 Jan 2004 04:39:58 -0000 1.93 +++ bogoutil.c 30 Jan 2004 05:06:08 -0000 1.94 @@ -38,12 +38,10 @@ #include "xmalloc.h" #include "xstrdup.h" -#define PROGNAME "bogoutil" +const char *progname = "bogoutil"; #define MINIMUM_FREQ 5 /* minimum freq */ -const char *progname = PROGNAME; - static int token_count = 0; bool maintain = false; @@ -128,7 +126,7 @@ word_t *token; if (fgets((char *)buf, BUFSIZE, stdin) == NULL) { if (ferror(stdin)) { - perror(PROGNAME); + perror(progname); rv = 2; } break; @@ -165,7 +163,7 @@ fprintf(stderr, "%s: Unexpected input [%s] on line %lu. " "Expecting whitespace before count.\n", - PROGNAME, buf, line); + progname, buf, line); rv = 1; break; } @@ -207,7 +205,7 @@ if (fgets((char *)buff->t.text, buff->size, fp) == NULL) { if (ferror(fp)) { - perror(PROGNAME); + perror(progname); rv = 2; } else { rv = 1; @@ -223,7 +221,7 @@ fprintf(stderr, "%s: Unexpected input [%s]. Does not end with newline " "or line too long.\n", - PROGNAME, buff->t.text); + progname, buff->t.text); rv = 1; } } @@ -389,7 +387,7 @@ if (count == 0) { - fprintf(stderr, "%s: string too long creating %s file name.\n", PROGNAME, DB_EXT); + fprintf(stderr, "%s: string too long creating %s file name.\n", progname, DB_EXT); exit(EX_ERROR); } @@ -416,17 +414,19 @@ "%s version %s\n" " Database: %s\n" "Copyright (C) 2002-2004 Gyepi Sam, David Relson\n\n" - "%s comes with ABSOLUTELY NO WARRANTY.\n" - "This is free software, and you are welcome to redistribute\n" - "it under the General Public License.\n" - "See the COPYING file with the source distribution for details.\n\n", - progtype, version, ds_version_str(), PROGNAME); + "%s comes with ABSOLUTELY NO WARRANTY. " + "This is free software, and\nyou are welcome to " + "redistribute it under the General Public License. " + "See\nthe COPYING file with the source distribution for " + "details.\n" + "\n", + progname, version, ds_version_str(), PACKAGE); } static void usage(void) { fprintf(stderr, "Usage: %s { -d | -l | -w | -p } file%s | { -r | -R } directory | [ -v | -h | -V ]\n", - PROGNAME, DB_EXT); + progname, DB_EXT); } static void help(void) @@ -465,7 +465,7 @@ "\t-I file\tRead this file instead of standard input.\n" "\n" "%s (version %s) is part of the bogofilter package.\n", - PROGNAME, version); + progname, version); } char *ds_file = NULL; @@ -626,7 +626,7 @@ if (count != 1) { fprintf(stderr, "%s: Exactly one of the -d, -l, -R or -w flags " - "must be present.\n", PROGNAME); + "must be present.\n", progname); exit(EX_ERROR); } |