[tar/f14/master] sync up tar-1.23-listedincremental.patch with upstream

[Kamil Dudka]

commit 32d04e006f732cf4bc1a79bdaff567238d56009b
Author: Kamil Dudka <kdudka at redhat.com>
Date:   Mon Sep 20 21:42:47 2010 +0200

    sync up tar-1.23-listedincremental.patch with upstream

 tar-1.23-listedincremental.patch |   39 ++++++++++++++++++++++++++-----------
 1 files changed, 27 insertions(+), 12 deletions(-)
---
diff --git a/tar-1.23-listedincremental.patch b/tar-1.23-listedincremental.patch
index 983b73b..0703770 100644
--- a/tar-1.23-listedincremental.patch
+++ b/tar-1.23-listedincremental.patch
@@ -1,18 +1,33 @@
+From efe26f98ec84856025f56673639d6bd520aa2e64 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert at cs.ucla.edu>
+Date: Mon, 20 Sep 2010 11:34:33 -0700
+Subject: [PATCH] tar: do not crash with --listed-incremental
+
+Problem reported by Frantisek Hanzlik in
+<https://bugzilla.redhat.com/635318> via Kamil Dudka in
+<http://lists.gnu.org/archive/html/bug-tar/2010-09/msg00066.html>.
+I don't understand this code either, but Sergey can take a look at
+this patch, and perhaps install a better one, when he has the time.
+* src/incremen.c (append_incremental_renames): Don't actually append
+anything to DIR if DIR is null.
+---
+ src/incremen.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
 diff --git a/src/incremen.c b/src/incremen.c
 index dc880cd..3da1349 100644
 --- a/src/incremen.c
 +++ b/src/incremen.c
-@@ -894,8 +894,11 @@ append_incremental_renames (struct directory *dir)
-   if (obstack_object_size (&stk) != size)
+@@ -891,7 +891,8 @@ append_incremental_renames (struct directory *dir)
+   for (dp = dirhead; dp; dp = dp->next)
+     store_rename (dp, &stk);
+ 
+-  if (obstack_object_size (&stk) != size)
++  /* FIXME: Is this the right thing to do when DIR is null?  */
++  if (dir && obstack_object_size (&stk) != size)
      {
        obstack_1grow (&stk, 0);
--      dumpdir_free (dir->dump);
--      dir->dump = dumpdir_create (obstack_finish (&stk));
-+      if (dir)
-+	{
-+	  dumpdir_free (dir->dump);
-+	  dir->dump = dumpdir_create (obstack_finish (&stk));
-+	}
-     }
-   obstack_free (&stk, NULL);
- }
+       dumpdir_free (dir->dump);
+-- 
+1.7.1
+