database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-25 21:42:33 +03:00
Code

seemed like a typo in one of the appendix tables

Browse Source 
Robert Treat
This commit is contained in:
Bruce Momjian 2003-09-11 16:22:42 +00:00
parent fdd93470fa
commit d768cb267b
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/src/sgml/datetime.sgml
View File

@ -1,5 +1,5 @@
<!-- <!--
$Header: /cvsroot/pgsql/doc/src/sgml/datetime.sgml,v 2.34 2003/08/31 17:32:18 petere Exp $ $Header: /cvsroot/pgsql/doc/src/sgml/datetime.sgml,v 2.35 2003/09/11 16:22:42 momjian Exp $
--> -->
<appendix id="datetime-appendix"> <appendix id="datetime-appendix">
@ -344,7 +344,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/datetime.sgml,v 2.34 2003/08/31 17:32:18 pe
</row> </row>
<row> <row>
<entry><literal>PM</literal></entry> <entry><literal>PM</literal></entry>
<entry>Time is on or after after 12:00</entry> <entry>Time is on or after 12:00</entry>
</row> </row>
<row> <row>
<entry><literal>T</literal></entry> <entry><literal>T</literal></entry>

36
src/bin/psql/help.c
View File

@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2003, PostgreSQL Global Development Group * Copyright (c) 2000-2003, PostgreSQL Global Development Group
* *
* $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.78 2003/09/10 21:35:55 momjian Exp $ * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.79 2003/09/11 16:22:42 momjian Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
#include "common.h" #include "common.h"
@ -303,20 +303,41 @@ helpSQL(const char *topic, unsigned short int pager)
{ {
int i; int i;
bool help_found = false; bool help_found = false;
FILE *output;
size_t len; size_t len;
int nl_count = 0;
char *ch;
/* don't care about trailing spaces */ /* don't care about trailing spaces */
len = strlen(topic); len = strlen(topic);
while (topic[len - 1] == ' ') while (topic[len - 1] == ' ')
len--; len--;
/* Count newlines for pager */
for (i = 0; QL_HELP[i].cmd; i++)
{
if (strncasecmp(topic, QL_HELP[i].cmd, len) == 0 ||
strcmp(topic, "*") == 0)
{
nl_count += 5;
for (ch = QL_HELP[i].syntax; *ch != '\0'; ch++)
if (*ch == '\n')
nl_count++;
/* If we have an exact match, exit. Fixes \h SELECT */
if (strcasecmp(topic, QL_HELP[i].cmd) == 0)
break;
}
}
output = PageOutput(nl_count, pager);
for (i = 0; QL_HELP[i].cmd; i++) for (i = 0; QL_HELP[i].cmd; i++)
{ {
if (strncasecmp(topic, QL_HELP[i].cmd, len) == 0 || if (strncasecmp(topic, QL_HELP[i].cmd, len) == 0 ||
strcmp(topic, "*") == 0) strcmp(topic, "*") == 0)
{ {
help_found = true; help_found = true;
printf(_("Command: %s\n" fprintf(output, _("Command: %s\n"
"Description: %s\n" "Description: %s\n"
"Syntax:\n%s\n\n"), "Syntax:\n%s\n\n"),
QL_HELP[i].cmd, QL_HELP[i].help, QL_HELP[i].syntax); QL_HELP[i].cmd, QL_HELP[i].help, QL_HELP[i].syntax);
@ -327,7 +348,16 @@ helpSQL(const char *topic, unsigned short int pager)
} }
if (!help_found) if (!help_found)
printf(_("No help available for \"%-.*s\".\nTry \\h with no arguments to see available help.\n"), (int) len, topic); fprintf(output, _("No help available for \"%-.*s\".\nTry \\h with no arguments to see available help.\n"), (int) len, topic);
/* Only close if we used the pager */
if (output != stdout)
{
pclose(output);
#ifndef WIN32
pqsignal(SIGPIPE, SIG_DFL);
#endif
}
} }
} }