[cvs] bogofilter/src bogoconfig.c,1.226,1.227 bogolexer.c,1.88,1.89 bogoutil.c,1.223,1.224
Fast Bayesian spam filter along lines suggested by Paul Graham
Brought to you by:
m-a
Menu
▾
▴
[cvs] bogofilter/src bogoconfig.c,1.226,1.227 bogolexer.c,1.88,1.89 bogoutil.c,1.223,1.224
|
From: David R. <re...@us...> - 2005-06-12 01:47:23
|
Update of /cvsroot/bogofilter/bogofilter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22842/src Modified Files: bogoconfig.c bogolexer.c bogoutil.c Log Message: Output --help messsage to stdout, rather than stderr. Index: bogoutil.c =================================================================== RCS file: /cvsroot/bogofilter/bogofilter/src/bogoutil.c,v retrieving revision 1.223 retrieving revision 1.224 diff -u -d -r1.223 -r1.224 --- bogoutil.c 7 Jun 2005 23:08:14 -0000 1.223 +++ bogoutil.c 12 Jun 2005 01:47:15 -0000 1.224 @@ -451,7 +451,7 @@ static void print_version(void) { - (void)fprintf(stderr, + (void)fprintf(stdout, "%s version %s\n" " Database: %s\n" "Copyright (C) 2002-2005 Gyepi Sam, David Relson, Matthias Andree\n\n" @@ -464,26 +464,26 @@ progname, version, ds_version_str(), PACKAGE); } -static void usage(void) +static void usage(FILE *fp) { - fprintf(stderr, "Usage: %s {-h|-V}\n", progname); - fprintf(stderr, " or: %s [OPTIONS] {-d|-l|-u|-m|-w|-p|--db-verify} file%s\n", + fprintf(fp, "Usage: %s {-h|-V}\n", progname); + fprintf(fp, " or: %s [OPTIONS] {-d|-l|-u|-m|-w|-p|--db-verify} file%s\n", progname, DB_EXT); - fprintf(stderr, " or: %s [OPTIONS] {-H|-r|-R} file\n", progname); + fprintf(fp, " or: %s [OPTIONS] {-H|-r|-R} file\n", progname); #if defined (ENABLE_DB_DATASTORE) || defined (ENABLE_SQLITE_DATASTORE) - fprintf(stderr, " or: %s [OPTIONS] {--db-print-leafpage-count} file%s\n", + fprintf(fp, " or: %s [OPTIONS] {--db-print-leafpage-count} file%s\n", progname, DB_EXT); - fprintf(stderr, " or: %s [OPTIONS] {--db-print-pagesize} file%s\n", + fprintf(fp, " or: %s [OPTIONS] {--db-print-pagesize} file%s\n", progname, DB_EXT); #endif #if defined(ENABLE_DB_DATASTORE) && !defined(DISABLE_TRANSACTIONS) - fprintf(stderr, " or: %s [OPTIONS] {--db-checkpoint} directory\n", + fprintf(fp, " or: %s [OPTIONS] {--db-checkpoint} directory\n", progname); - fprintf(stderr, " or: %s [OPTIONS] {--db-list-logfiles} directory [list options]\n", + fprintf(fp, " or: %s [OPTIONS] {--db-list-logfiles} directory [list options]\n", progname); - fprintf(stderr, " or: %s [OPTIONS] {--db-prune|--db-remove-environment} directory\n", + fprintf(fp, " or: %s [OPTIONS] {--db-prune|--db-remove-environment} directory\n", progname); - fprintf(stderr, " or: %s [OPTIONS] {--db-recover|--db-recover-harder} directory\n", + fprintf(fp, " or: %s [OPTIONS] {--db-recover|--db-recover-harder} directory\n", progname); #endif } @@ -532,18 +532,18 @@ NULL }; -static void help(void) +static void help(FILE *fp) { uint i; const char **messages; - usage(); + usage(fp); messages = help_text; for (i=0; messages[i] != NULL; i++) - (void)fprintf(stderr, "%s", messages[i]); + (void)fprintf(fp, "%s", messages[i]); messages = dsm_help_bogoutil(); for (i=0; messages[i] != NULL; i++) - (void)fprintf(stderr, "%s", messages[i]); - (void)fprintf(stderr, + (void)fprintf(fp, "%s", messages[i]); + (void)fprintf(fp, "%s (version %s) is part of the bogofilter package.\n", progname, version ); @@ -610,7 +610,7 @@ if (count != 1) { - usage(); + usage(stderr); fprintf(stderr, "%s: Exactly one of the file or directory commands must be present.\n", progname); exit(EX_ERROR); } @@ -704,7 +704,7 @@ exit(EX_ERROR); case 'h': - help(); + help(stdout); exit(EX_OK); case 'H': @@ -826,7 +826,7 @@ mode = BFP_MUST_EXIST; break; case M_NONE: - usage(); + usage(stderr); exit(EX_ERROR); } @@ -854,7 +854,7 @@ /* Extra or missing parameters */ if (flag != M_WORD && flag != M_LIST_LOGFILES && argc != optind) { fprintf(stderr, "Missing or extraneous argument.\n"); - usage(); + usage(stderr); exit(EX_ERROR); } Index: bogolexer.c =================================================================== RCS file: /cvsroot/bogofilter/bogofilter/src/bogolexer.c,v retrieving revision 1.88 retrieving revision 1.89 diff -u -d -r1.88 -r1.89 --- bogolexer.c 7 Jun 2005 23:08:14 -0000 1.88 +++ bogolexer.c 12 Jun 2005 01:47:15 -0000 1.89 @@ -40,13 +40,13 @@ static void usage(void) { - fprintf(stderr, "Usage: %s [ -p | -q | -n | -h ]\n", progname); + fprintf(stdout, "Usage: %s [ -p | -q | -n | -h ]\n", progname); } static void help(void) { usage(); - fprintf(stderr, + fprintf(stdout, "\n" "\t-p\t- print the tokens from stdin.\n" "\t-q\t- quiet mode, no tokens are printed.\n" @@ -60,7 +60,7 @@ "\t-O file\t- write to file instead of stdout.\n" "\t-x list\t- set debug flags.\n" "\t-D\t- direct debug output to stdout.\n"); - fprintf(stderr, + fprintf(stdout, "\n" "%s (version %s) is part of the bogofilter package.\n", progname, version); @@ -68,7 +68,7 @@ static void print_version(void) { - (void)fprintf(stderr, + (void)fprintf(stdout, "%s version %s\n" "Copyright (C) 2002-2005 David Relson\n\n" "%s comes with ABSOLUTELY NO WARRANTY. " Index: bogoconfig.c =================================================================== RCS file: /cvsroot/bogofilter/bogofilter/src/bogoconfig.c,v retrieving revision 1.226 retrieving revision 1.227 diff -u -d -r1.226 -r1.227 --- bogoconfig.c 9 Jun 2005 00:23:49 -0000 1.226 +++ bogoconfig.c 12 Jun 2005 01:47:14 -0000 1.227 @@ -355,22 +355,23 @@ NULL }; -static void help(void) +static void help(FILE *fp) { uint i; - (void)fprintf(stderr, + (void)fprintf(fp, "%s version %s\n" "\n" - "Usage: %s [options] < message\n", + "Usage: %s [options] < message\n" + "\n", progtype, version, PACKAGE ); for (i=0; help_text[i] != NULL; i++) - (void)fprintf(stderr, "%s", help_text[i]); + (void)fprintf(fp, "%s", help_text[i]); } static void print_version(void) { - (void)fprintf(stderr, + (void)fprintf(stdout, "%s version %s\n" " Database: %s\n" "Copyright (C) 2002-2005 Eric S. Raymond,\n" @@ -508,7 +509,7 @@ break; case 'h': - help(); + help(stdout); exit(EX_OK); case 'I': |