Fix toc file to not include extended attributes information.

diff --git a/CHANGES b/CHANGES
index 2a5170561fc69d0702b1d8606371e074540b5641..dbc42d5450085d92cb44441f4004b12e601bb5c3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.279 2005/07/07 09:16:03 stelian Exp $
+$Id: CHANGES,v 1.280 2005/08/20 21:00:47 stelian Exp $

 
 Changes between versions 0.4b40 and 0.4b41 (released ???????????)
 =================================================================
 
 Changes between versions 0.4b40 and 0.4b41 (released ???????????)
 =================================================================


@@ -16,6 +16,9 @@ Changes between versions 0.4b40 and 0.4b41 (released ???????????)
        accessible by the '-H' option of restore, and disable it
        by default.
 
        accessible by the '-H' option of restore, and disable it
        by default.
 

+5.     Fixed dump to not include extended attributes information
+       in the toc (archive) file which confused restore -t.
+

 Changes between versions 0.4b39 and 0.4b40 (released May 2, 2005)
 =================================================================
 
 Changes between versions 0.4b39 and 0.4b40 (released May 2, 2005)
 =================================================================
 

diff --git a/dump/tape.c b/dump/tape.c
index 89f630d278ea3484c4ac8aa8054575a81bcdc7a6..ebee4d89a455ed38bd76193387a944b7dcc72e9f 100644 (file)
--- a/dump/tape.c
+++ b/dump/tape.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-       "$Id: tape.c,v 1.88 2005/03/02 08:46:55 stelian Exp $";
+       "$Id: tape.c,v 1.89 2005/08/20 21:00:48 stelian Exp $";

 #endif /* not lint */
 
 #include <config.h>
 #endif /* not lint */
 
 #include <config.h>


@@ -246,7 +246,7 @@ writerec(const void *dp, int isspcl)
        /* Need to write it to the archive file */
        if (! AfileActive && isspcl && (spcl.c_type == TS_END))
                AfileActive = 1;
        /* Need to write it to the archive file */
        if (! AfileActive && isspcl && (spcl.c_type == TS_END))
                AfileActive = 1;

-       if (AfileActive && Afile >= 0) {
+       if (AfileActive && Afile >= 0 && !(spcl.c_flags & DR_EXTATTRIBUTES)) {

                /* When we dump an inode which is not a directory,
                 * it means we ended the archive contents */
                if (isspcl && (spcl.c_type == TS_INODE) &&
                /* When we dump an inode which is not a directory,
                 * it means we ended the archive contents */
                if (isspcl && (spcl.c_type == TS_INODE) &&