diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index a5426d089a9045867bcaa469a42426f15a154716..b9a6072c799835424d4e8a45ad11e92060c874f7 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.177 2004/10/01 16:39:54 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.178 2004/10/12 21:54:34 petere Exp $
*
*
* INTERFACE ROUTINES
@@ -492,7 +492,7 @@ conditional_relation_open(Oid relationId, LOCKMODE lockmode, bool nowait)
if (!ConditionalLockRelation(r, lockmode))
ereport(ERROR,
(errcode(ERRCODE_LOCK_NOT_AVAILABLE),
- errmsg("could not obtain lock on \"%s\"",
+ errmsg("could not obtain lock on relation \"%s\"",
RelationGetRelationName(r))));
}
else
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index faa151384dcd04f9aedd9160a6f336b1fcc676bc..52b3066a8d249438411ac4c918b44335089269f2 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.172 2004/10/09 02:46:40 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.173 2004/10/12 21:54:35 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1933,7 +1933,7 @@ RestoreArchivedFile(char *path, const char *xlogfname,
if (errno != ENOENT)
ereport(FATAL,
(errcode_for_file_access(),
- errmsg("could not stat \"%s\": %m",
+ errmsg("could not stat file \"%s\": %m",
xlogpath)));
}
else
@@ -2035,7 +2035,7 @@ RestoreArchivedFile(char *path, const char *xlogfname,
if (errno != ENOENT)
ereport(FATAL,
(errcode_for_file_access(),
- errmsg("could not stat \"%s\": %m",
+ errmsg("could not stat file \"%s\": %m",
xlogpath)));
}
}
@@ -2739,7 +2739,7 @@ readTimeLineHistory(TimeLineID targetTLI)
if (errno != ENOENT)
ereport(FATAL,
(errcode_for_file_access(),
- errmsg("could not open \"%s\": %m", path)));
+ errmsg("could not open file \"%s\": %m", path)));
/* Not there, so assume no parents */
return list_make1_int((int) targetTLI);
}
@@ -2829,7 +2829,7 @@ existsTimeLineHistory(TimeLineID probeTLI)
if (errno != ENOENT)
ereport(FATAL,
(errcode_for_file_access(),
- errmsg("could not open \"%s\": %m", path)));
+ errmsg("could not open file \"%s\": %m", path)));
return false;
}
}
@@ -2927,7 +2927,7 @@ writeTimeLineHistory(TimeLineID newTLI, TimeLineID parentTLI,
if (errno != ENOENT)
ereport(FATAL,
(errcode_for_file_access(),
- errmsg("could not open \"%s\": %m", path)));
+ errmsg("could not open file \"%s\": %m", path)));
/* Not there, so assume parent has no parents */
}
else
@@ -4077,7 +4077,7 @@ StartupXLOG(void)
{
ereport(PANIC,
(errmsg("could not locate required checkpoint record"),
- errhint("If you are not restoring from a backup, try removing $PGDATA/backup_label.")));
+ errhint("If you are not restoring from a backup, try removing the file \"%s/backup_label\".", DataDir)));
}
}
else
@@ -5288,7 +5288,7 @@ pg_start_backup(PG_FUNCTION_ARGS)
if (errno != ENOENT)
ereport(ERROR,
(errcode_for_file_access(),
- errmsg("could not stat \"%s\": %m",
+ errmsg("could not stat file \"%s\": %m",
labelfilepath)));
}
else
diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c
index 586be553a85d6fded44ee3372e4606c64185611d..220983c0f9f5a5f4a35120a49fba8cb15d868538 100644
--- a/src/backend/catalog/dependency.c
+++ b/src/backend/catalog/dependency.c
@@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.39 2004/08/29 05:06:41 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.40 2004/10/12 21:54:36 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1623,7 +1623,7 @@ getObjectDescription(const ObjectAddress *object)
else
nspname = get_namespace_name(opcForm->opcnamespace);
- appendStringInfo(&buffer, gettext("operator class %s for %s"),
+ appendStringInfo(&buffer, gettext("operator class %s for access method %s"),
quote_qualified_identifier(nspname,
NameStr(opcForm->opcname)),
NameStr(amForm->amname));
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index c8efaa23b1ad28f9f91f16df102f04eaf9567c84..9e7f1c812e4821061e9ba1a8a299a250750ba7a8 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.133 2004/09/23 23:20:24 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.134 2004/10/12 21:54:36 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -5392,7 +5392,7 @@ ATPrepSetTableSpace(AlteredTableInfo *tab, Relation rel, char *tablespacename)
if (OidIsValid(tab->newTableSpace))
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("multiple SET TABLESPACE subcommands are not valid")));
+ errmsg("cannot have multiple SET TABLESPACE subcommands")));
tab->newTableSpace = tablespaceId;
}
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index 3845b94eb92bf06daaee17ef792eb7b555a8de22..7d0c9b8a723a99117e13e74bc4d9e6276154502a 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.129 2004/09/16 20:17:20 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.130 2004/10/12 21:54:37 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -188,7 +188,7 @@ AtEOXact_SPI(bool isCommit)
ereport(WARNING,
(errcode(ERRCODE_WARNING),
errmsg("transaction left non-empty SPI stack"),
- errhint("Check for missing \"SPI_finish\" calls")));
+ errhint("Check for missing \"SPI_finish\" calls.")));
_SPI_current = _SPI_stack = NULL;
_SPI_stack_depth = 0;
@@ -1571,7 +1571,7 @@ _SPI_error_callback(void *arg)
internalerrquery(query);
}
else
- errcontext("SQL query \"%s\"", query);
+ errcontext("SQL statement \"%s\"", query);
}
/*
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index bce2cdc04bd59abafe0c78a470eacc6025a686d3..b374077ee41343f2a09f0f474ebb7a45c01a9188 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.118 2004/08/29 05:06:43 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.119 2004/10/12 21:54:38 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -363,24 +363,24 @@ auth_failed(Port *port, int status)
switch (port->auth_method)
{
case uaReject:
- errstr = gettext_noop("Rejected host: authentication failed for user \"%s\"");
+ errstr = gettext_noop("authentication failed for user \"%s\": host rejected");
break;
case uaKrb4:
- errstr = gettext_noop("Kerberos4 authentication failed for user \"%s\"");
+ errstr = gettext_noop("Kerberos 4 authentication failed for user \"%s\"");
break;
case uaKrb5:
- errstr = gettext_noop("Kerberos5 authentication failed for user \"%s\"");
+ errstr = gettext_noop("Kerberos 5 authentication failed for user \"%s\"");
break;
case uaTrust:
- errstr = gettext_noop("Trusted authentication failed for user \"%s\"");
+ errstr = gettext_noop("\"trust\" authentication failed for user \"%s\"");
break;
case uaIdent:
- errstr = gettext_noop("IDENT authentication failed for user \"%s\"");
+ errstr = gettext_noop("Ident authentication failed for user \"%s\"");
break;
case uaMD5:
case uaCrypt:
case uaPassword:
- errstr = gettext_noop("Password authentication failed for user \"%s\"");
+ errstr = gettext_noop("password authentication failed for user \"%s\"");
break;
#ifdef USE_PAM
case uaPAM:
@@ -388,7 +388,7 @@ auth_failed(Port *port, int status)
break;
#endif /* USE_PAM */
default:
- errstr = gettext_noop("Unknown auth method: authentication failed for user \"%s\"");
+ errstr = gettext_noop("authentication failed for user \"%s\": invalid authentication method");
break;
}
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 1e73efbcdfaa8f4981f3f152ed5f5c3458ed022d..c27983e794c0c62d21b7ef41e203b4607195509c 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.132 2004/10/09 23:12:57 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.133 2004/10/12 21:54:38 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -737,7 +737,7 @@ parse_hba(List *line, int line_num, hbaPort *port,
{
ereport(LOG,
(errcode(ERRCODE_CONFIG_FILE_ERROR),
- errmsg("invalid IP address \"%s\" in \"%s\" line %d: %s",
+ errmsg("invalid IP address \"%s\" in file \"%s\" line %d: %s",
token, HbaFileName, line_num,
gai_strerror(ret))));
if (cidr_slash)
@@ -772,7 +772,7 @@ parse_hba(List *line, int line_num, hbaPort *port,
{
ereport(LOG,
(errcode(ERRCODE_CONFIG_FILE_ERROR),
- errmsg("invalid IP mask \"%s\" in \"%s\" line %d: %s",
+ errmsg("invalid IP mask \"%s\" in file \"%s\" line %d: %s",
token, HbaFileName, line_num,
gai_strerror(ret))));
if (gai_result)
@@ -787,7 +787,7 @@ parse_hba(List *line, int line_num, hbaPort *port,
{
ereport(LOG,
(errcode(ERRCODE_CONFIG_FILE_ERROR),
- errmsg("IP address and mask do not match in \"%s\" line %d",
+ errmsg("IP address and mask do not match in file \"%s\" line %d",
HbaFileName, line_num)));
goto hba_other_error;
}
@@ -845,13 +845,13 @@ hba_syntax:
if (line_item)
ereport(LOG,
(errcode(ERRCODE_CONFIG_FILE_ERROR),
- errmsg("invalid entry in \"%s\" at line %d, token \"%s\"",
+ errmsg("invalid entry in file \"%s\" at line %d, token \"%s\"",
HbaFileName, line_num,
(char *) lfirst(line_item))));
else
ereport(LOG,
(errcode(ERRCODE_CONFIG_FILE_ERROR),
- errmsg("missing field in \"%s\" at end of line %d",
+ errmsg("missing field in file \"%s\" at end of line %d",
HbaFileName, line_num)));
/* Come here if suitable message already logged */
@@ -1101,13 +1101,13 @@ ident_syntax:
if (line_item)
ereport(LOG,
(errcode(ERRCODE_CONFIG_FILE_ERROR),
- errmsg("invalid entry in \"%s\" at line %d, token \"%s\"",
+ errmsg("invalid entry in file \"%s\" at line %d, token \"%s\"",
IdentFileName, line_number,
(const char *) lfirst(line_item))));
else
ereport(LOG,
(errcode(ERRCODE_CONFIG_FILE_ERROR),
- errmsg("missing entry in \"%s\" at end of line %d",
+ errmsg("missing entry in file \"%s\" at end of line %d",
IdentFileName, line_number)));
*error_p = true;
@@ -1634,7 +1634,7 @@ authident(hbaPort *port)
}
ereport(DEBUG1,
- (errmsg("IDENT code identifies remote user as \"%s\"",
+ (errmsg("Ident protocol identifies remote user as \"%s\"",
ident_user)));
if (check_ident_usermap(port->auth_arg, port->user_name, ident_user))
diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index bcab85cbc57e4b29a0afdcb761256835bde9012e..81cba22ae1ebe52910a35a70f0d6a19f91f94d3c 100644
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -13,7 +13,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/main/main.c,v 1.90 2004/09/24 06:29:07 neilc Exp $
+ * $PostgreSQL: pgsql/src/backend/main/main.c,v 1.91 2004/10/12 21:54:38 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -243,9 +243,9 @@ main(int argc, char *argv[])
#else /* WIN32 */
if (pgwin32_is_admin())
{
- write_stderr("execution of PostgreSQL by a user with administrative permissions is not permitted.\n"
+ write_stderr("Execution of PostgreSQL by a user with administrative permissions is not permitted.\n"
"The server must be started under an unprivileged user ID to prevent\n"
- "possible system security compromise. See the documentation for\n"
+ "possible system security compromises. See the documentation for\n"
"more information on how to properly start the server.\n");
exit(1);
}
diff --git a/src/backend/port/win32/security.c b/src/backend/port/win32/security.c
index f546b9cd8a005f7e7780c0a871be4b917cc22362..033442aa3157e090ab4abefc7c73120cc8b42e8e 100644
--- a/src/backend/port/win32/security.c
+++ b/src/backend/port/win32/security.c
@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/port/win32/security.c,v 1.4 2004/08/29 05:06:46 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/port/win32/security.c,v 1.5 2004/10/12 21:54:39 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -36,20 +36,20 @@ pgwin32_is_admin(void)
if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &AccessToken))
{
- write_stderr("failed to open process token: %d\n",
+ write_stderr("could not open process token: %d\n",
(int) GetLastError());
exit(1);
}
if (GetTokenInformation(AccessToken, TokenGroups, NULL, 0, &InfoBufferSize))
{
- write_stderr("failed to get token information - got zero size!\n");
+ write_stderr("could not get token information: got zero size\n");
exit(1);
}
if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
{
- write_stderr("failed to get token information: %d\n",
+ write_stderr("could not get token information: %d\n",
(int) GetLastError());
exit(1);
}
@@ -57,7 +57,7 @@ pgwin32_is_admin(void)
InfoBuffer = malloc(InfoBufferSize);
if (!InfoBuffer)
{
- write_stderr("failed to allocate %i bytes for token information!\n",
+ write_stderr("could not allocate %i bytes for token information\n",
(int) InfoBufferSize);
exit(1);
}
@@ -66,7 +66,7 @@ pgwin32_is_admin(void)
if (!GetTokenInformation(AccessToken, TokenGroups, InfoBuffer,
InfoBufferSize, &InfoBufferSize))
{
- write_stderr("failed to get token information: %d\n",
+ write_stderr("could not get token information: %d\n",
(int) GetLastError());
exit(1);
}
@@ -77,7 +77,7 @@ pgwin32_is_admin(void)
SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0,
0, &AdministratorsSid))
{
- write_stderr("failed to get SID for Administrators group: %d\n",
+ write_stderr("could not get SID for Administrators group: %d\n",
(int) GetLastError());
exit(1);
}
@@ -86,7 +86,7 @@ pgwin32_is_admin(void)
SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_POWER_USERS, 0, 0, 0, 0, 0,
0, &PowerUsersSid))
{
- write_stderr("failed to get SID for PowerUsers group: %d\n",
+ write_stderr("could not get SID for PowerUsers group: %d\n",
(int) GetLastError());
exit(1);
}
@@ -146,7 +146,7 @@ pgwin32_is_service(void)
if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &AccessToken))
{
- fprintf(stderr, "failed to open process token: %d\n",
+ fprintf(stderr, "could not open process token: %d\n",
(int) GetLastError());
return -1;
}
@@ -154,7 +154,7 @@ pgwin32_is_service(void)
/* First check for local system */
if (!GetTokenInformation(AccessToken, TokenUser, InfoBuffer, 1024, &InfoBufferSize))
{
- fprintf(stderr, "failed to get token information: %d\n",
+ fprintf(stderr, "could not get token information: %d\n",
(int) GetLastError());
return -1;
}
@@ -163,7 +163,7 @@ pgwin32_is_service(void)
SECURITY_LOCAL_SYSTEM_RID, 0, 0, 0, 0, 0, 0, 0,
&LocalSystemSid))
{
- fprintf(stderr, "failed to get SID for local system account\n");
+ fprintf(stderr, "could not get SID for local system account\n");
CloseHandle(AccessToken);
return -1;
}
@@ -181,7 +181,7 @@ pgwin32_is_service(void)
/* Now check for group SID */
if (!GetTokenInformation(AccessToken, TokenGroups, InfoBuffer, 1024, &InfoBufferSize))
{
- fprintf(stderr, "failed to get token information: %d\n",
+ fprintf(stderr, "could not get token information: %d\n",
(int) GetLastError());
return -1;
}
@@ -190,7 +190,7 @@ pgwin32_is_service(void)
SECURITY_SERVICE_RID, 0, 0, 0, 0, 0, 0, 0,
&ServiceSid))
{
- fprintf(stderr, "failed to get SID for service group\n");
+ fprintf(stderr, "could not get SID for service group\n");
CloseHandle(AccessToken);
return -1;
}
diff --git a/src/backend/port/win32/signal.c b/src/backend/port/win32/signal.c
index 0a6b68e8fee0648014b3134cb5ef95fa77fab814..566b5075204165d4b9f8d3bc47af23a533cfb9ec 100644
--- a/src/backend/port/win32/signal.c
+++ b/src/backend/port/win32/signal.c
@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/port/win32/signal.c,v 1.7 2004/08/29 05:06:46 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/port/win32/signal.c,v 1.8 2004/10/12 21:54:39 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -224,7 +224,7 @@ pg_signal_thread(LPVOID param)
PIPE_UNLIMITED_INSTANCES, 16, 16, 1000, NULL);
if (pipe == INVALID_HANDLE_VALUE)
{
- write_stderr("failed to create signal listener pipe: %d. Retrying.\n", (int) GetLastError());
+ write_stderr("could not create signal listener pipe: %d; retrying\n", (int) GetLastError());
SleepEx(500, FALSE);
continue;
}
@@ -236,7 +236,7 @@ pg_signal_thread(LPVOID param)
(LPTHREAD_START_ROUTINE) pg_signal_dispatch_thread,
(LPVOID) pipe, 0, NULL);
if (hThread == INVALID_HANDLE_VALUE)
- write_stderr("failed to create signal dispatch thread: %d\n",
+ write_stderr("could not create signal dispatch thread: %d\n",
(int) GetLastError());
else
CloseHandle(hThread);
diff --git a/src/backend/postmaster/bgwriter.c b/src/backend/postmaster/bgwriter.c
index 5e969d1348cf529c39652a0096c1d26feade2e6c..f0b32b126540e50401030702cf2f67f07759a23b 100644
--- a/src/backend/postmaster/bgwriter.c
+++ b/src/backend/postmaster/bgwriter.c
@@ -37,7 +37,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/postmaster/bgwriter.c,v 1.8 2004/08/29 05:06:46 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/postmaster/bgwriter.c,v 1.9 2004/10/12 21:54:40 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -487,7 +487,7 @@ BgWriterShmemInit(void)
if (BgWriterShmem == NULL)
ereport(FATAL,
(errcode(ERRCODE_OUT_OF_MEMORY),
- errmsg("insufficient shared memory for bgwriter")));
+ errmsg("not enough shared memory for background writer")));
if (found)
return; /* already initialized */
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 1cbe405ea5792d227540dbb833742ff742fa5452..509dd7b9b64dbc0fcf2d8e2a48d676e80c0baab7 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.431 2004/10/09 23:13:02 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.432 2004/10/12 21:54:40 petere Exp $
*
* NOTES
*
@@ -796,7 +796,7 @@ PostmasterMain(int argc, char *argv[])
/* Should we remove the pid file on postmaster exit? */
}
else
- write_stderr("%s: could not write external pid file \"%s\": %s\n",
+ write_stderr("%s: could not write external PID file \"%s\": %s\n",
progname, external_pid_file, strerror(errno));
}
@@ -3759,7 +3759,7 @@ win32_sigchld_waiter(LPVOID param)
if (r == WAIT_OBJECT_0)
pg_queue_signal(SIGCHLD);
else
- write_stderr("ERROR: failed to wait on child process handle: %d\n",
+ write_stderr("could not wait on child process handle: %d\n",
(int) GetLastError());
CloseHandle(procHandle);
return 0;
diff --git a/src/backend/postmaster/syslogger.c b/src/backend/postmaster/syslogger.c
index 958af8811798b21c8cd8dc9785e4dea0829e0b21..9d05de45e9a237af59f32ad66b94089e0d35d0da 100644
--- a/src/backend/postmaster/syslogger.c
+++ b/src/backend/postmaster/syslogger.c
@@ -18,7 +18,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.9 2004/09/21 00:21:25 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.10 2004/10/12 21:54:40 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -402,7 +402,7 @@ SysLogger_Start(void)
if (pgpipe(syslogPipe) < 0)
ereport(FATAL,
(errcode_for_socket_access(),
- (errmsg("could not create pipe for syslogging: %m"))));
+ (errmsg("could not create pipe for syslog: %m"))));
}
#else
if (!syslogPipe[0])
@@ -444,7 +444,7 @@ SysLogger_Start(void)
if (!syslogFile)
ereport(FATAL,
(errcode_for_file_access(),
- (errmsg("could not create logfile \"%s\": %m",
+ (errmsg("could not create log file \"%s\": %m",
filename))));
setvbuf(syslogFile, NULL, LBF_MODE, 0);
@@ -700,7 +700,7 @@ write_syslogger_file_binary(const char *buffer, int count)
if (rc != count)
ereport(LOG,
(errcode_for_file_access(),
- errmsg("could not write to logfile: %m")));
+ errmsg("could not write to log file: %m")));
}
#ifdef WIN32
@@ -787,7 +787,7 @@ logfile_rotate(bool time_based_rotation)
ereport(LOG,
(errcode_for_file_access(),
- errmsg("could not open new logfile \"%s\": %m",
+ errmsg("could not open new log file \"%s\": %m",
filename)));
/*
@@ -799,7 +799,7 @@ logfile_rotate(bool time_based_rotation)
if (saveerrno != ENFILE && saveerrno != EMFILE)
{
ereport(LOG,
- (errmsg("disabling auto rotation (use SIGHUP to reenable)")));
+ (errmsg("disabling automatic rotation (use SIGHUP to reenable)")));
Log_RotationAge = 0;
Log_RotationSize = 0;
}
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 1c668445519c73def4b7c2a8d1f9dbe0e0c29af2..9f4e8b06badf13a3998328ed1967667abac2f7f2 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.434 2004/10/08 01:36:35 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.435 2004/10/12 21:54:40 petere Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@@ -2127,7 +2127,7 @@ usage(const char *progname)
printf(gettext(" -o FILENAME send stdout and stderr to given file\n"));
printf(gettext(" -P disable system indexes\n"));
printf(gettext(" -s show statistics after each query\n"));
- printf(gettext(" -S WORK-MEM set amount of memory for sorts (in kbytes)\n"));
+ printf(gettext(" -S WORK-MEM set amount of memory for sorts (in kB)\n"));
printf(gettext(" --describe-config describe configuration parameters, then exit\n"));
printf(gettext(" --help show this help, then exit\n"));
printf(gettext(" --version output version information, then exit\n"));
diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c
index c7160d1dad49e23914bd97d9bdbeea949a562c30..e0c665eb9f1786a7252f8c633bd8c256040c0ecc 100644
--- a/src/backend/utils/adt/misc.c
+++ b/src/backend/utils/adt/misc.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/adt/misc.c,v 1.38 2004/08/29 05:06:49 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/misc.c,v 1.39 2004/10/12 21:54:41 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -174,7 +174,7 @@ pg_tablespace_databases(PG_FUNCTION_ARGS)
errmsg("could not open directory \"%s\": %m",
fctx->location)));
ereport(WARNING,
- (errmsg("%u is not a tablespace oid", tablespaceOid)));
+ (errmsg("%u is not a tablespace OID", tablespaceOid)));
}
}
funcctx->user_fctx = fctx;
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index deb361e2475c8413ff37e4bee597bdd3d8dd2ef4..0fcf2b08b3b4bfab9f0f544158364b63a50ed587 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
* Written by Peter Eisentraut <peter_e@gmx.net>.
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.242 2004/10/10 23:37:28 neilc Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.243 2004/10/12 21:54:42 petere Exp $
*
*--------------------------------------------------------------------
*/
@@ -489,7 +489,7 @@ static struct config_bool ConfigureNamesBool[] =
},
{
{"log_disconnections", PGC_BACKEND, LOGGING_WHAT,
- gettext_noop("Logs end of a session, including duration"),
+ gettext_noop("Logs end of a session, including duration."),
NULL
},
&Log_disconnections,
@@ -805,7 +805,7 @@ static struct config_bool ConfigureNamesBool[] =
},
{
{"default_with_oids", PGC_USERSET, COMPAT_OPTIONS_PREVIOUS,
- gettext_noop("By default, newly-created tables should have OIDs"),
+ gettext_noop("By default, newly-created tables should have OIDs."),
NULL
},
&default_with_oids,
@@ -813,7 +813,7 @@ static struct config_bool ConfigureNamesBool[] =
},
{
{"redirect_stderr", PGC_POSTMASTER, LOGGING_WHERE,
- gettext_noop("Start a subprocess to capture stderr output into log files"),
+ gettext_noop("Start a subprocess to capture stderr output into log files."),
NULL
},
&Redirect_stderr,
@@ -821,7 +821,7 @@ static struct config_bool ConfigureNamesBool[] =
},
{
{"log_truncate_on_rotation", PGC_SIGHUP, LOGGING_WHERE,
- gettext_noop("Truncate existing log files of same name during log rotation"),
+ gettext_noop("Truncate existing log files of same name during log rotation."),
NULL
},
&Log_truncate_on_rotation,
@@ -1273,7 +1273,7 @@ static struct config_int ConfigureNamesInt[] =
{
{"log_rotation_age", PGC_SIGHUP, LOGGING_WHERE,
- gettext_noop("Automatic logfile rotation will occur after N minutes"),
+ gettext_noop("Automatic log file rotation will occur after N minutes"),
NULL
},
&Log_RotationAge,
@@ -1282,7 +1282,7 @@ static struct config_int ConfigureNamesInt[] =
{
{"log_rotation_size", PGC_SIGHUP, LOGGING_WHERE,
- gettext_noop("Automatic logfile rotation will occur after N kilobytes"),
+ gettext_noop("Automatic log file rotation will occur after N kilobytes"),
NULL
},
&Log_RotationSize,
@@ -1291,7 +1291,7 @@ static struct config_int ConfigureNamesInt[] =
{
{"max_function_args", PGC_INTERNAL, PRESET_OPTIONS,
- gettext_noop("Shows the maximum number of function arguments"),
+ gettext_noop("Shows the maximum number of function arguments."),
NULL,
GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE
},
@@ -1301,7 +1301,7 @@ static struct config_int ConfigureNamesInt[] =
{
{"max_index_keys", PGC_INTERNAL, PRESET_OPTIONS,
- gettext_noop("Shows the maximum number of index keys"),
+ gettext_noop("Shows the maximum number of index keys."),
NULL,
GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE
},
@@ -1671,8 +1671,8 @@ static struct config_string ConfigureNamesString[] =
{
{"log_destination", PGC_SIGHUP, LOGGING_WHERE,
gettext_noop("Sets the destination for server log output."),
- gettext_noop("Valid values are combinations of stderr, syslog "
- "and eventlog, depending on platform."),
+ gettext_noop("Valid values are combinations of \"stderr\", \"syslog\", "
+ "and \"eventlog\", depending on the platform."),
GUC_LIST_INPUT
},
&log_destination_string,
@@ -1786,7 +1786,7 @@ static struct config_string ConfigureNamesString[] =
{
{"data_directory", PGC_POSTMASTER, FILE_LOCATIONS,
- gettext_noop("Sets the server's data directory"),
+ gettext_noop("Sets the server's data directory."),
NULL
},
&data_directory,
@@ -1795,7 +1795,7 @@ static struct config_string ConfigureNamesString[] =
{
{"config_file", PGC_POSTMASTER, FILE_LOCATIONS,
- gettext_noop("Sets the server's main configuration file"),
+ gettext_noop("Sets the server's main configuration file."),
NULL,
GUC_DISALLOW_IN_FILE
},
@@ -1823,7 +1823,7 @@ static struct config_string ConfigureNamesString[] =
{
{"external_pid_file", PGC_POSTMASTER, FILE_LOCATIONS,
- gettext_noop("Writes the postmaster PID to the specified file"),
+ gettext_noop("Writes the postmaster PID to the specified file."),
NULL
},
&external_pid_file,
@@ -2480,7 +2480,7 @@ SelectConfigFiles(const char *userDoption, const char *progname)
else if (!configdir)
{
write_stderr("%s does not know where to find the server configuration file.\n"
- "You must specify the --config_file or -D invocation "
+ "You must specify the --config-file or -D invocation "
"option or set the PGDATA environment variable.\n",
progname);
return false;
@@ -5403,7 +5403,7 @@ assign_log_destination(const char *value, bool doit, GucSource source)
if (source >= PGC_S_INTERACTIVE)
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
- errmsg("unrecognised \"log_destination\" key word: \"%s\"",
+ errmsg("unrecognized \"log_destination\" key word: \"%s\"",
tok)));
pfree(rawstring);
list_free(elemlist);
@@ -5685,7 +5685,7 @@ assign_custom_variable_classes(const char *newval, bool doit, GucSource source)
*/
ereport(LOG,
(errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("invalid syntax for custom_variable_classes: \"%s\"", newval)));
+ errmsg("invalid syntax for \"custom_variable_classes\": \"%s\"", newval)));
pfree(buf.data);
return NULL;
}
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index cf4f404220cb885a2b8322fd1aa73f5d79e4fb35..da698e55dee807a49183b9a2194ddbae6200511a 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -39,7 +39,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
* Portions taken from FreeBSD.
*
- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.60 2004/10/10 23:37:31 neilc Exp $
+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.61 2004/10/12 21:54:42 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -2023,10 +2023,10 @@ usage(const char *progname)
" in the respective category (default taken from\n"
" environment)\n"));
printf(_(" --no-locale equivalent to --locale=C\n"));
- printf(_(" -A, --auth=method default authentication method for local connections\n"));
+ printf(_(" -A, --auth=METHOD default authentication method for local connections\n"));
printf(_(" -U, --username=NAME database superuser name\n"));
printf(_(" -W, --pwprompt prompt for a password for the new superuser\n"));
- printf(_(" --pwfile=filename read password for the new superuser from file\n"));
+ printf(_(" --pwfile=FILE read password for the new superuser from file\n"));
printf(_(" -?, --help show this help, then exit\n"));
printf(_(" -V, --version output version information, then exit\n"));
printf(_("\nLess commonly used options:\n"));
@@ -2190,13 +2190,13 @@ main(int argc, char *argv[])
if (pwprompt && pwfilename)
{
- fprintf(stderr, _("%s: you cannot specify both password prompt and password file\n"), progname);
+ fprintf(stderr, _("%s: password prompt and password file may not be specified together\n"), progname);
exit(1);
}
if (authmethod == NULL || !strlen(authmethod))
{
- authwarning = _("\nWARNING: enabling \"trust\" authentication for local connections.\n"
+ authwarning = _("\nWARNING: enabling \"trust\" authentication for local connections\n"
"You can change this by editing pg_hba.conf or using the -A flag the\n"
"next time you run initdb.\n");
authmethod = "trust";
@@ -2220,7 +2220,7 @@ main(int argc, char *argv[])
* local connections and are rejected in hba.c
*/
{
- fprintf(stderr, _("%s: unknown authentication method \"%s\".\n"), progname, authmethod);
+ fprintf(stderr, _("%s: unrecognized authentication method \"%s\"\n"), progname, authmethod);
exit(1);
}
@@ -2229,7 +2229,7 @@ main(int argc, char *argv[])
!strcmp(authmethod, "password")) &&
!(pwprompt || pwfilename))
{
- fprintf(stderr, _("%s: you need to specify a password for the superuser to enable %s authentication.\n"), progname, authmethod);
+ fprintf(stderr, _("%s: must specify a password for the superuser to enable %s authentication\n"), progname, authmethod);
exit(1);
}
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index 3bc3cbaf2268d8875a4be491530e13cc40266a89..9dda9f3ce0db8157748cd7adf09a96e80897fcff 100644
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -4,7 +4,7 @@
*
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.33 2004/10/10 23:37:37 neilc Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.34 2004/10/12 21:54:43 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -228,7 +228,8 @@ get_pgpid(void)
return 0;
else
{
- perror("openning pid file");
+ write_stderr(_("%s: could not open PID file \"%s\": %s"),
+ progname, pid_file, strerror(errno));
exit(1);
}
}
@@ -444,13 +445,14 @@ do_start(void)
pgpid_t pid;
pgpid_t old_pid = 0;
char *optline = NULL;
+ int exitcode;
if (ctl_command != RESTART_COMMAND)
{
old_pid = get_pgpid();
if (old_pid != 0)
- write_stderr(_("%s: Another postmaster may be running. "
- "Trying to start postmaster anyway.\n"),
+ write_stderr(_("%s: another postmaster may be running; "
+ "trying to start postmaster anyway\n"),
progname);
}
@@ -467,13 +469,13 @@ do_start(void)
post_opts = "";
else
{
- write_stderr(_("%s: cannot read %s\n"), progname, postopts_file);
+ write_stderr(_("%s: could not read file \"%s\"\n"), progname, postopts_file);
exit(1);
}
}
else if (optlines[0] == NULL || optlines[1] != NULL)
{
- write_stderr(_("%s: option file %s must have exactly 1 line\n"),
+ write_stderr(_("%s: option file \"%s\" must have exactly 1 line\n"),
progname, ctl_command == RESTART_COMMAND ?
postopts_file : def_postopts_file);
exit(1);
@@ -534,9 +536,11 @@ do_start(void)
postgres_path = postmaster_path;
}
- if (start_postmaster() != 0)
+ exitcode = start_postmaster();
+ if (exitcode != 0)
{
- write_stderr(_("Unable to run the postmaster binary\n"));
+ write_stderr(_("%s: could not start postmaster: exit code was %d\n"),
+ progname, exitcode);
exit(1);
}
@@ -546,8 +550,8 @@ do_start(void)
pid = get_pgpid();
if (pid == old_pid)
{
- write_stderr(_("%s: cannot start postmaster\n"
- "Examine the log output\n"),
+ write_stderr(_("%s: could not start postmaster\n"
+ "Examine the log output.\n"),
progname);
exit(1);
}
@@ -582,7 +586,7 @@ do_stop(void)
if (pid == 0) /* no pid file */
{
- write_stderr(_("%s: could not find %s\n"), progname, pid_file);
+ write_stderr(_("%s: PID file \"%s\" does not exist\n"), progname, pid_file);
write_stderr(_("Is postmaster running?\n"));
exit(1);
}
@@ -597,7 +601,7 @@ do_stop(void)
if (kill((pid_t) pid, sig) != 0)
{
- write_stderr(_("stop signal failed (PID: %ld): %s\n"), pid,
+ write_stderr(_("%s: could not send stop signal (PID: %ld): %s\n"), progname, pid,
strerror(errno));
exit(1);
}
@@ -612,7 +616,7 @@ do_stop(void)
{
if (!silence_echo)
{
- printf(_("waiting for postmaster to shut down..."));
+ printf(_("waiting for postmaster to shut down... "));
fflush(stdout);
}
@@ -634,7 +638,7 @@ do_stop(void)
if (pid != 0) /* pid file still exists */
{
if (!silence_echo)
- printf(_(" failed\n"));
+ printf(_("failed\n"));
write_stderr(_("%s: postmaster does not shut down\n"), progname);
exit(1);
@@ -661,7 +665,7 @@ do_restart(void)
if (pid == 0) /* no pid file */
{
- write_stderr(_("%s: could not find %s\n"), progname, pid_file);
+ write_stderr(_("%s: PID file \"%s\" does not exist\n"), progname, pid_file);
write_stderr(_("Is postmaster running?\nstarting postmaster anyway\n"));
do_start();
return;
@@ -678,7 +682,7 @@ do_restart(void)
if (kill((pid_t) pid, sig) != 0)
{
- write_stderr(_("stop signal failed (PID: %ld): %s\n"), pid,
+ write_stderr(_("%s: could not send stop signal (PID: %ld): %s\n"), progname, pid,
strerror(errno));
exit(1);
}
@@ -731,7 +735,7 @@ do_reload(void)
pid = get_pgpid();
if (pid == 0) /* no pid file */
{
- write_stderr(_("%s: could not find %s\n"), progname, pid_file);
+ write_stderr(_("%s: PID file \"%s\" does not exist\n"), progname, pid_file);
write_stderr(_("Is postmaster running?\n"));
exit(1);
}
@@ -747,7 +751,7 @@ do_reload(void)
if (kill((pid_t) pid, sig) != 0)
{
- write_stderr(_("reload signal failed (PID: %ld): %s\n"), pid,
+ write_stderr(_("could not send reload signal (PID: %ld): %s\n"), pid,
strerror(errno));
exit(1);
}
@@ -797,7 +801,7 @@ do_kill(pgpid_t pid)
{
if (kill((pid_t) pid, sig) != 0)
{
- write_stderr(_("signal %d failed (PID: %ld): %s\n"), sig, pid,
+ write_stderr(_("%s: could not send signal %d (PID: %ld): %s\n"), progname, sig, pid,
strerror(errno));
exit(1);
}
@@ -828,7 +832,7 @@ pgwin32_CommandLine(bool registration)
ret = find_other_exec(argv0, "postmaster", PM_VERSIONSTR, cmdLine);
if (ret != 0)
{
- write_stderr(_("Unable to find exe"));
+ write_stderr(_("%s: could not find exe"), progname);
exit(1);
}
@@ -875,13 +879,13 @@ pgwin32_doRegister()
if (hSCM == NULL)
{
- write_stderr(_("Unable to open service manager\n"));
+ write_stderr(_("%s: could not open service manager\n"), progname);
exit(1);
}
if (pgwin32_IsInstalled(hSCM))
{
CloseServiceHandle(hSCM);
- write_stderr(_("Service \"%s\" already registered\n"), register_servicename);
+ write_stderr(_("%s: service \"%s\" already registered\n"), progname, register_servicename);
exit(1);
}
@@ -892,7 +896,7 @@ pgwin32_doRegister()
NULL, NULL, "RPCSS\0", register_username, register_password)) == NULL)
{
CloseServiceHandle(hSCM);
- write_stderr(_("Unable to register service \"%s\" [%d]\n"), register_servicename, (int) GetLastError());
+ write_stderr(_("%s: could not register service \"%s\" [%d]\n"), progname, register_servicename, (int) GetLastError());
exit(1);
}
CloseServiceHandle(hService);
@@ -907,27 +911,27 @@ pgwin32_doUnregister()
if (hSCM == NULL)
{
- write_stderr(_("Unable to open service manager\n"));
+ write_stderr(_("%s: could not open service manager\n"), progname);
exit(1);
}
if (!pgwin32_IsInstalled(hSCM))
{
CloseServiceHandle(hSCM);
- write_stderr(_("Service \"%s\" not registered\n"), register_servicename);
+ write_stderr(_("%s: service \"%s\" not registered\n"), progname, register_servicename);
exit(1);
}
if ((hService = OpenService(hSCM, register_servicename, DELETE)) == NULL)
{
CloseServiceHandle(hSCM);
- write_stderr(_("Unable to open service \"%s\" [%d]\n"), register_servicename, (int) GetLastError());
+ write_stderr(_("%s: could not open service \"%s\" [%d]\n"), progname, register_servicename, (int) GetLastError());
exit(1);
}
if (!DeleteService(hService))
{
CloseServiceHandle(hService);
CloseServiceHandle(hSCM);
- write_stderr(_("Unable to unregister service \"%s\" [%d]\n"), register_servicename, (int) GetLastError());
+ write_stderr(_("%s: could not unregister service \"%s\" [%d]\n"), progname, register_servicename, (int) GetLastError());
exit(1);
}
CloseServiceHandle(hService);
@@ -1082,8 +1086,8 @@ do_help(void)
printf(_(" %s status [-D DATADIR]\n"), progname);
printf(_(" %s kill SIGNALNAME PROCESSID\n"), progname);
#ifdef WIN32
- printf(_(" %s register [-N servicename] [-U username] [-P password] [-D DATADIR] [-w] [-o \"OPTIONS\"]\n"), progname);
- printf(_(" %s unregister [-N servicename]\n"), progname);
+ printf(_(" %s register [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR] [-w] [-o \"OPTIONS\"]\n"), progname);
+ printf(_(" %s unregister [-N SERVICENAME]\n"), progname);
#endif
printf(_("Common options:\n"));
printf(_(" -D, --pgdata DATADIR location of the database storage area\n"));
@@ -1106,7 +1110,7 @@ do_help(void)
" (PostgreSQL server executable)\n"));
printf(_(" -p PATH-TO-POSTMASTER normally not necessary\n\n"));
printf(_("Options for stop or restart:\n"));
- printf(_(" -m SHUTDOWN-MODE may be 'smart', 'fast', or 'immediate'\n\n"));
+ printf(_(" -m SHUTDOWN-MODE may be \"smart\", \"fast\", or \"immediate\"\n\n"));
printf(_("Allowed signal names for kill:\n"));
printf(_(" HUP INT QUIT ABRT TERM USR1 USR2\n\n"));
printf(_("Shutdown modes are:\n"));
@@ -1138,7 +1142,7 @@ set_mode(char *modeopt)
}
else
{
- write_stderr(_("%s: invalid shutdown mode %s\n"), progname, modeopt);
+ write_stderr(_("%s: unrecognized shutdown mode \"%s\"\n"), progname, modeopt);
do_advice();
exit(1);
}
@@ -1171,7 +1175,7 @@ set_sig(char *signame)
sig = SIGUSR2;
else
{
- write_stderr(_("%s: invalid signal \"%s\"\n"), progname, signame);
+ write_stderr(_("%s: unrecognized signal name \"%s\"\n"), progname, signame);
do_advice();
exit(1);
}
@@ -1317,7 +1321,7 @@ main(int argc, char **argv)
{
if (ctl_command != NO_COMMAND)
{
- write_stderr(_("%s: extra operation mode %s\n"), progname, argv[optind]);
+ write_stderr(_("%s: extra operation mode \"%s\"\n"), progname, argv[optind]);
do_advice();
exit(1);
}
@@ -1354,7 +1358,7 @@ main(int argc, char **argv)
#endif
else
{
- write_stderr(_("%s: invalid operation mode %s\n"), progname, argv[optind]);
+ write_stderr(_("%s: unrecognized operation mode \"%s\"\n"), progname, argv[optind]);
do_advice();
exit(1);
}
diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index 90628da0674603c45d6448a5c2c683c7f7088407..8285e875a85e289425c01bc9399fdd7173be69d3 100644
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -34,7 +34,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.61 2004/08/29 05:06:53 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.62 2004/10/12 21:54:44 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -341,7 +341,7 @@ main(int argc, char **argv)
/* done, print a summary of ignored errors */
if (AH->n_errors)
- fprintf(stderr, _("WARNING, errors ignored on restore: %d\n"),
+ fprintf(stderr, _("WARNING: errors ignored on restore: %d\n"),
AH->n_errors);
/* AH may be freed in CloseArchive? */
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index 4b393b4e9f5bb328627f49b47776e06f486e6778..32c7bcbaf6b7c82aa70c473596661f6513e78687 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2000-2004, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.107 2004/09/10 04:10:53 neilc Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.108 2004/10/12 21:54:44 petere Exp $
*/
#include "postgres_fe.h"
#include "describe.h"
@@ -114,7 +114,7 @@ describeTablespaces(const char *pattern, bool verbose)
if (pset.sversion < 70500)
{
- fprintf(stderr, _("This server version (%d) does not support tablespaces.\n"),
+ fprintf(stderr, _("The server version (%d) does not support tablespaces.\n"),
pset.sversion);
return true;
}
@@ -922,9 +922,9 @@ describeOneTableDetails(const char *schemaname,
int count_footers = 0;
if (strcmp(indisprimary, "t") == 0)
- printfPQExpBuffer(&tmpbuf, _("PRIMARY KEY, "));
+ printfPQExpBuffer(&tmpbuf, _("primary key, "));
else if (strcmp(indisunique, "t") == 0)
- printfPQExpBuffer(&tmpbuf, _("UNIQUE, "));
+ printfPQExpBuffer(&tmpbuf, _("unique, "));
else
resetPQExpBuffer(&tmpbuf);
appendPQExpBuffer(&tmpbuf, "%s, ", indamname);
@@ -937,7 +937,7 @@ describeOneTableDetails(const char *schemaname,
appendPQExpBuffer(&tmpbuf, _(", predicate (%s)"), indpred);
if (strcmp(indisclustered, "t") == 0)
- appendPQExpBuffer(&tmpbuf, _(", CLUSTER"));
+ appendPQExpBuffer(&tmpbuf, _(", clustered"));
footers = pg_malloc_zero(4 * sizeof(*footers));
footers[count_footers++] = pg_strdup(tmpbuf.data);
@@ -1256,7 +1256,7 @@ describeOneTableDetails(const char *schemaname,
if (verbose)
{
- char *s = _("Contains OIDs");
+ char *s = _("Has OIDs");
printfPQExpBuffer(&buf, "%s: %s", s,
(tableinfo.hasoids ? _("yes") : _("no")));
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 1fa93c203a126b5f643316a423450a2e211369ae..f366050c7c851de75e38a34609969c716be684f6 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2000-2004, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.94 2004/10/06 18:39:16 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.95 2004/10/12 21:54:44 petere Exp $
*/
#include "postgres_fe.h"
#include "common.h"
@@ -223,11 +223,11 @@ slashUsage(unsigned short int pager)
fprintf(output, _(" \\dn [PATTERN] list schemas (add \"+\" for more detail)\n"));
fprintf(output, _(" \\do [NAME] list operators\n"));
fprintf(output, _(" \\dl list large objects, same as \\lo_list\n"));
- fprintf(output, _(" \\dp [PATTERN] list table, view and sequence access privileges\n"));
+ fprintf(output, _(" \\dp [PATTERN] list table, view, and sequence access privileges\n"));
fprintf(output, _(" \\dT [PATTERN] list data types (add \"+\" for more detail)\n"));
fprintf(output, _(" \\du [PATTERN] list users\n"));
fprintf(output, _(" \\l list all databases (add \"+\" for more detail)\n"));
- fprintf(output, _(" \\z [PATTERN] list table, view and sequence access privileges (same as \\dp)\n"));
+ fprintf(output, _(" \\z [PATTERN] list table, view, and sequence access privileges (same as \\dp)\n"));
fprintf(output, "\n");
fprintf(output, _("Formatting\n"));
diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c
index ae5ed22aa6955b50ad82aed6e7dfb460644e69bd..72001324f7e990ea95382e4d68900f30d7f98203 100644
--- a/src/bin/psql/input.c
+++ b/src/bin/psql/input.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2000-2004, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/bin/psql/input.c,v 1.40 2004/10/06 19:04:10 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/input.c,v 1.41 2004/10/12 21:54:44 petere Exp $
*/
#include "postgres_fe.h"
#include "input.h"
@@ -210,7 +210,7 @@ saveHistory(char *fname)
psql_error("could not save history to file \"%s\": %s\n", fname, strerror(errno));
}
#else
- psql_error("history is not supported\n");
+ psql_error("history is not supported by this installation\n");
#endif
return false;
diff --git a/src/interfaces/libpq/fe-protocol3.c b/src/interfaces/libpq/fe-protocol3.c
index 425da12102184e8ad5e9c965f6e9fdda38ccfc45..548d036e712c9d31ab20162a4892cf49e48d8297 100644
--- a/src/interfaces/libpq/fe-protocol3.c
+++ b/src/interfaces/libpq/fe-protocol3.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/interfaces/libpq/fe-protocol3.c,v 1.16 2004/08/30 02:54:41 momjian Exp $
+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-protocol3.c,v 1.17 2004/10/12 21:54:45 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -353,7 +353,7 @@ pqParseInput3(PGconn *conn)
{
/* Trouble --- report it */
printfPQExpBuffer(&conn->errorMessage,
- libpq_gettext("Message contents do not agree with length in message type \"%c\"\n"),
+ libpq_gettext("message contents do not agree with length in message type \"%c\"\n"),
id);
/* build an error result holding the error message */
pqSaveErrorResult(conn);
@@ -510,7 +510,7 @@ getAnotherTuple(PGconn *conn, int msgLength)
{
/* Replace partially constructed result with an error result */
printfPQExpBuffer(&conn->errorMessage,
- libpq_gettext("unexpected field count in D message\n"));
+ libpq_gettext("unexpected field count in \"D\" message\n"));
pqSaveErrorResult(conn);
/* Discard the failed message by pretending we read it */
conn->inCursor = conn->inStart + 5 + msgLength;