Avoid installation glitches on Solaris 8 with Sun C 5.4.

[chaz/tar] / src / delete.c

diff --git a/src/delete.c b/src/delete.c
index a98694175aa4888deeff50a8b6699620db6edde3..3e6adddbf245e68b68ef1787bcb64549e4af3791 100644 (file)
--- a/src/delete.c
+++ b/src/delete.c
@@ -1,7 +1,7 @@
 /* Delete entries from a tar archive.
 
-   Copyright (C) 1988, 1992, 1994, 1996, 1997, 2000, 2001, 2003 Free
-   Software Foundation, Inc.
+   Copyright (C) 1988, 1992, 1994, 1996, 1997, 2000, 2001, 2003, 2004,
+   2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
@@ -15,9 +15,10 @@
 
    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-ioctl.h>
 
 #include "common.h"
 #include <rmt.h>
@@ -33,7 +34,7 @@ extern union block *record_end;
 extern union block *current_block;
 extern union block *recent_long_name;
 extern union block *recent_long_link;
-extern off_t records_read; 
+extern off_t records_read;
 extern off_t records_written;
 
 /* The number of records skipped at the start of the archive, when
@@ -173,7 +174,7 @@ delete_archive_members (void)
          abort ();
 
        case HEADER_SUCCESS:
-         if ((name = name_scan (current_stat_info.file_name)) == NULL)
+         if ((name = name_scan (current_stat_info.file_name, false)) == NULL)
            {
              skip_member ();
              break;
@@ -184,7 +185,7 @@ delete_archive_members (void)
              skip_member ();
              break;
            }
-         
+
          /* Fall through.  */
        case HEADER_SUCCESS_EXTENDED:
          logical_status = status;
@@ -261,9 +262,9 @@ delete_archive_members (void)
          if (current_block == record_end)
            flush_archive ();
          status = read_header (false);
-         
+
          xheader_decode (&current_stat_info);
-         
+
          if (status == HEADER_ZERO_BLOCK && ignore_zeros_option)
            {
              set_next_block_after (current_header);
@@ -284,7 +285,7 @@ delete_archive_members (void)
 
          /* Found another header.  */
 
-         if ((name = name_scan (current_stat_info.file_name)) != NULL)
+         if ((name = name_scan (current_stat_info.file_name, false)) != NULL)
            {
              name->found_count++;
              if (ISFOUND(name))