diff options
| -rw-r--r-- | src/bin/pg_dump/pg_backup_tar.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c index fbbe00b6af5..b50919f3f5a 100644 --- a/src/bin/pg_dump/pg_backup_tar.c +++ b/src/bin/pg_dump/pg_backup_tar.c @@ -16,7 +16,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.49.2.2 2006/06/27 02:56:46 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.49.2.3 2006/11/01 15:59:31 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -701,6 +701,7 @@ _LoadBlobs(ArchiveHandle *AH, RestoreOptions *ropt) lclContext *ctx = (lclContext *) AH->formatData; TAR_MEMBER *th; size_t cnt; + bool foundBlob = false; char buf[4096]; StartRestoreBlobs(AH); @@ -725,10 +726,22 @@ _LoadBlobs(ArchiveHandle *AH, RestoreOptions *ropt) ahwrite(buf, 1, cnt, AH); } EndRestoreBlob(AH, oid); + foundBlob = true; } + tarClose(AH, th); + } + else + { + tarClose(AH, th); + /* + * Once we have found the first blob, stop at the first + * non-blob entry (which will be 'blobs.toc'). This coding would + * eat all the rest of the archive if there are no blobs ... but + * this function shouldn't be called at all in that case. + */ + if (foundBlob) + break; } - - tarClose(AH, th); th = tarOpen(AH, NULL, 'r'); } |