diff options
| author | Robert Haas | 2024-04-26 12:42:42 +0000 |
|---|---|---|
| committer | Robert Haas | 2024-04-26 12:42:42 +0000 |
| commit | 1713e3d6cd393fcc1d4873e75c7fa1f6c7023d75 (patch) | |
| tree | de3468fa317270007fdae6a59e0a2b415d41f603 /src/bin/pg_combinebackup/pg_combinebackup.c | |
| parent | 205db0114e03496f1d6febf276374900b6314e67 (diff) | |
Minor fixes to pg_combinebackup and its documentation.
The --tablespace-mapping option was specified with required_argument
rather than no_argument, which is wrong. Since the actual argument
string passed to getopt_long() included "T:", the single-character
form of the option still worked, but the long form did not. Repair.
The call to getopt_long() erroneously included "P", which doesn't
correspond to any supported option. Remove.
The help message used "do not" in one place and "don't" in another.
Standardize on "do not".
The documentation erroneously stated that the tablespace mappings
would be applied relative to the pathnames in the first backup
specified on the command line, rather than the final one. Fix.
Thanks to Tomas Vondra and Daniel Gustafsson for alerting me to
these mistakes.
Discussion: http://postgr.es/m/CA+TgmoYFznwwaZhHSF1Ze7JeyBv-1yOoSrucKMw37WpF=7RP8g@mail.gmail.com
Diffstat (limited to 'src/bin/pg_combinebackup/pg_combinebackup.c')
| -rw-r--r-- | src/bin/pg_combinebackup/pg_combinebackup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bin/pg_combinebackup/pg_combinebackup.c b/src/bin/pg_combinebackup/pg_combinebackup.c index 232ba5b0697..027a16a26ca 100644 --- a/src/bin/pg_combinebackup/pg_combinebackup.c +++ b/src/bin/pg_combinebackup/pg_combinebackup.c @@ -126,7 +126,7 @@ main(int argc, char *argv[]) {"dry-run", no_argument, NULL, 'n'}, {"no-sync", no_argument, NULL, 'N'}, {"output", required_argument, NULL, 'o'}, - {"tablespace-mapping", no_argument, NULL, 'T'}, + {"tablespace-mapping", required_argument, NULL, 'T'}, {"manifest-checksums", required_argument, NULL, 1}, {"no-manifest", no_argument, NULL, 2}, {"sync-method", required_argument, NULL, 3}, @@ -163,7 +163,7 @@ main(int argc, char *argv[]) opt.copy_method = COPY_METHOD_COPY; /* process command-line options */ - while ((c = getopt_long(argc, argv, "dnNPo:T:", + while ((c = getopt_long(argc, argv, "dnNo:T:", long_options, &optindex)) != -1) { switch (c) @@ -749,7 +749,7 @@ help(const char *progname) printf(_(" %s [OPTION]... DIRECTORY...\n"), progname); printf(_("\nOptions:\n")); printf(_(" -d, --debug generate lots of debugging output\n")); - printf(_(" -n, --dry-run don't actually do anything\n")); + printf(_(" -n, --dry-run do not actually do anything\n")); printf(_(" -N, --no-sync do not wait for changes to be written safely to disk\n")); printf(_(" -o, --output output directory\n")); printf(_(" -T, --tablespace-mapping=OLDDIR=NEWDIR\n" |