From 2273a50364cf4a098d7ee4b5aa7e88c5cc5777ad Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 18 May 2012 20:34:14 +0300 Subject: [PATCH] Realign some --help output to have better spacing between columns --- src/backend/main/main.c | 74 ++++++++++++++--------------- src/bin/pg_dump/pg_dump.c | 74 ++++++++++++++--------------- src/bin/pg_dump/pg_dumpall.c | 50 +++++++++---------- src/bin/pg_dump/pg_restore.c | 53 ++++++++++----------- src/bin/pg_resetxlog/pg_resetxlog.c | 20 ++++---- 5 files changed, 134 insertions(+), 137 deletions(-) diff --git a/src/backend/main/main.c b/src/backend/main/main.c index 9675f5ed1f..a63ebe3d10 100644 --- a/src/backend/main/main.c +++ b/src/backend/main/main.c @@ -275,53 +275,53 @@ help(const char *progname) printf(_("Usage:\n %s [OPTION]...\n\n"), progname); printf(_("Options:\n")); #ifdef USE_ASSERT_CHECKING - printf(_(" -A 1|0 enable/disable run-time assert checking\n")); + printf(_(" -A 1|0 enable/disable run-time assert checking\n")); #endif - printf(_(" -B NBUFFERS number of shared buffers\n")); - printf(_(" -c NAME=VALUE set run-time parameter\n")); - printf(_(" -C NAME return run-time parameter\n")); - printf(_(" -d 1-5 debugging level\n")); - printf(_(" -D DATADIR database directory\n")); - printf(_(" -e use European date input format (DMY)\n")); - printf(_(" -F turn fsync off\n")); - printf(_(" -h HOSTNAME host name or IP address to listen on\n")); - printf(_(" -i enable TCP/IP connections\n")); - printf(_(" -k DIRECTORY Unix-domain socket location\n")); + printf(_(" -B NBUFFERS number of shared buffers\n")); + printf(_(" -c NAME=VALUE set run-time parameter\n")); + printf(_(" -C NAME return run-time parameter\n")); + printf(_(" -d 1-5 debugging level\n")); + printf(_(" -D DATADIR database directory\n")); + printf(_(" -e use European date input format (DMY)\n")); + printf(_(" -F turn fsync off\n")); + printf(_(" -h HOSTNAME host name or IP address to listen on\n")); + printf(_(" -i enable TCP/IP connections\n")); + printf(_(" -k DIRECTORY Unix-domain socket location\n")); #ifdef USE_SSL - printf(_(" -l enable SSL connections\n")); + printf(_(" -l enable SSL connections\n")); #endif - printf(_(" -N MAX-CONNECT maximum number of allowed connections\n")); - printf(_(" -o OPTIONS pass \"OPTIONS\" to each server process (obsolete)\n")); - printf(_(" -p PORT port number to listen on\n")); - printf(_(" -s show statistics after each query\n")); - printf(_(" -S WORK-MEM set amount of memory for sorts (in kB)\n")); - printf(_(" --NAME=VALUE set run-time parameter\n")); + printf(_(" -N MAX-CONNECT maximum number of allowed connections\n")); + printf(_(" -o OPTIONS pass \"OPTIONS\" to each server process (obsolete)\n")); + printf(_(" -p PORT port number to listen on\n")); + printf(_(" -s show statistics after each query\n")); + printf(_(" -S WORK-MEM set amount of memory for sorts (in kB)\n")); + printf(_(" --NAME=VALUE set run-time parameter\n")); printf(_(" --describe-config describe configuration parameters, then exit\n")); - printf(_(" --help show this help, then exit\n")); - printf(_(" --version output version information, then exit\n")); + printf(_(" --help show this help, then exit\n")); + printf(_(" --version output version information, then exit\n")); printf(_("\nDeveloper options:\n")); - printf(_(" -f s|i|n|m|h forbid use of some plan types\n")); - printf(_(" -n do not reinitialize shared memory after abnormal exit\n")); - printf(_(" -O allow system table structure changes\n")); - printf(_(" -P disable system indexes\n")); - printf(_(" -t pa|pl|ex show timings after each query\n")); - printf(_(" -T send SIGSTOP to all backend processes if one dies\n")); - printf(_(" -W NUM wait NUM seconds to allow attach from a debugger\n")); + printf(_(" -f s|i|n|m|h forbid use of some plan types\n")); + printf(_(" -n do not reinitialize shared memory after abnormal exit\n")); + printf(_(" -O allow system table structure changes\n")); + printf(_(" -P disable system indexes\n")); + printf(_(" -t pa|pl|ex show timings after each query\n")); + printf(_(" -T send SIGSTOP to all backend processes if one dies\n")); + printf(_(" -W NUM wait NUM seconds to allow attach from a debugger\n")); printf(_("\nOptions for single-user mode:\n")); - printf(_(" --single selects single-user mode (must be first argument)\n")); - printf(_(" DBNAME database name (defaults to user name)\n")); - printf(_(" -d 0-5 override debugging level\n")); - printf(_(" -E echo statement before execution\n")); - printf(_(" -j do not use newline as interactive query delimiter\n")); - printf(_(" -r FILENAME send stdout and stderr to given file\n")); + printf(_(" --single selects single-user mode (must be first argument)\n")); + printf(_(" DBNAME database name (defaults to user name)\n")); + printf(_(" -d 0-5 override debugging level\n")); + printf(_(" -E echo statement before execution\n")); + printf(_(" -j do not use newline as interactive query delimiter\n")); + printf(_(" -r FILENAME send stdout and stderr to given file\n")); printf(_("\nOptions for bootstrapping mode:\n")); - printf(_(" --boot selects bootstrapping mode (must be first argument)\n")); - printf(_(" DBNAME database name (mandatory argument in bootstrapping mode)\n")); - printf(_(" -r FILENAME send stdout and stderr to given file\n")); - printf(_(" -x NUM internal use\n")); + printf(_(" --boot selects bootstrapping mode (must be first argument)\n")); + printf(_(" DBNAME database name (mandatory argument in bootstrapping mode)\n")); + printf(_(" -r FILENAME send stdout and stderr to given file\n")); + printf(_(" -x NUM internal use\n")); printf(_("\nPlease read the documentation for the complete list of run-time\n" "configuration settings and how to set them on the command line or in\n" diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index d2229af846..6e13b74628 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -783,46 +783,46 @@ help(const char *progname) printf(_(" %s [OPTION]... [DBNAME]\n"), progname); printf(_("\nGeneral options:\n")); - printf(_(" -f, --file=FILENAME output file or directory name\n")); - printf(_(" -F, --format=c|d|t|p output file format (custom, directory, tar,\n" - " plain text (default))\n")); - printf(_(" -v, --verbose verbose mode\n")); - printf(_(" -Z, --compress=0-9 compression level for compressed formats\n")); - printf(_(" --lock-wait-timeout=TIMEOUT fail after waiting TIMEOUT for a table lock\n")); - printf(_(" --help show this help, then exit\n")); - printf(_(" --version output version information, then exit\n")); + printf(_(" -f, --file=FILENAME output file or directory name\n")); + printf(_(" -F, --format=c|d|t|p output file format (custom, directory, tar,\n" + " plain text (default))\n")); + printf(_(" -v, --verbose verbose mode\n")); + printf(_(" -Z, --compress=0-9 compression level for compressed formats\n")); + printf(_(" --lock-wait-timeout=TIMEOUT fail after waiting TIMEOUT for a table lock\n")); + printf(_(" --help show this help, then exit\n")); + printf(_(" --version output version information, then exit\n")); printf(_("\nOptions controlling the output content:\n")); - printf(_(" -a, --data-only dump only the data, not the schema\n")); - printf(_(" -b, --blobs include large objects in dump\n")); - printf(_(" -c, --clean clean (drop) database objects before recreating\n")); - printf(_(" -C, --create include commands to create database in dump\n")); - printf(_(" -E, --encoding=ENCODING dump the data in encoding ENCODING\n")); - printf(_(" -n, --schema=SCHEMA dump the named schema(s) only\n")); - printf(_(" -N, --exclude-schema=SCHEMA do NOT dump the named schema(s)\n")); - printf(_(" -o, --oids include OIDs in dump\n")); - printf(_(" -O, --no-owner skip restoration of object ownership in\n" - " plain-text format\n")); - printf(_(" -s, --schema-only dump only the schema, no data\n")); - printf(_(" -S, --superuser=NAME superuser user name to use in plain-text format\n")); - printf(_(" -t, --table=TABLE dump the named table(s) only\n")); - printf(_(" -T, --exclude-table=TABLE do NOT dump the named table(s)\n")); - printf(_(" -x, --no-privileges do not dump privileges (grant/revoke)\n")); - printf(_(" --binary-upgrade for use by upgrade utilities only\n")); - printf(_(" --column-inserts dump data as INSERT commands with column names\n")); - printf(_(" --disable-dollar-quoting disable dollar quoting, use SQL standard quoting\n")); - printf(_(" --disable-triggers disable triggers during data-only restore\n")); - printf(_(" --exclude-table-data=TABLE do NOT dump data for the named table(s)\n")); - printf(_(" --inserts dump data as INSERT commands, rather than COPY\n")); - printf(_(" --no-security-labels do not dump security label assignments\n")); - printf(_(" --no-tablespaces do not dump tablespace assignments\n")); - printf(_(" --no-unlogged-table-data do not dump unlogged table data\n")); - printf(_(" --quote-all-identifiers quote all identifiers, even if not key words\n")); - printf(_(" --section=SECTION dump named section (pre-data, data, or post-data)\n")); - printf(_(" --serializable-deferrable wait until the dump can run without anomalies\n")); + printf(_(" -a, --data-only dump only the data, not the schema\n")); + printf(_(" -b, --blobs include large objects in dump\n")); + printf(_(" -c, --clean clean (drop) database objects before recreating\n")); + printf(_(" -C, --create include commands to create database in dump\n")); + printf(_(" -E, --encoding=ENCODING dump the data in encoding ENCODING\n")); + printf(_(" -n, --schema=SCHEMA dump the named schema(s) only\n")); + printf(_(" -N, --exclude-schema=SCHEMA do NOT dump the named schema(s)\n")); + printf(_(" -o, --oids include OIDs in dump\n")); + printf(_(" -O, --no-owner skip restoration of object ownership in\n" + " plain-text format\n")); + printf(_(" -s, --schema-only dump only the schema, no data\n")); + printf(_(" -S, --superuser=NAME superuser user name to use in plain-text format\n")); + printf(_(" -t, --table=TABLE dump the named table(s) only\n")); + printf(_(" -T, --exclude-table=TABLE do NOT dump the named table(s)\n")); + printf(_(" -x, --no-privileges do not dump privileges (grant/revoke)\n")); + printf(_(" --binary-upgrade for use by upgrade utilities only\n")); + printf(_(" --column-inserts dump data as INSERT commands with column names\n")); + printf(_(" --disable-dollar-quoting disable dollar quoting, use SQL standard quoting\n")); + printf(_(" --disable-triggers disable triggers during data-only restore\n")); + printf(_(" --exclude-table-data=TABLE do NOT dump data for the named table(s)\n")); + printf(_(" --inserts dump data as INSERT commands, rather than COPY\n")); + printf(_(" --no-security-labels do not dump security label assignments\n")); + printf(_(" --no-tablespaces do not dump tablespace assignments\n")); + printf(_(" --no-unlogged-table-data do not dump unlogged table data\n")); + printf(_(" --quote-all-identifiers quote all identifiers, even if not key words\n")); + printf(_(" --section=SECTION dump named section (pre-data, data, or post-data)\n")); + printf(_(" --serializable-deferrable wait until the dump can run without anomalies\n")); printf(_(" --use-set-session-authorization\n" - " use SET SESSION AUTHORIZATION commands instead of\n" - " ALTER OWNER commands to set ownership\n")); + " use SET SESSION AUTHORIZATION commands instead of\n" + " ALTER OWNER commands to set ownership\n")); printf(_("\nConnection options:\n")); printf(_(" -h, --host=HOSTNAME database server host or socket directory\n")); diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c index 4100fca27d..34d6920364 100644 --- a/src/bin/pg_dump/pg_dumpall.c +++ b/src/bin/pg_dump/pg_dumpall.c @@ -537,33 +537,33 @@ help(void) printf(_(" %s [OPTION]...\n"), progname); printf(_("\nGeneral options:\n")); - printf(_(" -f, --file=FILENAME output file name\n")); - printf(_(" --lock-wait-timeout=TIMEOUT fail after waiting TIMEOUT for a table lock\n")); - printf(_(" --help show this help, then exit\n")); - printf(_(" --version output version information, then exit\n")); + printf(_(" -f, --file=FILENAME output file name\n")); + printf(_(" --lock-wait-timeout=TIMEOUT fail after waiting TIMEOUT for a table lock\n")); + printf(_(" --help show this help, then exit\n")); + printf(_(" --version output version information, then exit\n")); printf(_("\nOptions controlling the output content:\n")); - printf(_(" -a, --data-only dump only the data, not the schema\n")); - printf(_(" -c, --clean clean (drop) databases before recreating\n")); - printf(_(" -g, --globals-only dump only global objects, no databases\n")); - printf(_(" -o, --oids include OIDs in dump\n")); - printf(_(" -O, --no-owner skip restoration of object ownership\n")); - printf(_(" -r, --roles-only dump only roles, no databases or tablespaces\n")); - printf(_(" -s, --schema-only dump only the schema, no data\n")); - printf(_(" -S, --superuser=NAME superuser user name to use in the dump\n")); - printf(_(" -t, --tablespaces-only dump only tablespaces, no databases or roles\n")); - printf(_(" -x, --no-privileges do not dump privileges (grant/revoke)\n")); - printf(_(" --binary-upgrade for use by upgrade utilities only\n")); - printf(_(" --column-inserts dump data as INSERT commands with column names\n")); - printf(_(" --disable-dollar-quoting disable dollar quoting, use SQL standard quoting\n")); - printf(_(" --disable-triggers disable triggers during data-only restore\n")); - printf(_(" --inserts dump data as INSERT commands, rather than COPY\n")); - printf(_(" --no-security-labels do not dump security label assignments\n")); - printf(_(" --no-tablespaces do not dump tablespace assignments\n")); - printf(_(" --no-unlogged-table-data do not dump unlogged table data\n")); - printf(_(" --quote-all-identifiers quote all identifiers, even if not key words\n")); + printf(_(" -a, --data-only dump only the data, not the schema\n")); + printf(_(" -c, --clean clean (drop) databases before recreating\n")); + printf(_(" -g, --globals-only dump only global objects, no databases\n")); + printf(_(" -o, --oids include OIDs in dump\n")); + printf(_(" -O, --no-owner skip restoration of object ownership\n")); + printf(_(" -r, --roles-only dump only roles, no databases or tablespaces\n")); + printf(_(" -s, --schema-only dump only the schema, no data\n")); + printf(_(" -S, --superuser=NAME superuser user name to use in the dump\n")); + printf(_(" -t, --tablespaces-only dump only tablespaces, no databases or roles\n")); + printf(_(" -x, --no-privileges do not dump privileges (grant/revoke)\n")); + printf(_(" --binary-upgrade for use by upgrade utilities only\n")); + printf(_(" --column-inserts dump data as INSERT commands with column names\n")); + printf(_(" --disable-dollar-quoting disable dollar quoting, use SQL standard quoting\n")); + printf(_(" --disable-triggers disable triggers during data-only restore\n")); + printf(_(" --inserts dump data as INSERT commands, rather than COPY\n")); + printf(_(" --no-security-labels do not dump security label assignments\n")); + printf(_(" --no-tablespaces do not dump tablespace assignments\n")); + printf(_(" --no-unlogged-table-data do not dump unlogged table data\n")); + printf(_(" --quote-all-identifiers quote all identifiers, even if not key words\n")); printf(_(" --use-set-session-authorization\n" - " use SET SESSION AUTHORIZATION commands instead of\n" - " ALTER OWNER commands to set ownership\n")); + " use SET SESSION AUTHORIZATION commands instead of\n" + " ALTER OWNER commands to set ownership\n")); printf(_("\nConnection options:\n")); printf(_(" -h, --host=HOSTNAME database server host or socket directory\n")); diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c index bd2feff114..d1a2ce3665 100644 --- a/src/bin/pg_dump/pg_restore.c +++ b/src/bin/pg_dump/pg_restore.c @@ -440,35 +440,32 @@ usage(const char *progname) printf(_(" --version output version information, then exit\n")); printf(_("\nOptions controlling the restore:\n")); - printf(_(" -a, --data-only restore only the data, no schema\n")); - printf(_(" -c, --clean clean (drop) database objects before recreating\n")); - printf(_(" -C, --create create the target database\n")); - printf(_(" -e, --exit-on-error exit on error, default is to continue\n")); - printf(_(" -I, --index=NAME restore named index\n")); - printf(_(" -j, --jobs=NUM use this many parallel jobs to restore\n")); - printf(_(" -L, --use-list=FILENAME use table of contents from this file for\n" - " selecting/ordering output\n")); - printf(_(" -n, --schema=NAME restore only objects in this schema\n")); - printf(_(" -O, --no-owner skip restoration of object ownership\n")); - printf(_(" -P, --function=NAME(args)\n" - " restore named function\n")); - printf(_(" -s, --schema-only restore only the schema, no data\n")); - printf(_(" -S, --superuser=NAME superuser user name to use for disabling triggers\n")); - printf(_(" -t, --table=NAME restore named table\n")); - printf(_(" -T, --trigger=NAME restore named trigger\n")); - printf(_(" -x, --no-privileges skip restoration of access privileges (grant/revoke)\n")); - printf(_(" -1, --single-transaction\n" - " restore as a single transaction\n")); - printf(_(" --disable-triggers disable triggers during data-only restore\n")); - printf(_(" --no-data-for-failed-tables\n" - " do not restore data of tables that could not be\n" - " created\n")); - printf(_(" --no-security-labels do not restore security labels\n")); - printf(_(" --no-tablespaces do not restore tablespace assignments\n")); - printf(_(" --section=SECTION restore named section (pre-data, data, or post-data)\n")); + printf(_(" -a, --data-only restore only the data, no schema\n")); + printf(_(" -c, --clean clean (drop) database objects before recreating\n")); + printf(_(" -C, --create create the target database\n")); + printf(_(" -e, --exit-on-error exit on error, default is to continue\n")); + printf(_(" -I, --index=NAME restore named index\n")); + printf(_(" -j, --jobs=NUM use this many parallel jobs to restore\n")); + printf(_(" -L, --use-list=FILENAME use table of contents from this file for\n" + " selecting/ordering output\n")); + printf(_(" -n, --schema=NAME restore only objects in this schema\n")); + printf(_(" -O, --no-owner skip restoration of object ownership\n")); + printf(_(" -P, --function=NAME(args) restore named function\n")); + printf(_(" -s, --schema-only restore only the schema, no data\n")); + printf(_(" -S, --superuser=NAME superuser user name to use for disabling triggers\n")); + printf(_(" -t, --table=NAME restore named table\n")); + printf(_(" -T, --trigger=NAME restore named trigger\n")); + printf(_(" -x, --no-privileges skip restoration of access privileges (grant/revoke)\n")); + printf(_(" -1, --single-transaction restore as a single transaction\n")); + printf(_(" --disable-triggers disable triggers during data-only restore\n")); + printf(_(" --no-data-for-failed-tables do not restore data of tables that could not be\n" + " created\n")); + printf(_(" --no-security-labels do not restore security labels\n")); + printf(_(" --no-tablespaces do not restore tablespace assignments\n")); + printf(_(" --section=SECTION restore named section (pre-data, data, or post-data)\n")); printf(_(" --use-set-session-authorization\n" - " use SET SESSION AUTHORIZATION commands instead of\n" - " ALTER OWNER commands to set ownership\n")); + " use SET SESSION AUTHORIZATION commands instead of\n" + " ALTER OWNER commands to set ownership\n")); printf(_("\nConnection options:\n")); printf(_(" -h, --host=HOSTNAME database server host or socket directory\n")); diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c index a3cd37e37f..8e2a2530b8 100644 --- a/src/bin/pg_resetxlog/pg_resetxlog.c +++ b/src/bin/pg_resetxlog/pg_resetxlog.c @@ -1028,15 +1028,15 @@ usage(void) printf(_("%s resets the PostgreSQL transaction log.\n\n"), progname); printf(_("Usage:\n %s [OPTION]... DATADIR\n\n"), progname); printf(_("Options:\n")); - printf(_(" -e XIDEPOCH set next transaction ID epoch\n")); - printf(_(" -f force update to be done\n")); - printf(_(" -l TLI,FILE,SEG force minimum WAL starting location for new transaction log\n")); - printf(_(" -m XID set next multitransaction ID\n")); - printf(_(" -n no update, just show extracted control values (for testing)\n")); - printf(_(" -o OID set next OID\n")); - printf(_(" -O OFFSET set next multitransaction offset\n")); - printf(_(" -x XID set next transaction ID\n")); - printf(_(" --help show this help, then exit\n")); - printf(_(" --version output version information, then exit\n")); + printf(_(" -e XIDEPOCH set next transaction ID epoch\n")); + printf(_(" -f force update to be done\n")); + printf(_(" -l TLI,FILE,SEG force minimum WAL starting location for new transaction log\n")); + printf(_(" -m XID set next multitransaction ID\n")); + printf(_(" -n no update, just show extracted control values (for testing)\n")); + printf(_(" -o OID set next OID\n")); + printf(_(" -O OFFSET set next multitransaction offset\n")); + printf(_(" -x XID set next transaction ID\n")); + printf(_(" --help show this help, then exit\n")); + printf(_(" --version output version information, then exit\n")); printf(_("\nReport bugs to .\n")); } -- 2.40.0