Started merging with cpio into paxutils.

[chaz/tar] / src / delete.c

diff --git a/src/delete.c b/src/delete.c
index b79321ff319b08c3a2d306e4cda2ca3d8eb45189..a18f59845fc3d4ee91cfec353e526d64f5326376 100644 (file)
--- a/src/delete.c
+++ b/src/delete.c
@@ -17,10 +17,10 @@
    with this program; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, 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;
@@ -234,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.  */
 
@@ -262,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)
            {
@@ -383,13 +382,7 @@ delete_archive_members (void)
 
   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)
+      if (sys_truncate (archive))
        truncate_warn (archive_name_array[0]);
     }