Silenced the failure to call fgetflags() when comparing an entry which has no ext2...

diff --git a/CHANGES b/CHANGES
index 7494087cb824ee6cb4ea611718037d817a0a8dc5..f56eb80cda6b53228074577cf2c7092dc5792102 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.265 2005/01/13 15:41:05 stelian Exp $
+$Id: CHANGES,v 1.266 2005/01/14 13:01:32 stelian Exp $

 
 Changes between versions 0.4b38 and 0.4b39 (released ???????????????)
 =====================================================================
 
 Changes between versions 0.4b38 and 0.4b39 (released ???????????????)
 =====================================================================


@@ -14,6 +14,9 @@ Changes between versions 0.4b38 and 0.4b39 (released ???????????????)
        read only and preventing the corefile generation. Thanks
        to Kenneth Porter <shiva@sewingwitch.com> for the bug report.
 
        read only and preventing the corefile generation. Thanks
        to Kenneth Porter <shiva@sewingwitch.com> for the bug report.
 

+3.     Silenced the failure to call fgetflags() when comparing an
+       entry which has no ext2 attributes (as in lsattr()).
+

 Changes between versions 0.4b37 and 0.4b38 (released January 7, 2005)
 =====================================================================
 
 Changes between versions 0.4b37 and 0.4b38 (released January 7, 2005)
 =====================================================================
 

diff --git a/restore/dirs.c b/restore/dirs.c
index 423fe6ea9e428fbe286b173dd34215a12530514b..c9a9482cea38f2e47d909ba324283891b75a9ee1 100644 (file)
--- a/restore/dirs.c
+++ b/restore/dirs.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-       "$Id: dirs.c,v 1.29 2004/12/15 11:00:01 stelian Exp $";
+       "$Id: dirs.c,v 1.30 2005/01/14 13:01:34 stelian Exp $";

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


@@ -777,8 +777,10 @@ comparedirmodes(void)
                        }
 #ifdef __linux__
                        if (lgetflags(cp, &newflags) < 0) {
                        }
 #ifdef __linux__
                        if (lgetflags(cp, &newflags) < 0) {

-                               warn("%s: lgetflags failed", cp);
-                               do_compare_error;
+                               if (node.flags != 0) {
+                                       warn("%s: lgetflags failed", cp);
+                                       do_compare_error;
+                               }

                        }
                        else {
                                if (newflags != node.flags) {
                        }
                        else {
                                if (newflags != node.flags) {

diff --git a/restore/tape.c b/restore/tape.c
index aa0dbd7021a711c2192da6c4646fcb64dc7f6993..c4c50c0cc750d5af689358a9052e611ccf95e740 100644 (file)
--- a/restore/tape.c
+++ b/restore/tape.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-       "$Id: tape.c,v 1.84 2004/12/15 11:00:01 stelian Exp $";
+       "$Id: tape.c,v 1.85 2005/01/14 13:01:34 stelian Exp $";

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


@@ -1678,8 +1678,10 @@ comparefile(char *name)
        }
 #ifdef  __linux__
        if (lgetflags(name, &newflags) < 0) {
        }
 #ifdef  __linux__
        if (lgetflags(name, &newflags) < 0) {

-               warn("%s: lgetflags failed", name);
-               do_compare_error;
+               if (flags != 0) {
+                       warn("%s: lgetflags failed", name);
+                       do_compare_error;
+               }

        }
        else {
                if (newflags != flags) {
        }
        else {
                if (newflags != flags) {