1616 *
1717 *
1818 * IDENTIFICATION
19- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.59 2007/08/06 01:38:15 tgl Exp $
19+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.60 2007/08/29 16:31:36 tgl Exp $
2020 *
2121 *-------------------------------------------------------------------------
2222 */
@@ -1059,36 +1059,38 @@ _tarAddFile(ArchiveHandle *AH, TAR_MEMBER *th)
10591059 */
10601060 fseeko (tmp , 0 , SEEK_END );
10611061 th -> fileLen = ftello (tmp );
1062+ fseeko (tmp , 0 , SEEK_SET );
10621063
10631064 /*
1064- * Some compilers with throw a warning knowing this test can never be true
1065- * because pgoff_t can't exceed the compared maximum.
1065+ * Some compilers will throw a warning knowing this test can never be true
1066+ * because pgoff_t can't exceed the compared maximum on their platform .
10661067 */
10671068 if (th -> fileLen > MAX_TAR_MEMBER_FILELEN )
10681069 die_horribly (AH , modulename , "archive member too large for tar format\n" );
1069- fseeko (tmp , 0 , SEEK_SET );
10701070
10711071 _tarWriteHeader (th );
10721072
1073- while ((cnt = fread (& buf [ 0 ] , 1 , 32767 , tmp )) > 0 )
1073+ while ((cnt = fread (buf , 1 , sizeof ( buf ) , tmp )) > 0 )
10741074 {
1075- res = fwrite (& buf [ 0 ] , 1 , cnt , th -> tarFH );
1075+ res = fwrite (buf , 1 , cnt , th -> tarFH );
10761076 if (res != cnt )
10771077 die_horribly (AH , modulename ,
1078- "could not write to output file: %s\n" , strerror (errno ));
1078+ "could not write to output file: %s\n" ,
1079+ strerror (errno ));
10791080 len += res ;
10801081 }
10811082
10821083 if (fclose (tmp ) != 0 ) /* This *should* delete it... */
1083- die_horribly (AH , modulename , "could not close temporary file: %s\n" , strerror (errno ));
1084+ die_horribly (AH , modulename , "could not close temporary file: %s\n" ,
1085+ strerror (errno ));
10841086
10851087 if (len != th -> fileLen )
10861088 {
1087- char buf1 [100 ],
1088- buf2 [100 ];
1089+ char buf1 [32 ],
1090+ buf2 [32 ];
10891091
10901092 snprintf (buf1 , sizeof (buf1 ), INT64_FORMAT , (int64 ) len );
1091- snprintf (buf2 , sizeof (buf2 ), INT64_FORMAT , (int64 ) th -> pos );
1093+ snprintf (buf2 , sizeof (buf2 ), INT64_FORMAT , (int64 ) th -> fileLen );
10921094 die_horribly (AH , modulename , "actual file length (%s) does not match expected (%s)\n" ,
10931095 buf1 , buf2 );
10941096 }
0 commit comments