Commit22b743b

committed

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

I updated the docs and usage blurp, but forgot to commit the code changesrequired.Spotted by Michael Paquier.

1 parent85bb81d commit22b743bCopy full SHA for 22b743b

File tree

+24

-5

lines changed

+24

-5

lines changed

Lines changed: 24 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ main(int argc, char *argv[])`
`90`	`90`	`ControlFileDataControlFile;`
`91`	`91`	`intfd;`
`92`	`92`	`charControlFilePath[MAXPGPATH];`
`93`		`-char*DataDir;`
	`93`	`+char*DataDir=NULL;`
`94`	`94`	`pg_crc32crc;`
`95`	`95`	`time_ttime_tmp;`
`96`	`96`	`charpgctime_str[128];`
`@@ -100,6 +100,7 @@ main(int argc, char *argv[])`
`100`	`100`	`constchar*progname;`
`101`	`101`	`XLogSegNosegno;`
`102`	`102`	`charxlogfilename[MAXFNAMELEN];`
	`103`	`+intc;`
`103`	`104`
`104`	`105`	`set_pglocale_pgservice(argv[0],PG_TEXTDOMAIN("pg_controldata"));`
`105`	`106`
`@@ -119,10 +120,28 @@ main(int argc, char *argv[])`
`119`	`120`	`}`
`120`	`121`	`}`
`121`	`122`
`122`		`-if (argc>1)`
`123`		`-DataDir=argv[1];`
`124`		`-else`
`125`		`-DataDir=getenv("PGDATA");`
	`123`	`+while ((c=getopt(argc,argv,"D:"))!=-1)`
	`124`	`+{`
	`125`	`+switch (c)`
	`126`	`+{`
	`127`	`+case'D':`
	`128`	`+DataDir=optarg;`
	`129`	`+break;`
	`130`	`+`
	`131`	`+default:`
	`132`	`+fprintf(stderr,_("Try \"%s --help\" for more information.\n"),progname);`
	`133`	`+exit(1);`
	`134`	`+}`
	`135`	`+}`
	`136`	`+`
	`137`	`+if (DataDir==NULL)`
	`138`	`+{`
	`139`	`+if (optind<argc)`
	`140`	`+DataDir=argv[optind++];`
	`141`	`+else`
	`142`	`+DataDir=getenv("PGDATA");`
	`143`	`+}`
	`144`	`+`
`126`	`145`	`if (DataDir==NULL)`
`127`	`146`	`{`
`128`	`147`	`fprintf(stderr,_("%s: no data directory specified\n"),progname);`

Comments

(0)