database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-31 22:04:40 +03:00
Code Activity

Support long option for --pgdata in pg_verify_checksums

Browse Source 
Author: Daniel Gustafsson <daniel@yesql.se>
This commit is contained in:
Magnus Hagander
2018-06-20 14:33:48 +02:00
parent d73300a286
commit 741ee9dc81
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/src/sgml/ref/pg_verify_checksums.sgml
View File

@ -23,7 +23,7 @@ PostgreSQL documentation
<cmdsynopsis> <cmdsynopsis>
<command>pg_verify_checksums</command> <command>pg_verify_checksums</command>
<arg choice="opt"><replaceable class="parameter">option</replaceable></arg> <arg choice="opt"><replaceable class="parameter">option</replaceable></arg>
<arg choice="opt"><arg choice="opt"><option>-D</option></arg> <replaceable class="parameter">datadir</replaceable></arg> <arg choice="opt"><arg choice="opt"><option>-D</option></arg><arg choice="opt"><option>--pgdata</option></arg> <replaceable class="parameter">datadir</replaceable></arg>
</cmdsynopsis> </cmdsynopsis>
</refsynopsisdiv> </refsynopsisdiv>
@ -45,6 +45,7 @@ PostgreSQL documentation
<varlistentry> <varlistentry>
<term><option>-D <replaceable>directory</replaceable></option></term> <term><option>-D <replaceable>directory</replaceable></option></term>
<term><option>--pgdata=<replaceable>directory</replaceable></option></term>
<listitem> <listitem>
<para> <para>
Specifies the directory where the database cluster is stored. Specifies the directory where the database cluster is stored.

18
src/bin/pg_verify_checksums/pg_verify_checksums.c
View File

@ -41,11 +41,11 @@ usage()
printf(_("Usage:\n")); printf(_("Usage:\n"));
printf(_(" %s [OPTION] [DATADIR]\n"), progname); printf(_(" %s [OPTION] [DATADIR]\n"), progname);
printf(_("\nOptions:\n")); printf(_("\nOptions:\n"));
printf(_(" [-D] DATADIR data directory\n")); printf(_(" [-D, --pgdata=]DATADIR data directory\n"));
printf(_(" -r relfilenode check only relation with specified relfilenode\n")); printf(_(" -r relfilenode check only relation with specified relfilenode\n"));
printf(_(" -d debug output, listing all checked blocks\n")); printf(_(" -d debug output, listing all checked blocks\n"));
printf(_(" -V, --version output version information, then exit\n")); printf(_(" -V, --version output version information, then exit\n"));
printf(_(" -?, --help show this help, then exit\n")); printf(_(" -?, --help show this help, then exit\n"));
printf(_("\nIf no data directory (DATADIR) is specified, " printf(_("\nIf no data directory (DATADIR) is specified, "
"the environment variable PGDATA\nis used.\n\n")); "the environment variable PGDATA\nis used.\n\n"));
printf(_("Report bugs to <pgsql-bugs@postgresql.org>.\n")); printf(_("Report bugs to <pgsql-bugs@postgresql.org>.\n"));
@ -205,8 +205,14 @@ scan_directory(char *basedir, char *subdir)
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
static struct option long_options[] = {
{"pgdata", required_argument, NULL, 'D'},
{NULL, 0, NULL, 0}
};
char *DataDir = NULL; char *DataDir = NULL;
int c; int c;
int option_index;
bool crc_ok; bool crc_ok;
set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_verify_checksums")); set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_verify_checksums"));
@ -227,7 +233,7 @@ main(int argc, char *argv[])
} }
} }
while ((c = getopt(argc, argv, "D:r:d")) != -1) while ((c = getopt_long(argc, argv, "D:r:d", long_options, &option_index)) != -1)
{ {
switch (c) switch (c)
{ {