X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fdelete.c;h=707b024354f6ffbc928d33cc2d0dfbbb65dc605d;hb=38f08784bc95745e0c5e8308d098c3bc89cc9ba5;hp=8b4c1b225c027860b538997edb0859f47c94fd4b;hpb=08780d289dad01bd13e62c70e6de65b15ab650f4;p=chaz%2Ftar

diff --git a/src/delete.c b/src/delete.c
index 8b4c1b2..707b024 100644
--- a/src/delete.c
+++ b/src/delete.c
@@ -15,12 +15,12 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation, Inc.,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#include "system.h"
+#include <system.h>
 
 #include "common.h"
-#include "rmt.h"
+#include <rmt.h>
 
 static union block *new_record;
 static int new_blocks;
@@ -173,12 +173,18 @@ delete_archive_members (void)
 	  abort ();
 
 	case HEADER_SUCCESS:
-	  if (name = name_scan (current_stat_info.file_name), !name)
+	  if ((name = name_scan (current_stat_info.file_name, false)) == NULL)
 	    {
 	      skip_member ();
 	      break;
 	    }
-	  name->found = 1;
+	  name->found_count++;
+	  if (!ISFOUND(name))
+	    {
+	      skip_member ();
+	      break;
+	    }
+	  
 	  /* Fall through.  */
 	case HEADER_SUCCESS_EXTENDED:
 	  logical_status = status;
@@ -228,7 +234,7 @@ delete_archive_members (void)
   if (logical_status == HEADER_SUCCESS
       || logical_status == HEADER_SUCCESS_EXTENDED)
     {
-      write_archive_to_stdout = 0;
+      write_archive_to_stdout = false;
 
       /* Save away blocks before this one in this record.  */
 
@@ -256,8 +262,7 @@ delete_archive_members (void)
 	    flush_archive ();
 	  status = read_header (false);
 	  
-	  if (extended_header.size)
-	    xheader_decode (&current_stat_info);
+	  xheader_decode (&current_stat_info);
 	  
 	  if (status == HEADER_ZERO_BLOCK && ignore_zeros_option)
 	    {
@@ -279,23 +284,26 @@ delete_archive_members (void)
 
 	  /* Found another header.  */
 
-	  if (name = name_scan (current_stat_info.file_name), name)
+	  if ((name = name_scan (current_stat_info.file_name, false)) != NULL)
 	    {
-	      name->found = 1;
-	    flush_file:
-	      set_next_block_after (current_header);
-	      blocks_to_skip = (current_stat_info.stat.st_size + BLOCKSIZE - 1) / BLOCKSIZE;
-
-	      while (record_end - current_block <= blocks_to_skip)
+	      name->found_count++;
+	      if (ISFOUND(name))
 		{
-		  blocks_to_skip -= (record_end - current_block);
-		  flush_archive ();
+		flush_file:
+		  set_next_block_after (current_header);
+		  blocks_to_skip = (current_stat_info.stat.st_size
+				    + BLOCKSIZE - 1) / BLOCKSIZE;
+
+		  while (record_end - current_block <= blocks_to_skip)
+		    {
+		      blocks_to_skip -= (record_end - current_block);
+		      flush_archive ();
+		    }
+		  current_block += blocks_to_skip;
+		  blocks_to_skip = 0;
+		  continue;
 		}
-	      current_block += blocks_to_skip;
-	      blocks_to_skip = 0;
-	      continue;
 	    }
-
 	  /* Copy header.  */
 
 	  if (extended_header.size)
@@ -351,39 +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
+	    {
+	      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);
+	}
 
-      do
+      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 MSDOS
-      int status = write (archive, "", 0);
-#else
-      off_t pos = lseek (archive, (off_t) 0, SEEK_CUR);
-      int status = pos < 0 ? -1 : ftruncate (archive, pos);
-#endif
-      if (status != 0)
-	truncate_warn (archive_name_array[0]);
-    }
-
   close_archive ();
   names_notfound ();
 }