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

tglsfdc · tglsfdc · commit 330b4e42150d · 2003-02-01T19:29:16.000Z
files.  Fix it.
diff --git a/src/bin/pg_dump/pg_backup_archiver.h b/src/bin/pg_dump/pg_backup_archiver.h
@@ -17,7 +17,7 @@
  *
  *
  * 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_Tar(ArchiveHandle *AH);
 
-extern int	isValidTarHeader(char *header);
+extern bool isValidTarHeader(char *header);
 
 extern OutputContext SetOutput(ArchiveHandle *AH, char *filename, int compression);
 extern void ResetOutput(ArchiveHandle *AH, OutputContext savedContext);
diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c
@@ -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,15 +981,25 @@ _tarChecksum(char *header)
 	return sum + 256;			/* Assume 8 blanks in checksum field */
 }
 
-int
+bool
 isValidTarHeader(char *header)
 {
 	int			sum;
 	int			chk = _tarChecksum(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 */

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`*`
`18`	`18`	`*`
`19`	`19`	`* IDENTIFICATION`
`20`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.h,v 1.49 2002/10/25 01:33:17 momjian Exp $`
	`20`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.h,v 1.50 2003/02/01 19:29:16 tgl Exp $`
`21`	`21`	`*`
`22`	`22`	`*-------------------------------------------------------------------------`
`23`	`23`	`*/`
`@@ -309,7 +309,7 @@ extern void InitArchiveFmt_Files(ArchiveHandle *AH);`
`309`	`309`	`extern void InitArchiveFmt_Null(ArchiveHandle *AH);`
`310`	`310`	`extern void InitArchiveFmt_Tar(ArchiveHandle *AH);`
`311`	`311`
`312`		`-extern int isValidTarHeader(char *header);`
	`312`	`+extern bool isValidTarHeader(char *header);`
`313`	`313`
`314`	`314`	`extern OutputContext SetOutput(ArchiveHandle AH, char filename, int compression);`
`315`	`315`	`extern void ResetOutput(ArchiveHandle *AH, OutputContext savedContext);`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*`
`17`	`17`	`*`
`18`	`18`	`* IDENTIFICATION`
`19`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.33 2003/01/10 23:49:06 tgl Exp $`
	`19`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.34 2003/02/01 19:29:16 tgl Exp $`
`20`	`20`	`*`
`21`	`21`	`*-------------------------------------------------------------------------`
`22`	`22`	`*/`
`@@ -981,15 +981,25 @@ _tarChecksum(char *header)`
`981`	`981`	`return sum + 256; /* Assume 8 blanks in checksum field */`
`982`	`982`	`}`
`983`	`983`
`984`		`-int`
	`984`	`+bool`
`985`	`985`	`isValidTarHeader(char *header)`
`986`	`986`	`{`
`987`	`987`	`int sum;`
`988`	`988`	`int chk = _tarChecksum(header);`
`989`	`989`
`990`	`990`	`sscanf(&header[148], "%8o", &sum);`
`991`	`991`
`992`		`- return (sum == chk && strncmp(&header[257], "ustar ", 7) == 0);`
	`992`	`+ if (sum != chk)`
	`993`	`+ return false;`
	`994`	`+`
	`995`	`+ /* POSIX format */`
	`996`	`+ if (strncmp(&header[257], "ustar00", 7) == 0)`
	`997`	`+ return true;`
	`998`	`+ /* older format */`
	`999`	`+ if (strncmp(&header[257], "ustar ", 7) == 0)`
	`1000`	`+ return true;`
	`1001`	`+`
	`1002`	`+ return false;`
`993`	`1003`	`}`
`994`	`1004`
`995`	`1005`	`/* Given the member, write the TAR header & copy the file */`