From 20f7f019f9a6c44e71d33ca3d1b616b4fc1bb3c8 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 18 Sep 2009 05:00:42 +0000 Subject: [PATCH] Easier to translate psql help Instead of requiring translators to translate the entire SQL command synopses, change create_help.pl to only require them to translate the placeholders, and paste those into the synopsis using a printf mechanism. Make some small updates to the markup to make it easier to parse. Note: This causes msgmerge of gettext 0.17 to segfault. You will need the patch from https://savannah.gnu.org/bugs/?27474 to make it work. msgmerge usually only runs on babel.postgresql.org, however. --- doc/src/sgml/ref/alter_database.sgml | 4 +- doc/src/sgml/ref/alter_function.sgml | 4 +- doc/src/sgml/ref/alter_role.sgml | 4 +- doc/src/sgml/ref/alter_table.sgml | 4 +- doc/src/sgml/ref/alter_user.sgml | 4 +- doc/src/sgml/ref/begin.sgml | 4 +- doc/src/sgml/ref/create_domain.sgml | 6 +- doc/src/sgml/ref/create_group.sgml | 4 +- doc/src/sgml/ref/create_role.sgml | 4 +- doc/src/sgml/ref/create_table.sgml | 10 +-- doc/src/sgml/ref/create_user.sgml | 4 +- doc/src/sgml/ref/fetch.sgml | 4 +- doc/src/sgml/ref/grant.sgml | 8 +- doc/src/sgml/ref/lock.sgml | 4 +- doc/src/sgml/ref/select.sgml | 6 +- doc/src/sgml/ref/set_transaction.sgml | 4 +- doc/src/sgml/ref/start_transaction.sgml | 4 +- src/bin/psql/Makefile | 8 +- src/bin/psql/create_help.pl | 101 +++++++++++++++++++----- src/bin/psql/help.c | 15 ++-- src/bin/psql/nls.mk | 4 +- 21 files changed, 139 insertions(+), 71 deletions(-) diff --git a/doc/src/sgml/ref/alter_database.sgml b/doc/src/sgml/ref/alter_database.sgml index 21e8b3bba7..9a28adc846 100644 --- a/doc/src/sgml/ref/alter_database.sgml +++ b/doc/src/sgml/ref/alter_database.sgml @@ -1,5 +1,5 @@ @@ -23,7 +23,7 @@ PostgreSQL documentation ALTER DATABASE name [ [ WITH ] option [ ... ] ] -where option can be: +where option can be: CONNECTION LIMIT connlimit diff --git a/doc/src/sgml/ref/alter_function.sgml b/doc/src/sgml/ref/alter_function.sgml index 803575111a..cce2376004 100644 --- a/doc/src/sgml/ref/alter_function.sgml +++ b/doc/src/sgml/ref/alter_function.sgml @@ -1,5 +1,5 @@ @@ -30,7 +30,7 @@ ALTER FUNCTION name ( [ [ argmode ] [ argname ] argtype [, ...] ] ) SET SCHEMA new_schema -where action is one of: +where action is one of: CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT IMMUTABLE | STABLE | VOLATILE diff --git a/doc/src/sgml/ref/alter_role.sgml b/doc/src/sgml/ref/alter_role.sgml index cef9b5d8ab..5b8a832a48 100644 --- a/doc/src/sgml/ref/alter_role.sgml +++ b/doc/src/sgml/ref/alter_role.sgml @@ -1,5 +1,5 @@ @@ -23,7 +23,7 @@ PostgreSQL documentation ALTER ROLE name [ [ WITH ] option [ ... ] ] -where option can be: +where option can be: SUPERUSER | NOSUPERUSER | CREATEDB | NOCREATEDB diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml index 01aefb9130..354fa20edf 100644 --- a/doc/src/sgml/ref/alter_table.sgml +++ b/doc/src/sgml/ref/alter_table.sgml @@ -1,5 +1,5 @@ @@ -30,7 +30,7 @@ ALTER TABLE name ALTER TABLE name SET SCHEMA new_schema -where action is one of: +where action is one of: ADD [ COLUMN ] column type [ column_constraint [ ... ] ] DROP [ COLUMN ] [ IF EXISTS ] column [ RESTRICT | CASCADE ] diff --git a/doc/src/sgml/ref/alter_user.sgml b/doc/src/sgml/ref/alter_user.sgml index 529684cb9e..386441fe8c 100644 --- a/doc/src/sgml/ref/alter_user.sgml +++ b/doc/src/sgml/ref/alter_user.sgml @@ -1,5 +1,5 @@ @@ -23,7 +23,7 @@ PostgreSQL documentation ALTER USER name [ [ WITH ] option [ ... ] ] -where option can be: +where option can be: SUPERUSER | NOSUPERUSER | CREATEDB | NOCREATEDB diff --git a/doc/src/sgml/ref/begin.sgml b/doc/src/sgml/ref/begin.sgml index 3dd5df9827..9b05454636 100644 --- a/doc/src/sgml/ref/begin.sgml +++ b/doc/src/sgml/ref/begin.sgml @@ -1,5 +1,5 @@ @@ -23,7 +23,7 @@ PostgreSQL documentation BEGIN [ WORK | TRANSACTION ] [ transaction_mode [, ...] ] -where transaction_mode is one of: +where transaction_mode is one of: ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | READ UNCOMMITTED } READ WRITE | READ ONLY diff --git a/doc/src/sgml/ref/create_domain.sgml b/doc/src/sgml/ref/create_domain.sgml index d8bbce1817..aae7a3539c 100644 --- a/doc/src/sgml/ref/create_domain.sgml +++ b/doc/src/sgml/ref/create_domain.sgml @@ -1,5 +1,5 @@ @@ -22,10 +22,10 @@ PostgreSQL documentation CREATE DOMAIN name [ AS ] data_type - [ DEFAULT expression ] + [ DEFAULT expression ] [ constraint [ ... ] ] -where constraint is: +where constraint is: [ CONSTRAINT constraint_name ] { NOT NULL | NULL | CHECK (expression) } diff --git a/doc/src/sgml/ref/create_group.sgml b/doc/src/sgml/ref/create_group.sgml index 5040f630e9..b45fa6eeb2 100644 --- a/doc/src/sgml/ref/create_group.sgml +++ b/doc/src/sgml/ref/create_group.sgml @@ -1,5 +1,5 @@ @@ -23,7 +23,7 @@ PostgreSQL documentation CREATE GROUP name [ [ WITH ] option [ ... ] ] -where option can be: +where option can be: SUPERUSER | NOSUPERUSER | CREATEDB | NOCREATEDB diff --git a/doc/src/sgml/ref/create_role.sgml b/doc/src/sgml/ref/create_role.sgml index d56f65987c..d65456b4a1 100644 --- a/doc/src/sgml/ref/create_role.sgml +++ b/doc/src/sgml/ref/create_role.sgml @@ -1,5 +1,5 @@ @@ -23,7 +23,7 @@ PostgreSQL documentation CREATE ROLE name [ [ WITH ] option [ ... ] ] -where option can be: +where option can be: SUPERUSER | NOSUPERUSER | CREATEDB | NOCREATEDB diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml index 1f986bcd88..dc9b6855d9 100644 --- a/doc/src/sgml/ref/create_table.sgml +++ b/doc/src/sgml/ref/create_table.sgml @@ -1,5 +1,5 @@ @@ -22,7 +22,7 @@ PostgreSQL documentation CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name ( [ - { column_name data_type [ DEFAULT default_expr ] [ column_constraint [ ... ] ] + { column_name data_type [ DEFAULT default_expr ] [ column_constraint [ ... ] ] | table_constraint | LIKE parent_table [ { INCLUDING | EXCLUDING } { DEFAULTS | CONSTRAINTS | INDEXES } ] ... } [, ... ] @@ -32,7 +32,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE tablespace ] -where column_constraint is: +where column_constraint is: [ CONSTRAINT constraint_name ] { NOT NULL | @@ -44,7 +44,7 @@ where column_constraint is: [ ON DELETE action ] [ ON UPDATE action ] } [ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ] -and table_constraint is: +and table_constraint is: [ CONSTRAINT constraint_name ] { UNIQUE ( column_name [, ... ] ) index_parameters | @@ -54,7 +54,7 @@ and table_constraint is: [ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ] [ ON DELETE action ] [ ON UPDATE action ] } [ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ] -index_parameters in UNIQUE and PRIMARY KEY constraints are: +index_parameters in UNIQUE and PRIMARY KEY constraints are: [ WITH ( storage_parameter [= value] [, ... ] ) ] [ USING INDEX TABLESPACE tablespace ] diff --git a/doc/src/sgml/ref/create_user.sgml b/doc/src/sgml/ref/create_user.sgml index 3b0f325896..7530ead7be 100644 --- a/doc/src/sgml/ref/create_user.sgml +++ b/doc/src/sgml/ref/create_user.sgml @@ -1,5 +1,5 @@ @@ -23,7 +23,7 @@ PostgreSQL documentation CREATE USER name [ [ WITH ] option [ ... ] ] -where option can be: +where option can be: SUPERUSER | NOSUPERUSER | CREATEDB | NOCREATEDB diff --git a/doc/src/sgml/ref/fetch.sgml b/doc/src/sgml/ref/fetch.sgml index 74ff297bb2..ca81bcf557 100644 --- a/doc/src/sgml/ref/fetch.sgml +++ b/doc/src/sgml/ref/fetch.sgml @@ -1,5 +1,5 @@ @@ -28,7 +28,7 @@ PostgreSQL documentation FETCH [ direction { FROM | IN } ] cursorname -where direction can be empty or one of: +where direction can be empty or one of: NEXT PRIOR diff --git a/doc/src/sgml/ref/grant.sgml b/doc/src/sgml/ref/grant.sgml index fe927e0ffe..55f87006bf 100644 --- a/doc/src/sgml/ref/grant.sgml +++ b/doc/src/sgml/ref/grant.sgml @@ -1,5 +1,5 @@ @@ -41,11 +41,11 @@ GRANT { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL [ PRIVILEGES ] } TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ] GRANT { USAGE | ALL [ PRIVILEGES ] } - ON FOREIGN DATA WRAPPER fdwname [, ...] + ON FOREIGN DATA WRAPPER fdwname [, ...] TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ] GRANT { USAGE | ALL [ PRIVILEGES ] } - ON FOREIGN SERVER servername [, ...] + ON FOREIGN SERVER servername [, ...] TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ] GRANT { EXECUTE | ALL [ PRIVILEGES ] } @@ -61,7 +61,7 @@ GRANT { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] } TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ] GRANT { CREATE | ALL [ PRIVILEGES ] } - ON TABLESPACE tablespacename [, ...] + ON TABLESPACE tablespacename [, ...] TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ] GRANT role [, ...] TO rolename [, ...] [ WITH ADMIN OPTION ] diff --git a/doc/src/sgml/ref/lock.sgml b/doc/src/sgml/ref/lock.sgml index 567f363451..4df32bff45 100644 --- a/doc/src/sgml/ref/lock.sgml +++ b/doc/src/sgml/ref/lock.sgml @@ -1,5 +1,5 @@ @@ -23,7 +23,7 @@ PostgreSQL documentation LOCK [ TABLE ] [ ONLY ] name [, ...] [ IN lockmode MODE ] [ NOWAIT ] -where lockmode is one of: +where lockmode is one of: ACCESS SHARE | ROW SHARE | ROW EXCLUSIVE | SHARE UPDATE EXCLUSIVE | SHARE | SHARE ROW EXCLUSIVE | EXCLUSIVE | ACCESS EXCLUSIVE diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml index f22eeb2804..524c902048 100644 --- a/doc/src/sgml/ref/select.sgml +++ b/doc/src/sgml/ref/select.sgml @@ -1,5 +1,5 @@ @@ -47,7 +47,7 @@ SELECT [ ALL | DISTINCT [ ON ( expressioncount ] { ROW | ROWS } ONLY ] [ FOR { UPDATE | SHARE } [ OF table_name [, ...] ] [ NOWAIT ] [...] ] -where from_item can be one of: +where from_item can be one of: [ ONLY ] table_name [ * ] [ [ AS ] alias [ ( column_alias [, ...] ) ] ] ( select ) [ AS ] alias [ ( column_alias [, ...] ) ] @@ -56,7 +56,7 @@ where from_item can be one of: function_name ( [ argument [, ...] ] ) AS ( column_definition [, ...] ) from_item [ NATURAL ] join_type from_item [ ON join_condition | USING ( join_column [, ...] ) ] -and with_query is: +and with_query is: with_query_name [ ( column_name [, ...] ) ] AS ( select ) diff --git a/doc/src/sgml/ref/set_transaction.sgml b/doc/src/sgml/ref/set_transaction.sgml index f3b9999b15..80cf691182 100644 --- a/doc/src/sgml/ref/set_transaction.sgml +++ b/doc/src/sgml/ref/set_transaction.sgml @@ -1,4 +1,4 @@ - + SET TRANSACTION @@ -20,7 +20,7 @@ SET TRANSACTION transaction_mode [, ...] SET SESSION CHARACTERISTICS AS TRANSACTION transaction_mode [, ...] -where transaction_mode is one of: +where transaction_mode is one of: ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | READ UNCOMMITTED } READ WRITE | READ ONLY diff --git a/doc/src/sgml/ref/start_transaction.sgml b/doc/src/sgml/ref/start_transaction.sgml index 9f63ad2de7..15ba39af91 100644 --- a/doc/src/sgml/ref/start_transaction.sgml +++ b/doc/src/sgml/ref/start_transaction.sgml @@ -1,5 +1,5 @@ @@ -23,7 +23,7 @@ PostgreSQL documentation START TRANSACTION [ transaction_mode [, ...] ] -where transaction_mode is one of: +where transaction_mode is one of: ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | READ UNCOMMITTED } READ WRITE | READ ONLY diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile index 5a7cade374..9a5feadba4 100644 --- a/src/bin/psql/Makefile +++ b/src/bin/psql/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.65 2009/08/28 20:26:19 petere Exp $ +# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.66 2009/09/18 05:00:42 petere Exp $ # #------------------------------------------------------------------------- @@ -22,6 +22,7 @@ override CPPFLAGS := -I. -I$(srcdir) -I$(libpq_srcdir) -I$(top_srcdir)/src/bin/p OBJS= command.o common.o help.o input.o stringutils.o mainloop.o copy.o \ startup.o prompt.o variables.o large_obj.o print.o describe.o \ psqlscan.o tab-complete.o mbprint.o dumputils.o keywords.o kwlookup.o \ + sql_help.o \ $(WIN32RES) FLEXFLAGS = -Cfe @@ -40,8 +41,9 @@ dumputils.c keywords.c: % : $(top_srcdir)/src/bin/pg_dump/% kwlookup.c: % : $(top_srcdir)/src/backend/parser/% rm -f $@ && $(LN_S) $< . +sql_help.c: sql_help.h ; sql_help.h: create_help.pl $(wildcard $(REFDOCDIR)/*.sgml) - $(PERL) $< $(REFDOCDIR) $@ + $(PERL) $< $(REFDOCDIR) $* psqlscan.c: psqlscan.l ifdef FLEX @@ -67,4 +69,4 @@ clean distclean: rm -f psql$(X) $(OBJS) dumputils.c keywords.c kwlookup.c maintainer-clean: distclean - rm -f sql_help.h psqlscan.c + rm -f sql_help.h sql_help.c psqlscan.c diff --git a/src/bin/psql/create_help.pl b/src/bin/psql/create_help.pl index 6aadda90b0..d56cc5bea6 100644 --- a/src/bin/psql/create_help.pl +++ b/src/bin/psql/create_help.pl @@ -5,7 +5,7 @@ # # Copyright (c) 2000-2009, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/bin/psql/create_help.pl,v 1.19 2009/01/01 17:23:54 momjian Exp $ +# $PostgreSQL: pgsql/src/bin/psql/create_help.pl,v 1.20 2009/09/18 05:00:42 petere Exp $ ################################################################# # @@ -14,7 +14,7 @@ # enough that this worked, but this here is by no means an SGML # parser. # -# Call: perl create_help.pl docdir sql_help.h +# Call: perl create_help.pl docdir sql_help # The name of the header file doesn't matter to this script, but it # sure does matter to the rest of the source. # @@ -22,26 +22,29 @@ use strict; my $docdir = $ARGV[0] or die "$0: missing required argument: docdir\n"; -my $outputfile = $ARGV[1] or die "$0: missing required argument: output file\n"; +my $hfile = $ARGV[1] . '.h' or die "$0: missing required argument: output file\n"; +my $cfile = $ARGV[1] . '.c'; -my $outputfilebasename; -if ($outputfile =~ m!.*/([^/]+)$!) { - $outputfilebasename = $1; +my $hfilebasename; +if ($hfile =~ m!.*/([^/]+)$!) { + $hfilebasename = $1; } else { - $outputfilebasename = $outputfile; + $hfilebasename = $hfile; } -my $define = $outputfilebasename; +my $define = $hfilebasename; $define =~ tr/a-z/A-Z/; $define =~ s/\W/_/g; opendir(DIR, $docdir) or die "$0: could not open documentation source dir '$docdir': $!\n"; -open(OUT, ">$outputfile") - or die "$0: could not open output file '$outputfile': $!\n"; +open(HFILE, ">$hfile") + or die "$0: could not open output file '$hfile': $!\n"; +open(CFILE, ">$cfile") + or die "$0: could not open output file '$cfile': $!\n"; -print OUT +print HFILE "/* * *** Do not change this file by hand. It is automatically * *** generated from the DocBook documentation. @@ -56,15 +59,31 @@ print OUT #define N_(x) (x) /* gettext noop */ +#include \"postgres_fe.h\" +#include \"pqexpbuffer.h\" + struct _helpStruct { const char *cmd; /* the command name */ const char *help; /* the help associated with it */ - const char *syntax; /* the syntax associated with it */ + void (*syntaxfunc)(PQExpBuffer); /* function that prints the syntax associated with it */ + int nl_count; /* number of newlines in syntax (for pager) */ }; +"; + +print CFILE +"/* + * *** Do not change this file by hand. It is automatically + * *** generated from the DocBook documentation. + * + * generated by + * $^X $0 @ARGV + * + */ + +#include \"$hfile\" -static const struct _helpStruct QL_HELP[] = { "; my $maxlen = 0; @@ -95,12 +114,25 @@ foreach my $file (sort readdir DIR) { $cmddesc =~ s/\s+/ /g; $cmddesc =~ s/\"/\\"/g; - $cmdsynopsis =~ s/<[^>]+>//g; + my @params = (); + + my $nl_count = () = $cmdsynopsis =~ /\n/g; + + $cmdsynopsis =~ m!! and die "$0:$file: null end tag not supported in synopsis\n"; + $cmdsynopsis =~ s/%/%%/g; + + while ($cmdsynopsis =~ m!<(\w+)[^>]*>(.+?)]*>!) { + my $match = $2; + $match =~ s/<[^>]+>//g; + $match =~ s/%%/%/g; + push @params, $match; + $cmdsynopsis =~ s!<(\w+)[^>]*>.+?]*>!%s!; + } $cmdsynopsis =~ s/\r?\n/\\n/g; $cmdsynopsis =~ s/\"/\\"/g; foreach my $cmdname (@cmdnames) { - $entries{$cmdname} = { cmddesc => $cmddesc, cmdsynopsis => $cmdsynopsis }; + $entries{$cmdname} = { cmddesc => $cmddesc, cmdsynopsis => $cmdsynopsis, params => \@params, nl_count => $nl_count }; $maxlen = ($maxlen >= length $cmdname) ? $maxlen : length $cmdname; } } @@ -109,9 +141,41 @@ foreach my $file (sort readdir DIR) { } } -print OUT " { \"$_\",\n N_(\"".$entries{$_}{cmddesc}."\"),\n N_(\"".$entries{$_}{cmdsynopsis}."\") },\n\n" foreach (sort keys %entries); +foreach (sort keys %entries) { + my $prefix = "\t"x5 . ' '; + my $id = $_; + $id =~ s/ /_/g; + my $synopsis = "\"$entries{$_}{cmdsynopsis}\""; + $synopsis =~ s/\\n/\\n"\n$prefix"/g; + my @args = ("buf", + $synopsis, + map("_(\"$_\")", @{$entries{$_}{params}})); + print HFILE "extern void sql_help_$id(PQExpBuffer buf);\n"; + print CFILE "void +sql_help_$id(PQExpBuffer buf) +{ +\tappendPQExpBuffer(".join(",\n$prefix", @args)."); +} -print OUT " +"; +} + +print HFILE " + +static const struct _helpStruct QL_HELP[] = { +"; +foreach (sort keys %entries) { + my $id = $_; + $id =~ s/ /_/g; + print HFILE " { \"$_\", + N_(\"$entries{$_}{cmddesc}\"), + sql_help_$id, + $entries{$_}{nl_count} }, + +"; +} + +print HFILE " { NULL, NULL, NULL } /* End of list marker */ }; @@ -123,5 +187,6 @@ print OUT " #endif /* $define */ "; -close OUT; +close CFILE; +close HFILE; closedir DIR; diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c index ef297fe009..947eff050a 100644 --- a/src/bin/psql/help.c +++ b/src/bin/psql/help.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2009, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.151 2009/07/24 19:35:44 petere Exp $ + * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.152 2009/09/18 05:00:42 petere Exp $ */ #include "postgres_fe.h" @@ -349,7 +349,6 @@ helpSQL(const char *topic, unsigned short int pager) size_t len, wordlen; int nl_count = 0; - const char *ch; /* User gets two chances: exact match, then the first word */ @@ -386,10 +385,8 @@ helpSQL(const char *topic, unsigned short int pager) if (pg_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++; + nl_count += 5 + QL_HELP[i].nl_count; + /* If we have an exact match, exit. Fixes \h SELECT */ if (pg_strcasecmp(topic, QL_HELP[i].cmd) == 0) break; @@ -403,13 +400,17 @@ helpSQL(const char *topic, unsigned short int pager) if (pg_strncasecmp(topic, QL_HELP[i].cmd, len) == 0 || strcmp(topic, "*") == 0) { + PQExpBufferData buffer; + + initPQExpBuffer(&buffer); + QL_HELP[i].syntaxfunc(&buffer); help_found = true; fprintf(output, _("Command: %s\n" "Description: %s\n" "Syntax:\n%s\n\n"), QL_HELP[i].cmd, _(QL_HELP[i].help), - _(QL_HELP[i].syntax)); + buffer.data); /* If we have an exact match, exit. Fixes \h SELECT */ if (pg_strcasecmp(topic, QL_HELP[i].cmd) == 0) break; diff --git a/src/bin/psql/nls.mk b/src/bin/psql/nls.mk index e6ca23563a..16c8380535 100644 --- a/src/bin/psql/nls.mk +++ b/src/bin/psql/nls.mk @@ -1,7 +1,7 @@ -# $PostgreSQL: pgsql/src/bin/psql/nls.mk,v 1.23 2009/06/26 19:33:50 petere Exp $ +# $PostgreSQL: pgsql/src/bin/psql/nls.mk,v 1.24 2009/09/18 05:00:42 petere Exp $ CATALOG_NAME := psql AVAIL_LANGUAGES := cs de es fr ja pt_BR sv tr GETTEXT_FILES := command.c common.c copy.c help.c input.c large_obj.c \ - mainloop.c print.c startup.c describe.c sql_help.h \ + mainloop.c print.c startup.c describe.c sql_help.h sql_help.c \ ../../port/exec.c GETTEXT_TRIGGERS:= _ N_ psql_error simple_prompt