From b43981b3544000a3683e6a53ea1cf8412f09e4d5 Mon Sep 17 00:00:00 2001 From: Stelian Pop Date: Fri, 14 Jan 2005 13:01:32 +0000 Subject: [PATCH] Silenced the failure to call fgetflags() when comparing an entry which has no ext2 attributes (as in lsattr()). --- CHANGES | 5 ++++- restore/dirs.c | 8 +++++--- restore/tape.c | 8 +++++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index 7494087..f56eb80 100644 --- 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 ???????????????) ===================================================================== @@ -14,6 +14,9 @@ Changes between versions 0.4b38 and 0.4b39 (released ???????????????) read only and preventing the corefile generation. Thanks to Kenneth Porter 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) ===================================================================== diff --git a/restore/dirs.c b/restore/dirs.c index 423fe6e..c9a9482 100644 --- a/restore/dirs.c +++ b/restore/dirs.c @@ -42,7 +42,7 @@ #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 @@ -777,8 +777,10 @@ comparedirmodes(void) } #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) { diff --git a/restore/tape.c b/restore/tape.c index aa0dbd7..c4c50c0 100644 --- a/restore/tape.c +++ b/restore/tape.c @@ -42,7 +42,7 @@ #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 @@ -1678,8 +1678,10 @@ comparefile(char *name) } #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) { -- 2.39.5