X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=tar-tree.c;h=673ac66ed6fd37eeeaa8580b2e43f0e2cee91a16;hb=71fb3de0eed70bba1c7e28c8a0a2968efc48b9f3;hp=233a25616e39ee40199d12a75cea76c11246385f;hpb=e99d59ff0bff349ef205cef1076e0354c8130680;p=git.git

diff --git a/tar-tree.c b/tar-tree.c
index 233a2561..673ac66e 100644
--- a/tar-tree.c
+++ b/tar-tree.c
@@ -73,16 +73,13 @@ static char *get_record(void)
  */
 static void write_trailer(void)
 {
-	memset(block + offset, 0, RECORDSIZE);
-	offset += RECORDSIZE;
+	get_record();
 	write_if_needed();
-	memset(block + offset, 0, RECORDSIZE);
-	offset += RECORDSIZE;
+	get_record();
 	write_if_needed();
-	if (offset) {
-		memset(block + offset, 0, BLOCKSIZE - offset);
-		reliable_write(block, BLOCKSIZE);
-		offset = 0;
+	while (offset) {
+		get_record();
+		write_if_needed();
 	}
 }
 
@@ -433,8 +430,8 @@ int main(int argc, char **argv)
 	if (!archive_time)
 		archive_time = time(NULL);
 	if (basedir)
-		write_header("0", TYPEFLAG_DIR, NULL, NULL, basedir, 040755,
-		             NULL, 0);
+		write_header((unsigned char *)"0", TYPEFLAG_DIR, NULL, NULL,
+			basedir, 040755, NULL, 0);
 	traverse_tree(buffer, size, NULL);
 	free(buffer);
 	write_trailer();