diff --git a/configure.in b/configure.in index 0b0a871298..a2db1884d3 100644 --- a/configure.in +++ b/configure.in @@ -79,7 +79,7 @@ PostgreSQL has apparently not been ported to your platform yet. To try a manual configuration, look into the src/template directory for a similar platform and use the '--with-template=' option. -Please also contact to see about +Please also contact <]AC_PACKAGE_BUGREPORT[> to see about rectifying this. Include the above 'checking host system type...' line. ******************************************************************* diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c index 2b53dac64a..e67f71d97d 100644 --- a/contrib/oid2name/oid2name.c +++ b/contrib/oid2name/oid2name.c @@ -219,8 +219,8 @@ help(const char *progname) " -p, --port=PORT database server port number\n" " -U, --username=USERNAME connect as specified database user\n" "\nThe default action is to show all database OIDs.\n\n" - "Report bugs to .\n", - progname, progname); + "Report bugs to <%s>.\n", + progname, progname, PACKAGE_BUGREPORT); } /* diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c index 9784d7aef3..15604da765 100644 --- a/contrib/pg_standby/pg_standby.c +++ b/contrib/pg_standby/pg_standby.c @@ -612,7 +612,7 @@ usage(void) " restore_command = 'pg_standby [OPTION]... ARCHIVELOCATION %%f %%p %%r'\n" "e.g.\n" " restore_command = 'pg_standby /mnt/server/archiverdir %%f %%p %%r'\n"); - printf("\nReport bugs to .\n"); + printf("\nReport bugs to <%s>.\n", PACKAGE_BUGREPORT); } #ifndef WIN32 diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c index 8dd4238317..b8aa295665 100644 --- a/contrib/vacuumlo/vacuumlo.c +++ b/contrib/vacuumlo/vacuumlo.c @@ -436,7 +436,7 @@ usage(const char *progname) printf(" -w, --no-password never prompt for password\n"); printf(" -W, --password force password prompt\n"); printf("\n"); - printf("Report bugs to .\n"); + printf("Report bugs to <%s>.\n", PACKAGE_BUGREPORT); } diff --git a/src/backend/main/main.c b/src/backend/main/main.c index c0d1fcde06..1bb4ae03b8 100644 --- a/src/backend/main/main.c +++ b/src/backend/main/main.c @@ -359,7 +359,7 @@ help(const char *progname) printf(_("\nPlease read the documentation for the complete list of run-time\n" "configuration settings and how to set them on the command line or in\n" "the configuration file.\n\n" - "Report bugs to .\n")); + "Report bugs to <%s>.\n"), PACKAGE_BUGREPORT); } diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index cd61665eea..55187eb910 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -5141,7 +5141,7 @@ ExitPostmaster(int status) ereport(LOG, (errcode(ERRCODE_INTERNAL_ERROR), errmsg_internal("postmaster became multithreaded"), - errdetail("Please report this to ."))); + errdetail("Please report this to <%s>.", PACKAGE_BUGREPORT))); #endif /* should cleanup shared memory and kill all backends */ diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index 5302973379..12dd83c230 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -2322,7 +2322,7 @@ usage(const char *progname) printf(_(" -?, --help show this help, then exit\n")); printf(_("\nIf the data directory is not specified, the environment variable PGDATA\n" "is used.\n")); - printf(_("\nReport bugs to .\n")); + printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); } static void diff --git a/src/bin/pg_archivecleanup/pg_archivecleanup.c b/src/bin/pg_archivecleanup/pg_archivecleanup.c index 2917d7fc63..aef99eba30 100644 --- a/src/bin/pg_archivecleanup/pg_archivecleanup.c +++ b/src/bin/pg_archivecleanup/pg_archivecleanup.c @@ -269,7 +269,7 @@ usage(void) "Or for use as a standalone archive cleaner:\n" "e.g.\n" " pg_archivecleanup /mnt/server/archiverdir 000000010000000000000010.00000020.backup\n")); - printf(_("\nReport bugs to .\n")); + printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); } /*------------ MAIN ----------------------------------------*/ diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c index 2551cf38c9..b75b6d4da2 100644 --- a/src/bin/pg_basebackup/pg_basebackup.c +++ b/src/bin/pg_basebackup/pg_basebackup.c @@ -396,7 +396,7 @@ usage(void) printf(_(" -U, --username=NAME connect as specified database user\n")); printf(_(" -w, --no-password never prompt for password\n")); printf(_(" -W, --password force password prompt (should happen automatically)\n")); - printf(_("\nReport bugs to .\n")); + printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); } diff --git a/src/bin/pg_basebackup/pg_receivewal.c b/src/bin/pg_basebackup/pg_receivewal.c index f5acf12ae7..808078e6b7 100644 --- a/src/bin/pg_basebackup/pg_receivewal.c +++ b/src/bin/pg_basebackup/pg_receivewal.c @@ -102,7 +102,7 @@ usage(void) printf(_("\nOptional actions:\n")); printf(_(" --create-slot create a new replication slot (for the slot's name see --slot)\n")); printf(_(" --drop-slot drop the replication slot (for the slot's name see --slot)\n")); - printf(_("\nReport bugs to .\n")); + printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); } static bool diff --git a/src/bin/pg_basebackup/pg_recvlogical.c b/src/bin/pg_basebackup/pg_recvlogical.c index c9c4eaa928..ef2d806fb3 100644 --- a/src/bin/pg_basebackup/pg_recvlogical.c +++ b/src/bin/pg_basebackup/pg_recvlogical.c @@ -103,7 +103,7 @@ usage(void) printf(_(" -U, --username=NAME connect as specified database user\n")); printf(_(" -w, --no-password never prompt for password\n")); printf(_(" -W, --password force password prompt (should happen automatically)\n")); - printf(_("\nReport bugs to .\n")); + printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); } /* diff --git a/src/bin/pg_checksums/pg_checksums.c b/src/bin/pg_checksums/pg_checksums.c index eb17950096..b457866048 100644 --- a/src/bin/pg_checksums/pg_checksums.c +++ b/src/bin/pg_checksums/pg_checksums.c @@ -88,7 +88,7 @@ usage(void) printf(_(" -?, --help show this help, then exit\n")); printf(_("\nIf no data directory (DATADIR) is specified, " "the environment variable PGDATA\nis used.\n\n")); - printf(_("Report bugs to .\n")); + printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT); } /* diff --git a/src/bin/pg_config/pg_config.c b/src/bin/pg_config/pg_config.c index 8ed4915fee..9ff56e2fca 100644 --- a/src/bin/pg_config/pg_config.c +++ b/src/bin/pg_config/pg_config.c @@ -102,7 +102,7 @@ help(void) printf(_(" --version show the PostgreSQL version\n")); printf(_(" -?, --help show this help, then exit\n")); printf(_("\nWith no arguments, all known items are shown.\n\n")); - printf(_("Report bugs to .\n")); + printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT); } static void diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c index 19e21ab491..a53794b9e6 100644 --- a/src/bin/pg_controldata/pg_controldata.c +++ b/src/bin/pg_controldata/pg_controldata.c @@ -41,7 +41,7 @@ usage(const char *progname) printf(_(" -?, --help show this help, then exit\n")); printf(_("\nIf no data directory (DATADIR) is specified, " "the environment variable PGDATA\nis used.\n\n")); - printf(_("Report bugs to .\n")); + printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT); } diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c index 3668f35b22..72f095fd0d 100644 --- a/src/bin/pg_ctl/pg_ctl.c +++ b/src/bin/pg_ctl/pg_ctl.c @@ -2095,7 +2095,7 @@ do_help(void) printf(_(" demand start service on demand\n")); #endif - printf(_("\nReport bugs to .\n")); + printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); } diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index d92a6626a5..d368f00d1d 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -1047,7 +1047,7 @@ help(const char *progname) printf(_("\nIf no database name is supplied, then the PGDATABASE environment\n" "variable value is used.\n\n")); - printf(_("Report bugs to .\n")); + printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT); } static void diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c index 26ded9fe0e..de311b6ad1 100644 --- a/src/bin/pg_dump/pg_dumpall.c +++ b/src/bin/pg_dump/pg_dumpall.c @@ -670,7 +670,7 @@ help(void) printf(_("\nIf -f/--file is not used, then the SQL script will be written to the standard\n" "output.\n\n")); - printf(_("Report bugs to .\n")); + printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT); } diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c index d1a36b1495..3749454b97 100644 --- a/src/bin/pg_dump/pg_restore.c +++ b/src/bin/pg_dump/pg_restore.c @@ -519,5 +519,5 @@ usage(const char *progname) "The options -I, -n, -N, -P, -t, -T, and --section can be combined and specified\n" "multiple times to select multiple objects.\n")); printf(_("\nIf no input file name is supplied, then standard input is used.\n\n")); - printf(_("Report bugs to .\n")); + printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT); } diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c index c9edeb54d3..1f043c918f 100644 --- a/src/bin/pg_resetwal/pg_resetwal.c +++ b/src/bin/pg_resetwal/pg_resetwal.c @@ -1223,5 +1223,5 @@ usage(void) printf(_(" -x, --next-transaction-id=XID set next transaction ID\n")); printf(_(" --wal-segsize=SIZE size of WAL segments, in megabytes\n")); printf(_(" -?, --help show this help, then exit\n")); - printf(_("\nReport bugs to .\n")); + printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); } diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c index c6d00bb0ab..2d9cf6075a 100644 --- a/src/bin/pg_rewind/pg_rewind.c +++ b/src/bin/pg_rewind/pg_rewind.c @@ -87,7 +87,7 @@ usage(const char *progname) printf(_(" --debug write a lot of debug messages\n")); printf(_(" -V, --version output version information, then exit\n")); printf(_(" -?, --help show this help, then exit\n")); - printf(_("\nReport bugs to .\n")); + printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); } diff --git a/src/bin/pg_upgrade/option.c b/src/bin/pg_upgrade/option.c index eed70fff4f..c753a75fa0 100644 --- a/src/bin/pg_upgrade/option.c +++ b/src/bin/pg_upgrade/option.c @@ -336,7 +336,7 @@ usage(void) " C:\\> set PGBINNEW=newCluster/bin\n" " C:\\> pg_upgrade\n")); #endif - printf(_("\nReport bugs to .\n")); + printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); } diff --git a/src/bin/pg_waldump/pg_waldump.c b/src/bin/pg_waldump/pg_waldump.c index 83202b5b87..906f7e1f08 100644 --- a/src/bin/pg_waldump/pg_waldump.c +++ b/src/bin/pg_waldump/pg_waldump.c @@ -730,7 +730,7 @@ usage(void) printf(_(" -z, --stats[=record] show statistics instead of records\n" " (optionally, show per-record statistics)\n")); printf(_(" -?, --help show this help, then exit\n")); - printf(_("\nReport bugs to .\n")); + printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); } int diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index 39c1a243d5..978fca0f47 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -681,8 +681,8 @@ usage(void) " -V, --version output version information, then exit\n" " -?, --help show this help, then exit\n" "\n" - "Report bugs to .\n", - progname, progname); + "Report bugs to <%s>.\n", + progname, progname, PACKAGE_BUGREPORT); } /* return whether str matches "^\s*[-+]?[0-9]+$" */ diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c index 66b47d98cb..777d54f085 100644 --- a/src/bin/psql/help.c +++ b/src/bin/psql/help.c @@ -144,7 +144,7 @@ usage(unsigned short int pager) fprintf(output, _("\nFor more information, type \"\\?\" (for internal commands) or \"\\help\" (for SQL\n" "commands) from within psql, or consult the psql section in the PostgreSQL\n" "documentation.\n\n")); - fprintf(output, _("Report bugs to .\n")); + fprintf(output, _("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT); ClosePager(output); } diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c index f86769d070..d9761b39b2 100644 --- a/src/bin/scripts/clusterdb.c +++ b/src/bin/scripts/clusterdb.c @@ -291,5 +291,5 @@ help(const char *progname) printf(_(" -W, --password force password prompt\n")); printf(_(" --maintenance-db=DBNAME alternate maintenance database\n")); printf(_("\nRead the description of the SQL command CLUSTER for details.\n")); - printf(_("\nReport bugs to .\n")); + printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); } diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c index 4733af8e97..9fd46a679a 100644 --- a/src/bin/scripts/createdb.c +++ b/src/bin/scripts/createdb.c @@ -277,5 +277,5 @@ help(const char *progname) printf(_(" -W, --password force password prompt\n")); printf(_(" --maintenance-db=DBNAME alternate maintenance database\n")); printf(_("\nBy default, a database with the same name as the current user is created.\n")); - printf(_("\nReport bugs to .\n")); + printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); } diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c index e781ecab2f..a658701dd2 100644 --- a/src/bin/scripts/createuser.c +++ b/src/bin/scripts/createuser.c @@ -375,5 +375,5 @@ help(const char *progname) printf(_(" -U, --username=USERNAME user name to connect as (not the one to create)\n")); printf(_(" -w, --no-password never prompt for password\n")); printf(_(" -W, --password force password prompt\n")); - printf(_("\nReport bugs to .\n")); + printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); } diff --git a/src/bin/scripts/dropdb.c b/src/bin/scripts/dropdb.c index 20d0215ce9..1b26f9e6de 100644 --- a/src/bin/scripts/dropdb.c +++ b/src/bin/scripts/dropdb.c @@ -177,5 +177,5 @@ help(const char *progname) printf(_(" -w, --no-password never prompt for password\n")); printf(_(" -W, --password force password prompt\n")); printf(_(" --maintenance-db=DBNAME alternate maintenance database\n")); - printf(_("\nReport bugs to .\n")); + printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); } diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c index c5200db0a4..a81d4868c4 100644 --- a/src/bin/scripts/dropuser.c +++ b/src/bin/scripts/dropuser.c @@ -175,5 +175,5 @@ help(const char *progname) printf(_(" -U, --username=USERNAME user name to connect as (not the one to drop)\n")); printf(_(" -w, --no-password never prompt for password\n")); printf(_(" -W, --password force password prompt\n")); - printf(_("\nReport bugs to .\n")); + printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); } diff --git a/src/bin/scripts/pg_isready.c b/src/bin/scripts/pg_isready.c index d9af2250b9..ead88a9b5a 100644 --- a/src/bin/scripts/pg_isready.c +++ b/src/bin/scripts/pg_isready.c @@ -235,5 +235,5 @@ help(const char *progname) printf(_(" -p, --port=PORT database server port\n")); printf(_(" -t, --timeout=SECS seconds to wait when attempting connection, 0 disables (default: %s)\n"), DEFAULT_CONNECT_TIMEOUT); printf(_(" -U, --username=USERNAME user name to connect as\n")); - printf(_("\nReport bugs to .\n")); + printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); } diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c index da9faae562..f680c0d6bd 100644 --- a/src/bin/scripts/reindexdb.c +++ b/src/bin/scripts/reindexdb.c @@ -774,5 +774,5 @@ help(const char *progname) printf(_(" -W, --password force password prompt\n")); printf(_(" --maintenance-db=DBNAME alternate maintenance database\n")); printf(_("\nRead the description of the SQL command REINDEX for details.\n")); - printf(_("\nReport bugs to .\n")); + printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); } diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c index 0560f6304f..d3952f4150 100644 --- a/src/bin/scripts/vacuumdb.c +++ b/src/bin/scripts/vacuumdb.c @@ -949,5 +949,5 @@ help(const char *progname) printf(_(" -W, --password force password prompt\n")); printf(_(" --maintenance-db=DBNAME alternate maintenance database\n")); printf(_("\nRead the description of the SQL command VACUUM for details.\n")); - printf(_("\nReport bugs to .\n")); + printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); } diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c index d7a7c1760c..a8c93d4934 100644 --- a/src/interfaces/ecpg/preproc/ecpg.c +++ b/src/interfaces/ecpg/preproc/ecpg.c @@ -58,7 +58,7 @@ help(const char *progname) printf(_(" -?, --help show this help, then exit\n")); printf(_("\nIf no output file is specified, the name is formed by adding .c to the\n" "input file name, after stripping off .pgc if present.\n")); - printf(_("\nReport bugs to .\n")); + printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); } static void diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l index 0e8621a05e..f6052798fd 100644 --- a/src/interfaces/ecpg/preproc/pgc.l +++ b/src/interfaces/ecpg/preproc/pgc.l @@ -1429,7 +1429,7 @@ cppline {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+ } } -{other}|\n { mmfatal(PARSE_ERROR, "internal error: unreachable state; please report this to "); } +{other}|\n { mmfatal(PARSE_ERROR, "internal error: unreachable state; please report this to <%s>", PACKAGE_BUGREPORT); } %% diff --git a/src/interfaces/ecpg/preproc/type.c b/src/interfaces/ecpg/preproc/type.c index 6a71766ccf..d4b4da5ffc 100644 --- a/src/interfaces/ecpg/preproc/type.c +++ b/src/interfaces/ecpg/preproc/type.c @@ -301,7 +301,7 @@ ECPGdump_a_type(FILE *o, const char *name, struct ECPGtype *type, const int brac break; default: if (!IS_SIMPLE_TYPE(type->u.element->type)) - base_yyerror("internal error: unknown datatype, please report this to "); + base_yyerror("internal error: unknown datatype, please report this to <" PACKAGE_BUGREPORT ">"); ECPGdump_a_simple(o, name, type->u.element->type, @@ -672,7 +672,7 @@ ECPGfree_type(struct ECPGtype *type) break; default: if (!IS_SIMPLE_TYPE(type->u.element->type)) - base_yyerror("internal error: unknown datatype, please report this to "); + base_yyerror("internal error: unknown datatype, please report this to <" PACKAGE_BUGREPORT ">"); free(type->u.element); } diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c index 9a4e52bc7b..9270977393 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -2071,7 +2071,7 @@ help(void) printf(_("The exit status is 0 if all tests passed, 1 if some tests failed, and 2\n")); printf(_("if the tests could not be run for some reason.\n")); printf(_("\n")); - printf(_("Report bugs to .\n")); + printf(_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT); } int