mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Oops, the commit accept pg_controldata -D datadir missed code changes.

Browse Source 
I updated the docs and usage blurp, but forgot to commit the code changes
required.

Spotted by Michael Paquier.
This commit is contained in:
Heikki Linnakangas 2014-10-24 18:55:33 +03:00
parent 85bb81de53
commit 22b743b2ca
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/bin/pg_controldata/pg_controldata.c
View File

@ -90,7 +90,7 @@ main(int argc, char *argv[])
ControlFileData ControlFile; ControlFileData ControlFile;
int fd; int fd;
char ControlFilePath[MAXPGPATH]; char ControlFilePath[MAXPGPATH];
char *DataDir; char *DataDir = NULL;
pg_crc32 crc; pg_crc32 crc;
time_t time_tmp; time_t time_tmp;
char pgctime_str[128]; char pgctime_str[128];
@ -100,6 +100,7 @@ main(int argc, char *argv[])
const char *progname; const char *progname;
XLogSegNo segno; XLogSegNo segno;
char xlogfilename[MAXFNAMELEN]; char xlogfilename[MAXFNAMELEN];
int c;
set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_controldata")); set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_controldata"));
@ -119,10 +120,28 @@ main(int argc, char *argv[])
} }
} }
if (argc > 1) while ((c = getopt(argc, argv, "D:")) != -1)
DataDir = argv[1]; {
else switch (c)
DataDir = getenv("PGDATA"); {
case 'D':
DataDir = optarg;
break;
default:
fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
}
}
if (DataDir == NULL)
{
if (optind < argc)
DataDir = argv[optind++];
else
DataDir = getenv("PGDATA");
}
if (DataDir == NULL) if (DataDir == NULL)
{ {
fprintf(stderr, _("%s: no data directory specified\n"), progname); fprintf(stderr, _("%s: no data directory specified\n"), progname);