database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-30 21:42:05 +03:00
Code Activity

/home/peter/commit-msg

Browse Source
This commit is contained in:
Peter Eisentraut
2000-05-12 16:13:44 +00:00
parent 475cb157b9
commit 9d31e3a991
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
* *
* Copyright 2000 by PostgreSQL Global Development Group * Copyright 2000 by PostgreSQL Global Development Group
* *
* $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.29 2000/05/11 18:41:00 momjian Exp $ * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.30 2000/05/12 16:13:44 petere Exp $
*/ */
#include "postgres.h" #include "postgres.h"
#include "help.h" #include "help.h"
@ -269,11 +269,11 @@ helpSQL(const char *topic)
for (i = 0; i < items_per_column; i++) for (i = 0; i < items_per_column; i++)
{ {
printf(" %-25s%-25s", printf(" %-26s%-26s",
VALUE_OR_NULL(QL_HELP[i].cmd), VALUE_OR_NULL(QL_HELP[i].cmd),
VALUE_OR_NULL(QL_HELP[i + items_per_column].cmd)); VALUE_OR_NULL(QL_HELP[i + items_per_column].cmd));
if (i + 2 * items_per_column < QL_HELP_COUNT) if (i + 2 * items_per_column < QL_HELP_COUNT)
printf("%-25s", printf("%-26s",
VALUE_OR_NULL(QL_HELP[i + 2 * items_per_column].cmd)); VALUE_OR_NULL(QL_HELP[i + 2 * items_per_column].cmd));
fputc('\n', stdout); fputc('\n', stdout);
} }
@ -283,10 +283,16 @@ helpSQL(const char *topic)
{ {
int i; int i;
bool help_found = false; bool help_found = false;
size_t len;
/* don't care about trailing spaces */
len = strlen(topic);
while (topic[len-1] == ' ')
len--;
for (i = 0; QL_HELP[i].cmd; i++) for (i = 0; QL_HELP[i].cmd; i++)
{ {
if (strcasecmp(QL_HELP[i].cmd, topic) == 0 || if (strncasecmp(topic, QL_HELP[i].cmd, len) == 0 ||
strcmp(topic, "*") == 0) strcmp(topic, "*") == 0)
{ {
help_found = true; help_found = true;
@ -298,7 +304,7 @@ helpSQL(const char *topic)
} }
if (!help_found) if (!help_found)
printf("No help available for '%s'.\nTry \\h with no arguments to see available help.\n", topic); printf("No help available for '%-.*s'.\nTry \\h with no arguments to see available help.\n", (int)len, topic);
} }
} }

6
src/bin/psql/mainloop.c
View File

@ -3,7 +3,7 @@
* *
* Copyright 2000 by PostgreSQL Global Development Group * Copyright 2000 by PostgreSQL Global Development Group
* *
* $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.29 2000/04/14 23:43:44 petere Exp $ * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.30 2000/05/12 16:13:44 petere Exp $
*/ */
#include "postgres.h" #include "postgres.h"
#include "mainloop.h" #include "mainloop.h"
@ -297,6 +297,7 @@ MainLoop(FILE *source)
else else
bslash_count = 0; bslash_count = 0;
rescan:
/* in quote? */ /* in quote? */
if (in_quote) if (in_quote)
{ {
@ -382,7 +383,8 @@ MainLoop(FILE *source)
free(line); free(line);
line = new; line = new;
len = strlen(new); len = strlen(new);
continue; /* reparse the just substituted */
goto rescan; /* reparse the just substituted */
} }
else else
{ {