diff --git a/ChangeLog b/ChangeLog index 7e3bf86..aa2c6a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2009-03-31 Paolo Bonzini + + * sed/sed.c (contact): New. + (usage): From here. + (main): Use it for `sed --version' too. + + * configure.ac: Point to GNU project mailing lists. + * sed/sed.c (contact): Use PACKAGE_BUGREPORT. + * testsuite/version.gin: Likewise. + * testsuite/version.good: Regenerate. + * doc/sed.1: Regenerate. + + * bootstrap.sh.in (PACKAGE_BUGREPORT): New. + * bootstrap.sh: Regenerate. + 2009-03-31 Paolo Bonzini * testsuite/Makefile.am: Distribute utf8-3 and utf8-4 test files. diff --git a/bootstrap.sh b/bootstrap.sh index c9b64be..b2d96fa 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -19,6 +19,7 @@ if test -f config.h; then :; else */ #define PACKAGE "sed" +#define PACKAGE_BUGREPORT "bug-gnu-utils@gnu.org" #define VERSION "4.1e-boot" #define SED_FEATURE_VERSION "4.2" #define BOOTSTRAP 1 diff --git a/bootstrap.sh.in b/bootstrap.sh.in index fa4c612..9905b7a 100755 --- a/bootstrap.sh.in +++ b/bootstrap.sh.in @@ -19,6 +19,7 @@ if test -f config.h; then :; else */ #define PACKAGE "sed" +#define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@" #define VERSION "@VERSION@-boot" #define SED_FEATURE_VERSION "@SED_FEATURE_VERSION@" #define BOOTSTRAP 1 diff --git a/configure.ac b/configure.ac index 90165e6..5abdaa9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Process this file with -*- autoconf -*- to produce a configure script. -AC_INIT(sed, 4.1e, bonzini@gnu.org, sed) +AC_INIT(sed, 4.1e, bug-gnu-utils@gnu.org, sed) AC_CONFIG_AUX_DIR(build-aux) AC_CONFIG_SRCDIR([sed/sed.c]) AM_CONFIG_HEADER(config.h:config_h.in) diff --git a/doc/sed.1 b/doc/sed.1 index ae9bd34..8b30084 100644 --- a/doc/sed.1 +++ b/doc/sed.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.28. -.TH SED "1" "February 2009" "sed version 4.1e" "User Commands" +.TH SED "1" "March 2009" "sed version 4.1e" "User Commands" .SH NAME sed \- stream editor for filtering and transforming text .SH SYNOPSIS @@ -75,7 +75,7 @@ specified, then the standard input is read. .PP GNU sed home page: . General help using GNU software: . -E-mail bug reports to: . +E-mail bug reports to: . Be sure to include the word ``sed'' somewhere in the ``Subject:'' field. .SH "COMMAND SYNOPSIS" This is just a brief synopsis of \*(sd commands to serve as @@ -373,7 +373,9 @@ This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, to the extent permitted by law. .PP -E-mail bug reports to: bonzini@gnu.org . +GNU sed home page: . +General help using GNU software: . +E-mail bug reports to: . Be sure to include the word ``sed'' somewhere in the ``Subject:'' field. .SH "SEE ALSO" .BR awk (1), diff --git a/sed/sed.c b/sed/sed.c index a77be57..903f18c 100644 --- a/sed/sed.c +++ b/sed/sed.c @@ -1,5 +1,4 @@ #define COPYRIGHT_NOTICE "Copyright (C) 2003 Free Software Foundation, Inc." -#define BUG_ADDRESS "bonzini@gnu.org" /* GNU SED, a batch stream editor. Copyright (C) 1989,90,91,92,93,94,95,98,99,2002,2003 @@ -90,6 +89,25 @@ countT lcmd_out_line_len = 70; /* The complete compiled SED program that we are going to run: */ static struct vector *the_program = NULL; +static void usage P_((int)); +static void +contact(errmsg) + int errmsg; +{ + FILE *out = errmsg ? stderr : stdout; +#ifndef REG_PERL + fprintf(out, _("GNU sed home page: .\n\ +General help using GNU software: .\n")); +#endif + + /* Only print the bug report address for `sed --help', otherwise we'll + get reports for other people's bugs. */ + if (!errmsg) + fprintf(out, _("E-mail bug reports to: <%s>.\n\ +Be sure to include the word ``%s'' somewhere in the ``Subject:'' field.\n"), + PACKAGE_BUGREPORT, PACKAGE); +} + static void usage P_((int)); static void usage(status) @@ -144,18 +162,7 @@ non-option argument is taken as the sed script to interpret. All\n\ remaining arguments are names of input files; if no input files are\n\ specified, then the standard input is read.\n\ \n")); - -#ifndef REG_PERL - fprintf(out, _("GNU sed home page: .\n\ -General help using GNU software: .\n")); -#endif - - /* Only print the bug report address for `sed --help', otherwise we'll - get reports for other people's bugs. */ - if (!status) - fprintf(out, _("E-mail bug reports to: <%s>.\n\ -Be sure to include the word ``%s'' somewhere in the ``Subject:'' field.\n"), - BUG_ADDRESS, PACKAGE); + contact (status); ck_fclose (NULL); exit (status); @@ -316,9 +323,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,\n\ to the extent permitted by law.\n\ "), COPYRIGHT_NOTICE); fputc('\n', stdout); - fprintf(stdout, _("E-mail bug reports to: %s .\n\ -Be sure to include the word ``%s'' somewhere in the ``Subject:'' field.\n"), - BUG_ADDRESS, PACKAGE); + contact(false); ck_fclose (NULL); exit (0); diff --git a/testsuite/version.gin b/testsuite/version.gin index 0f51868..be02cd0 100644 --- a/testsuite/version.gin +++ b/testsuite/version.gin @@ -6,5 +6,5 @@ to the extent permitted by law. GNU sed home page: . General help using GNU software: . -E-mail bug reports to: . +E-mail bug reports to: <@PACKAGE_BUGREPORT@>. Be sure to include the word ``sed'' somewhere in the ``Subject:'' field.