improve `sed --version' output
2009-03-31 Paolo Bonzini <bonzini@gnu.org> * 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.
This commit is contained in:
1 parent
694012c4e8
commit
d0d16cec98
7 files changed
+45
-21
No files matched your search
@@ -1,3 +1,18 @@
|
||||
2009-03-31 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
* 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 <bonzini@gnu.org>
|
||||
|
||||
* testsuite/Makefile.am: Distribute utf8-3 and utf8-4 test files.
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
+1
-1
@@ -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)
|
||||
|
||||
@@ -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: <http://www.gnu.org/software/sed/>.
|
||||
General help using GNU software: <http://www.gnu.org/gethelp/>.
|
||||
E-mail bug reports to: <bonzini@gnu.org>.
|
||||
E-mail bug reports to: <bug-gnu-utils@gnu.org>.
|
||||
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: <http://www.gnu.org/software/sed/>.
|
||||
General help using GNU software: <http://www.gnu.org/gethelp/>.
|
||||
E-mail bug reports to: <bug-gnu-utils@gnu.org>.
|
||||
Be sure to include the word ``sed'' somewhere in the ``Subject:'' field.
|
||||
.SH "SEE ALSO"
|
||||
.BR awk (1),
|
||||
|
||||
@@ -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: <http://www.gnu.org/software/sed/>.\n\
|
||||
General help using GNU software: <http://www.gnu.org/gethelp/>.\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: <http://www.gnu.org/software/sed/>.\n\
|
||||
General help using GNU software: <http://www.gnu.org/gethelp/>.\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);
|
||||
|
||||
@@ -6,5 +6,5 @@ to the extent permitted by law.
|
||||
|
||||
GNU sed home page: <http://www.gnu.org/software/sed/>.
|
||||
General help using GNU software: <http://www.gnu.org/gethelp/>.
|
||||
E-mail bug reports to: <bonzini@gnu.org>.
|
||||
E-mail bug reports to: <@PACKAGE_BUGREPORT@>.
|
||||
Be sure to include the word ``sed'' somewhere in the ``Subject:'' field.
|
||||
Reference in new issue
Block a user