diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2018-08-30 06:31:05 -0300 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2018-08-30 06:35:55 -0300 |
| commit | a846e6d0239d24fe9a95c7b12e1905e20f8fdcf0 (patch) | |
| tree | c2edfd002b3d92fa35688dcc658a3e8fb683051b /src | |
| parent | 4db226b756529ea4d357a4af507c6ed2c31415c0 (diff) | |
| download | postgresql-a846e6d0239d24fe9a95c7b12e1905e20f8fdcf0.tar.gz postgresql-a846e6d0239d24fe9a95c7b12e1905e20f8fdcf0.zip | |
pg_verify_checksums: rename -d to --verbose
Using -d is odd, because we normally reserve that for a database
argument, so rename it to -v and add long version --verbose.
Also, reduce it to emit one line per file checked rather than one line
per block.
Per a complaint from Michael Banck.
Author: Yugo Nagata <nagata@sraoss.co.jp>
Reviewed-by: Michael Banck <michael.banck@credativ.de>
Discussion: https://postgr.es/m/20180827113411.GA22768@nighthawk.caipicrew.dd-dns.de
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_verify_checksums/pg_verify_checksums.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/bin/pg_verify_checksums/pg_verify_checksums.c b/src/bin/pg_verify_checksums/pg_verify_checksums.c index 938b92282a7..a9412365636 100644 --- a/src/bin/pg_verify_checksums/pg_verify_checksums.c +++ b/src/bin/pg_verify_checksums/pg_verify_checksums.c @@ -31,7 +31,7 @@ static int64 badblocks = 0; static ControlFileData *ControlFile; static char *only_relfilenode = NULL; -static bool debug = false; +static bool verbose = false; static const char *progname; @@ -43,7 +43,7 @@ usage() printf(_(" %s [OPTION]... [DATADIR]\n"), progname); printf(_("\nOptions:\n")); printf(_(" [-D, --pgdata=]DATADIR data directory\n")); - printf(_(" -d debug output, list all checked blocks\n")); + printf(_(" -v, --verbose output verbose messages\n")); printf(_(" -r RELFILENODE check only relation with specified relfilenode\n")); printf(_(" -V, --version output version information, then exit\n")); printf(_(" -?, --help show this help, then exit\n")); @@ -120,11 +120,12 @@ scan_file(char *fn, int segmentno) progname, fn, blockno, csum, header->pd_checksum); badblocks++; } - else if (debug) - fprintf(stderr, _("%s: checksum verified in file \"%s\", block %d: %X\n"), - progname, fn, blockno, csum); } + if (verbose) + fprintf(stderr, + _("%s: checksums verified in file \"%s\"\n"), progname, fn); + close(f); } @@ -208,6 +209,7 @@ main(int argc, char *argv[]) { static struct option long_options[] = { {"pgdata", required_argument, NULL, 'D'}, + {"verbose", no_argument, NULL, 'v'}, {NULL, 0, NULL, 0} }; @@ -234,12 +236,12 @@ main(int argc, char *argv[]) } } - while ((c = getopt_long(argc, argv, "D:r:d", long_options, &option_index)) != -1) + while ((c = getopt_long(argc, argv, "D:r:v", long_options, &option_index)) != -1) { switch (c) { - case 'd': - debug = true; + case 'v': + verbose = true; break; case 'D': DataDir = optarg; |