X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fcompare.c;h=407fd4016952a7eed858092f19f257c5e82d50fc;hb=cd7bdd4076ca154575bbef85eb2157e59befcfe2;hp=639e935538cffab1c4989943234869e040bbc189;hpb=03858cf583ce299b836d8a848967ce290a6bf303;p=chaz%2Ftar
diff --git a/src/compare.c b/src/compare.c
index 639e935..407fd40 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-2013 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
@@ -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)
{
@@ -426,7 +415,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 ();
@@ -477,7 +468,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. */