NotificationsYou must be signed in to change notification settings
Fork28
Star153

Commita6427f1

committed

Unbreak pg_resetxlog -l.

Fujii Masao

1 parent2dfa87b commita6427f1Copy full SHA for a6427f1

File tree

1 file changed

+22

-3

lines changed

src/bin/pg_resetxlog
- pg_resetxlog.c

1 file changed

+22

-3

lines changed

`‎src/bin/pg_resetxlog/pg_resetxlog.c‎`

Lines changed: 22 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -86,9 +86,13 @@ main(int argc, char *argv[])`
`86`	`86`	`Oidset_oid=0;`
`87`	`87`	`MultiXactIdset_mxid=0;`
`88`	`88`	`MultiXactOffsetset_mxoff= (MultiXactOffset)-1;`
`89`		`-uint32minXlogTli=0;`
	`89`	`+uint32minXlogTli=0,`
	`90`	`+minXlogId=0,`
	`91`	`+minXlogSeg=0;`
`90`	`92`	`XLogSegNominXlogSegNo=0;`
`91`	`93`	`char*endptr;`
	`94`	`+char*endptr2;`
	`95`	`+char*endptr3;`
`92`	`96`	`char*DataDir;`
`93`	`97`	`intfd;`
`94`	`98`	`charpath[MAXPGPATH];`
`@@ -200,13 +204,28 @@ main(int argc, char *argv[])`
`200`	`204`	`break;`
`201`	`205`
`202`	`206`	`case'l':`
`203`		`-if (strspn(optarg,"01234567890ABCDEFabcdef")!=24)`
	`207`	`+minXlogTli=strtoul(optarg,&endptr,0);`
	`208`	`+if (endptr==optarg\|\|*endptr!=',')`
`204`	`209`	`{`
`205`	`210`	`fprintf(stderr,_("%s: invalid argument for option -l\n"),progname);`
`206`	`211`	`fprintf(stderr,_("Try \"%s --help\" for more information.\n"),progname);`
`207`	`212`	`exit(1);`
`208`	`213`	`}`
`209`		`-XLogFromFileName(optarg,&minXlogTli,&minXlogSegNo);`
	`214`	`+minXlogId=strtoul(endptr+1,&endptr2,0);`
	`215`	`+if (endptr2==endptr+1\|\|*endptr2!=',')`
	`216`	`+{`
	`217`	`+fprintf(stderr,_("%s: invalid argument for option -l\n"),progname);`
	`218`	`+fprintf(stderr,_("Try \"%s --help\" for more information.\n"),progname);`
	`219`	`+exit(1);`
	`220`	`+}`
	`221`	`+minXlogSeg=strtoul(endptr2+1,&endptr3,0);`
	`222`	`+if (endptr3==endptr2+1\|\|*endptr3!='\0')`
	`223`	`+{`
	`224`	`+fprintf(stderr,_("%s: invalid argument for option -l\n"),progname);`
	`225`	`+fprintf(stderr,_("Try \"%s --help\" for more information.\n"),progname);`
	`226`	`+exit(1);`
	`227`	`+}`
	`228`	`+minXlogSegNo= (uint64)minXlogId*XLogSegmentsPerXLogId+minXlogSeg;`
`210`	`229`	`break;`
`211`	`230`
`212`	`231`	`default:`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commita6427f1

File tree

1 file changed

1 file changed

`‎src/bin/pg_resetxlog/pg_resetxlog.c‎`

0 commit comments