From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Fri, 17 Dec 2004 16:10:36 +0000 (+0000)
Subject: (delete_archive_members): Bugfix: when
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=e6a67c2eb515d3a6cccf2e7226f20ff2904c6094;p=chaz%2Ftar

(delete_archive_members): Bugfix: when
attempting to delete an unexisting member, the last
blocking_factor blocks were zeroed.
---

diff --git a/src/delete.c b/src/delete.c
index a18f598..a986941 100644
--- a/src/delete.c
+++ b/src/delete.c
@@ -359,33 +359,32 @@ delete_archive_members (void)
 		write_record (1);
 	    }
 	}
-    }
 
-  if (logical_status == HEADER_END_OF_FILE)
-    {
-      /* Write the end of tape.  FIXME: we can't use write_eot here,
-	 as it gets confused when the input is at end of file.  */
+      if (logical_status == HEADER_END_OF_FILE)
+	{
+	  /* Write the end of tape.  FIXME: we can't use write_eot here,
+	     as it gets confused when the input is at end of file.  */
 
-      int total_zero_blocks = 0;
+	  int total_zero_blocks = 0;
 
-      do
+	  do
+	    {
+	      int zero_blocks = blocking_factor - new_blocks;
+	      memset (new_record + new_blocks, 0, BLOCKSIZE * zero_blocks);
+	      total_zero_blocks += zero_blocks;
+	      write_record (total_zero_blocks < 2);
+	    }
+	  while (total_zero_blocks < 2);
+	}
+
+      if (! acting_as_filter && ! _isrmt (archive))
 	{
-	  int zero_blocks = blocking_factor - new_blocks;
-	  memset (new_record + new_blocks, 0, BLOCKSIZE * zero_blocks);
-	  total_zero_blocks += zero_blocks;
-	  write_record (total_zero_blocks < 2);
+	  if (sys_truncate (archive))
+	    truncate_warn (archive_name_array[0]);
 	}
-      while (total_zero_blocks < 2);
     }
-
   free (new_record);
 
-  if (! acting_as_filter && ! _isrmt (archive))
-    {
-      if (sys_truncate (archive))
-	truncate_warn (archive_name_array[0]);
-    }
-
   close_archive ();
   names_notfound ();
 }