Browse Source

* NEWS: Update.
* configure.ac: Version 1.19.90
* po/POTFILES.in: Add missing files.
* src/compare.c (verify_volume): Honor --ignore-zeros.
Proposed by Jan-Benedict Glaw.
* tests/shortfile.at (AT_KEYWORDS): Add shortfile0.

Sergey Poznyakoff 17 years ago
parent
commit
7efe3850f6
7 changed files with 44 additions and 9 deletions
  1. 9 0
      ChangeLog
  2. 9 5
      NEWS
  3. 2 2
      configure.ac
  4. 3 0
      lib/.cvsignore
  5. 5 0
      po/POTFILES.in
  6. 15 1
      src/compare.c
  7. 1 1
      tests/shortfile.at

+ 9 - 0
ChangeLog

@@ -1,3 +1,12 @@
+2008-02-08  Sergey Poznyakoff  <[email protected]>
+
+	* NEWS: Update.
+	* configure.ac: Version 1.19.90
+	* po/POTFILES.in: Add missing files.
+	* src/compare.c (verify_volume): Honor --ignore-zeros.
+	Proposed by Jan-Benedict Glaw.
+	* tests/shortfile.at (AT_KEYWORDS): Add shortfile0.
+
 2008-02-07  Sergey Poznyakoff  <[email protected]>
 
 	* NEWS: Update.

+ 9 - 5
NEWS

@@ -1,8 +1,8 @@
-GNU tar NEWS - User visible changes. 2008-02-07
+GNU tar NEWS - User visible changes. 2008-02-08
 Please send GNU tar bug reports to <[email protected]>
 
 
-version 1.19.1 (CVS)
+version 1.19.90 (CVS)
 
 * New option --auto-compress (-a)
 
@@ -22,9 +22,10 @@ they refer to, instead of creating usual hard link members (type '1').
 
 This action allows to specify an action to be executed upon hitting a
 checkpoint.  Recognized actions are: dot, echo (the default),
-echo=string, and sleep=value.  Any number of `--checkpoint-action'
-options can be specified, the actions will be executed in order of
-their appearance in the command line.  
+echo=string, ttyout=string, exec=cmdline, and sleep=value.  Any number
+of `--checkpoint-action' options can be specified, the actions will be
+executed in order of their appearance in the command line.  See
+chapter 3.8 "Checkpoints" for a complete description.
 
 * The --transform option.
 
@@ -38,6 +39,9 @@ Filename transformations are applied to symbolic link targets
 during both creation and extraction.  Tar 1.19 used them only
 during extraction.
 
+For a detailed description, see chapter 6.7 "Modifying File and Member
+Names". 
+
 * Info (end-of-volume) scripts
 
 The value of the blocking factor is made available to info and

+ 2 - 2
configure.ac

@@ -1,7 +1,7 @@
 # Configure template for GNU tar.
 
 # Copyright (C) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 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
@@ -18,7 +18,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 
-AC_INIT([GNU tar], [1.19.1], [[email protected]])
+AC_INIT([GNU tar], [1.19.90], [[email protected]])
 AC_CONFIG_SRCDIR([src/tar.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h:config.hin])

+ 3 - 0
lib/.cvsignore

@@ -71,6 +71,7 @@ fnmatch.in.h
 fnmatch_loop.c
 fpending.c
 fpending.h
+fseeko.c
 fstatat.c
 ftruncate.c
 full-write.c
@@ -104,6 +105,7 @@ inttypes.in.h
 lchown.c
 localcharset.c
 localcharset.h
+lseek.c
 lstat.c
 lstat.h
 malloc.c
@@ -175,6 +177,7 @@ savedir.h
 setenv.c
 setenv.h
 sleep.c
+snprintf.c
 stat-macros.h
 stat-time.h
 stdbool.h

+ 5 - 0
po/POTFILES.in

@@ -22,10 +22,13 @@
 lib/argmatch.c
 lib/argp-help.c
 lib/argp-parse.c
+lib/closeout.c
 lib/error.c
 lib/getopt.c
+lib/obstack.c
 lib/human.c
 lib/obstack.c
+lib/openat-die.c
 lib/paxerror.c
 lib/paxexit.c
 lib/paxnames.c
@@ -34,6 +37,8 @@ lib/rpmatch.c
 lib/rtapelib.c
 lib/xalloc-die.c
 lib/xmalloc.c
+lib/version-etc.c
+lib/xalloc-die.c
 
 rmt/rmt.c
 

+ 15 - 1
src/compare.c

@@ -597,9 +597,23 @@ verify_volume (void)
 			    "VERIFY FAILURE: %d invalid headers detected",
 			    counter), counter));
 	}
-      if (status == HEADER_ZERO_BLOCK || status == HEADER_END_OF_FILE)
+      if (status == HEADER_END_OF_FILE)
 	break;
+      if (status == HEADER_ZERO_BLOCK)
+	{
+	  set_next_block_after (current_header);
+          if (!ignore_zeros_option)
+            {
+	      char buf[UINTMAX_STRSIZE_BOUND];
 
+	      status = read_header (false);
+	      if (status == HEADER_ZERO_BLOCK)
+	        break;
+	      WARN ((0, 0, _("A lone zero block at %s"),
+	  	    STRINGIFY_BIGINT (current_block_ordinal (), buf)));
+            }
+	}
+      
       diff_archive ();
       tar_stat_destroy (&current_stat_info);
     }

+ 1 - 1
tests/shortfile.at

@@ -24,7 +24,7 @@
 #             http://lists.gnu.org/archive/html/bug-tar/2007-08/msg00038.html
 
 AT_SETUP([short input files])
-AT_KEYWORDS([shortfile])
+AT_KEYWORDS([shortfile shortfile0])
 
 AT_TAR_CHECK([
 genfile --length 511 --file foo || exit 5