X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fdelete.c;h=321f0a308532e509af1f6a2e8001a49bd9a56fd8;hb=35f5b4881520894420b479eb09bd2a50d1a91726;hp=a18f59845fc3d4ee91cfec353e526d64f5326376;hpb=7347b4f5d51c15bb19637ea52e9bf7dff832cc52;p=chaz%2Ftar diff --git a/src/delete.c b/src/delete.c index a18f598..321f0a3 100644 --- a/src/delete.c +++ b/src/delete.c @@ -15,7 +15,7 @@ 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 @@ -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 (); }