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

Changes of 6-Sep-02 broke pg_restore's ability to recognize tar-format

Browse Source 
files.  Fix it.
This commit is contained in:
Tom Lane 2003-02-01 19:29:16 +00:00
parent 21166170c8
commit 330b4e4215
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/pg_dump/pg_backup_archiver.h
View File

@ -17,7 +17,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.h,v 1.49 2002/10/25 01:33:17 momjian Exp $ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.h,v 1.50 2003/02/01 19:29:16 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -309,7 +309,7 @@ extern void InitArchiveFmt_Files(ArchiveHandle *AH);
extern void InitArchiveFmt_Null(ArchiveHandle *AH); extern void InitArchiveFmt_Null(ArchiveHandle *AH);
extern void InitArchiveFmt_Tar(ArchiveHandle *AH); extern void InitArchiveFmt_Tar(ArchiveHandle *AH);
extern int isValidTarHeader(char *header); extern bool isValidTarHeader(char *header);
extern OutputContext SetOutput(ArchiveHandle *AH, char *filename, int compression); extern OutputContext SetOutput(ArchiveHandle *AH, char *filename, int compression);
extern void ResetOutput(ArchiveHandle *AH, OutputContext savedContext); extern void ResetOutput(ArchiveHandle *AH, OutputContext savedContext);

16
src/bin/pg_dump/pg_backup_tar.c
View File

@ -16,7 +16,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.33 2003/01/10 23:49:06 tgl Exp $ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.34 2003/02/01 19:29:16 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -981,7 +981,7 @@ _tarChecksum(char *header)
return sum + 256; /* Assume 8 blanks in checksum field */ return sum + 256; /* Assume 8 blanks in checksum field */
} }
int bool
isValidTarHeader(char *header) isValidTarHeader(char *header)
{ {
int sum; int sum;
@ -989,7 +989,17 @@ isValidTarHeader(char *header)
sscanf(&header[148], "%8o", &sum); sscanf(&header[148], "%8o", &sum);
return (sum == chk && strncmp(&header[257], "ustar ", 7) == 0); if (sum != chk)
return false;
/* POSIX format */
if (strncmp(&header[257], "ustar00", 7) == 0)
return true;
/* older format */
if (strncmp(&header[257], "ustar ", 7) == 0)
return true;
return false;
} }
/* Given the member, write the TAR header & copy the file */ /* Given the member, write the TAR header & copy the file */