From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Wed, 29 Aug 2007 16:31:57 +0000 (+0000)
Subject: Fix aboriginal bug in _tarAddFile(): when complaining that the amount of data
X-Git-Tag: REL8_0_14~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43e398900d179a56f478f903bdde0d3d41265d51;p=thirdparty%2Fpostgresql.git

Fix aboriginal bug in _tarAddFile(): when complaining that the amount of data
read from the temp file didn't match the file length reported by ftello(),
the wrong variable's value was printed, and so the message made no sense.
Clean up a couple other coding infelicities while at it.
---

diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c
index f20fddae6aa..9519b758c31 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.46.4.3 2007/08/06 01:38:40 tgl Exp $
+ *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.46.4.4 2007/08/29 16:31:57 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1020,19 +1020,20 @@ _tarAddFile(ArchiveHandle *AH, TAR_MEMBER *th)
 	 */
 	fseeko(tmp, 0, SEEK_END);
 	th->fileLen = ftello(tmp);
+	fseeko(tmp, 0, SEEK_SET);
+
 	/*
 	 *	Some compilers with throw a warning knowing this test can never be
 	 *	true because off_t can't exceed the compared maximum.
 	 */
 	if (th->fileLen > MAX_TAR_MEMBER_FILELEN)
 		die_horribly(AH, modulename, "archive member too large for tar format\n");
-	fseeko(tmp, 0, SEEK_SET);
 
 	_tarWriteHeader(th);
 
-	while ((cnt = fread(&buf[0], 1, 32767, tmp)) > 0)
+	while ((cnt = fread(buf, 1, sizeof(buf), tmp)) > 0)
 	{
-		res = fwrite(&buf[0], 1, cnt, th->tarFH);
+		res = fwrite(buf, 1, cnt, th->tarFH);
 		if (res != cnt)
 			die_horribly(AH, modulename,
 						 "write error appending to tar archive (wrote %lu, attempted %lu)\n",
@@ -1041,15 +1042,16 @@ _tarAddFile(ArchiveHandle *AH, TAR_MEMBER *th)
 	}
 
 	if (fclose(tmp) != 0)		/* This *should* delete it... */
-		die_horribly(AH, modulename, "could not close tar member: %s\n", strerror(errno));
+		die_horribly(AH, modulename, "could not close tar member: %s\n",
+					 strerror(errno));
 
 	if (len != th->fileLen)
 	{
-		char		buf1[100],
-					buf2[100];
+		char		buf1[32],
+					buf2[32];
 
 		snprintf(buf1, sizeof(buf1), INT64_FORMAT, (int64) len);
-		snprintf(buf2, sizeof(buf2), INT64_FORMAT, (int64) th->pos);
+		snprintf(buf2, sizeof(buf2), INT64_FORMAT, (int64) th->fileLen);
 		die_horribly(AH, modulename, "actual file length (%s) does not match expected (%s)\n",
 					 buf1, buf2);
 	}