X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Ftar;a=blobdiff_plain;f=src%2Fcompare.c;h=d29cfdd4822f683dec5c7dfb8dc01544c62330ce;hp=185a61a35ef78b33c86b5f9e19090560f8703fc9;hb=45ccda119355a1087450039a250359c1d0de0d08;hpb=d88b2a613f4b1a5554e8c34c8f75b91abff5f0e9
diff --git a/src/compare.c b/src/compare.c
index 185a61a..d29cfdd 100644
--- a/src/compare.c
+++ b/src/compare.c
@@ -1,23 +1,24 @@
/* Diff files from a tar archive.
- Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001,
- 2003, 2004, 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+ Copyright 1988, 1992-1994, 1996-1997, 1999-2001, 2003-2007,
+ 2009-2010, 2012-2014 Free Software Foundation, Inc.
- Written by John Gilmore, on 1987-04-30.
+ This file is part of GNU tar.
- 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
- Free Software Foundation; either version 3, or (at your option) any later
- version.
+ GNU tar is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- Public License for more details.
+ GNU tar is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- 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.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+
+ Written by John Gilmore, on 1987-04-30. */
#include
#include
@@ -80,7 +81,7 @@ process_noop (size_t size __attribute__ ((unused)),
static int
process_rawdata (size_t bytes, char *buffer)
{
- size_t status = safe_read (diff_handle, diff_buffer, bytes);
+ size_t status = blocking_read (diff_handle, diff_buffer, bytes);
if (status != bytes)
{
@@ -362,18 +363,6 @@ static void
diff_dumpdir (struct tar_stat_info *dir)
{
const char *dumpdir_buffer;
- dev_t dev = 0;
- struct stat stat_data;
-
- if (deref_stat (dir->file_name, &stat_data) != 0)
- {
- if (errno == ENOENT)
- stat_warn (dir->file_name);
- else
- stat_error (dir->file_name);
- }
- else
- dev = stat_data.st_dev;
if (dir->fd == 0)
{
@@ -382,7 +371,10 @@ diff_dumpdir (struct tar_stat_info *dir)
if (fd < 0)
diag = open_diag;
else if (fstat (fd, &dir->stat))
- diag = stat_diag;
+ {
+ diag = stat_diag;
+ close (fd);
+ }
else
dir->fd = fd;
if (diag)
@@ -390,7 +382,7 @@ diff_dumpdir (struct tar_stat_info *dir)
file_removed_diag (dir->orig_file_name, false, diag);
return;
}
- }
+ }
dumpdir_buffer = directory_contents (scan_directory (dir));
if (dumpdir_buffer)
@@ -426,7 +418,9 @@ diff_multivol (void)
}
offset = OFF_FROM_HEADER (current_header->oldgnu_header.offset);
- if (stat_data.st_size != current_stat_info.stat.st_size + offset)
+ if (offset < 0
+ || INT_ADD_OVERFLOW (current_stat_info.stat.st_size, offset)
+ || stat_data.st_size != current_stat_info.stat.st_size + offset)
{
report_difference (¤t_stat_info, _("Size differs"));
skip_member ();
@@ -448,10 +442,9 @@ diff_multivol (void)
{
seek_error_details (current_stat_info.file_name, offset);
report_difference (¤t_stat_info, NULL);
- return;
}
-
- read_and_process (¤t_stat_info, process_rawdata);
+ else
+ read_and_process (¤t_stat_info, process_rawdata);
status = close (fd);
if (status != 0)
@@ -462,7 +455,7 @@ diff_multivol (void)
void
diff_archive (void)
{
-
+
set_next_block_after (current_header);
/* Print the block from current_header and current_stat_info. */
@@ -477,7 +470,7 @@ diff_archive (void)
switch (current_header->header.typeflag)
{
default:
- ERROR ((0, 0, _("%s: Unknown file type `%c', diffed as normal file"),
+ ERROR ((0, 0, _("%s: Unknown file type '%c', diffed as normal file"),
quotearg_colon (current_stat_info.file_name),
current_header->header.typeflag));
/* Fall through. */
@@ -547,7 +540,7 @@ verify_volume (void)
_("Verification may fail to locate original files.")));
clear_directory_table ();
-
+
if (!diff_buffer)
diff_init ();