1
0
mirror of https://github.com/postgres/postgres.git synced 2025-07-09 22:41:56 +03:00

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

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

View File

@ -16,7 +16,7 @@
*
*
* 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 */
}
int
bool
isValidTarHeader(char *header)
{
int sum;
@ -989,7 +989,17 @@ isValidTarHeader(char *header)
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 */