NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitdfb1e9b

committed

Further pg_dump / ftello improvements

Make ftello error-checking consistent to all calls and remove abit of ftello-related code which has been #if 0'd out since 2001.Note that we are not concerned with the ftello() call undersnprintf() failing as it is just building a string to callexit_horribly() with; printing -1 in such a case is fine.

1 parent5e8e794 commitdfb1e9bCopy full SHA for dfb1e9b

File tree

2 files changed

-16

lines changed

src/bin/pg_dump
- pg_backup_archiver.c
- pg_backup_tar.c

2 files changed

-16

lines changed

`‎src/bin/pg_dump/pg_backup_archiver.c`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3347,9 +3347,8 @@ checkSeek(FILE *fp)`
`3347`	`3347`	`#endif`
`3348`	`3348`
`3349`	`3349`	`/* Check that ftello works on this file */`
`3350`		`-errno=0;`
`3351`	`3350`	`tpos=ftello(fp);`
`3352`		`-if (errno)`
	`3351`	`+if (tpos<0)`
`3353`	`3352`	`return false;`
`3354`	`3353`
`3355`	`3354`	`/*`

`‎src/bin/pg_dump/pg_backup_tar.c`

Lines changed: 3 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -1068,6 +1068,9 @@ _tarAddFile(ArchiveHandle AH, TAR_MEMBER th)`
`1068`	`1068`	`*/`
`1069`	`1069`	`fseeko(tmp,0,SEEK_END);`
`1070`	`1070`	`th->fileLen=ftello(tmp);`
	`1071`	`+if (th->fileLen<0)`
	`1072`	`+exit_horribly(modulename,"could not determine seek position in file: %s\n",`
	`1073`	`+strerror(errno));`
`1071`	`1074`	`fseeko(tmp,0,SEEK_SET);`
`1072`	`1075`
`1073`	`1076`	`/*`
`@@ -1212,20 +1215,6 @@ _tarGetHeader(ArchiveHandle AH, TAR_MEMBER th)`
`1212`	`1215`
`1213`	`1216`	`while (!gotBlock)`
`1214`	`1217`	`{`
`1215`		`-#if0`
`1216`		`-if (ftello(ctx->tarFH)!=ctx->tarFHpos)`
`1217`		`-{`
`1218`		`-charbuf1[100],`
`1219`		`-buf2[100];`
`1220`		`-`
`1221`		`-snprintf(buf1,sizeof(buf1),INT64_FORMAT, (int64)ftello(ctx->tarFH));`
`1222`		`-snprintf(buf2,sizeof(buf2),INT64_FORMAT, (int64)ftello(ctx->tarFHpos));`
`1223`		`-exit_horribly(modulename,`
`1224`		`-"mismatch in actual vs. predicted file position (%s vs. %s)\n",`
`1225`		`-buf1,buf2);`
`1226`		`-}`
`1227`		`-#endif`
`1228`		`-`
`1229`	`1218`	`/* Save the pos for reporting purposes */`
`1230`	`1219`	`hPos=ctx->tarFHpos;`
`1231`	`1220`

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!

Commitdfb1e9b

File tree

2 files changed

2 files changed

`‎src/bin/pg_dump/pg_backup_archiver.c`

`‎src/bin/pg_dump/pg_backup_tar.c`

0 commit comments