← Back to branch summary

~ubuntu-branches/ubuntu/natty/postgresql-8.4/natty-security

« back to all changes in this revision

Viewing changes to src/bin/psql/help.c

Tags: upstream-8.4.0
Import upstream version 8.4.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/bin/psql/help.c
3
3
 *
4
4
 * Copyright (c) 2000-2009, PostgreSQL Global Development Group
5
5
 *
6
 
 * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.149 2009/04/22 14:58:48 momjian Exp $
 
6
 * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.150 2009/06/11 14:49:08 momjian Exp $
7
7
 */
8
8
#include "postgres_fe.h"
9
9
 
118
118
        printf(_("\nOutput format options:\n"));
119
119
        printf(_("  -A, --no-align           unaligned table output mode\n"));
120
120
        printf(_("  -F, --field-separator=STRING\n"
121
 
                         "                           set field separator (default: \"%s\")\n"),
 
121
           "                           set field separator (default: \"%s\")\n"),
122
122
                   DEFAULT_FIELD_SEP);
123
123
        printf(_("  -H, --html               HTML table output mode\n"));
124
124
        printf(_("  -P, --pset=VAR[=ARG]     set printing option VAR to ARG (see \\pset command)\n"));
125
125
        printf(_("  -R, --record-separator=STRING\n"
126
 
                         "                           set record separator (default: newline)\n"));
 
126
        "                           set record separator (default: newline)\n"));
127
127
        printf(_("  -t, --tuples-only        print rows only\n"));
128
128
        printf(_("  -T, --table-attr=TEXT    set HTML table tag attributes (e.g., width, border)\n"));
129
129
        printf(_("  -x, --expanded           turn on expanded table output\n"));
243
243
 
244
244
        fprintf(output, _("Connection\n"));
245
245
        fprintf(output, _("  \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
246
 
                                          "                         connect to new database (currently \"%s\")\n"),
 
246
        "                         connect to new database (currently \"%s\")\n"),
247
247
                        PQdb(pset.db));
248
248
        fprintf(output, _("  \\encoding [ENCODING]   show or set client encoding\n"));
249
249
        fprintf(output, _("  \\password [USERNAME]   securely change the password for a user\n"));
320
320
                for (i = 0; i < nrows; i++)
321
321
                {
322
322
                        fprintf(output, "  ");
323
 
                        for (j = 0; j < ncolumns-1; j++)
 
323
                        for (j = 0; j < ncolumns - 1; j++)
324
324
                                fprintf(output, "%-*s",
325
325
                                                QL_MAX_CMD_LEN + 1,
326
326
                                                VALUE_OR_NULL(QL_HELP[i + j * nrows].cmd));