X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fcompare.c;h=3bd0f07e0d0671409ff2fb556e2f6be4427c22ee;hb=481572c63f5a259f1338a1b74e2dee304bd0df0b;hp=0e99a7201cadf528bf57f1dc866c68c35091146c;hpb=df7b55a8f6354e30e8da62eec7f706df033d0c81;p=chaz%2Ftar
diff --git a/src/compare.c b/src/compare.c
index 0e99a72..3bd0f07 100644
--- a/src/compare.c
+++ b/src/compare.c
@@ -1,24 +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, 2012 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
@@ -371,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)
@@ -439,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)