Fix "mode file too large" errors when restoring huge backups.

diff --git a/CHANGES b/CHANGES
index 00b92f5866f84c7f04e4719d6a8a18d468755c93..6292674180325f77ab8eca293071bc0f29c85b24 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.286 2007/02/22 20:16:23 stelian Exp $
+$Id: CHANGES,v 1.287 2008/04/17 15:16:47 stelian Exp $

 
 Changes between versions 0.4b41 and 0.4b42 (released xxxxxxxxxxxxxxx)
 =====================================================================
 
 Changes between versions 0.4b41 and 0.4b42 (released xxxxxxxxxxxxxxx)
 =====================================================================


@@ -20,6 +20,10 @@ Changes between versions 0.4b41 and 0.4b42 (released xxxxxxxxxxxxxxx)
 4.     Fix EA set failures when restoring immutable files. Thanks
        to Andrew Kroeger for the patch.
 
 4.     Fix EA set failures when restoring immutable files. Thanks
        to Andrew Kroeger for the patch.
 

+5.     Fix "mode file too large" errors when restoring huge backups.
+       Thanks to Kenneth Porter <shiva@sewingwitch.com> for the bug
+       report.
+

 Changes between versions 0.4b40 and 0.4b41 (released January 2, 2006)
 =====================================================================
 
 Changes between versions 0.4b40 and 0.4b41 (released January 2, 2006)
 =====================================================================
 

diff --git a/restore/dirs.c b/restore/dirs.c
index 509d35fd7822e1d65c891cc249f6830b1ee5f438..2717f9421dc0b2588132e3682a9c9358299df867 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.34 2007/02/22 20:16:23 stelian Exp $";
+       "$Id: dirs.c,v 1.35 2008/04/17 15:16:47 stelian Exp $";

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


@@ -673,7 +673,7 @@ setdirmodes(int flags)
                fprintf(stderr, "directory mode, owner, and times not set\n");
                return;
        }
                fprintf(stderr, "directory mode, owner, and times not set\n");
                return;
        }

-       mf = fopen(modefile, "r");
+       mf = FOPEN(modefile, "r");

        if (mf == NULL) {
                warn("fopen");
                fprintf(stderr, "cannot open mode file %s\n", modefile);
        if (mf == NULL) {
                warn("fopen");
                fprintf(stderr, "cannot open mode file %s\n", modefile);


@@ -747,7 +747,7 @@ comparedirmodes(void)
                fprintf(stderr, "directory mode, owner, and times not set\n");
                return;
        }
                fprintf(stderr, "directory mode, owner, and times not set\n");
                return;
        }

-       mf = fopen(modefile, "r");
+       mf = FOPEN(modefile, "r");

        if (mf == NULL) {
                warn("fopen");
                fprintf(stderr, "cannot open mode file %s\n", modefile);
        if (mf == NULL) {
                warn("fopen");
                fprintf(stderr, "cannot open mode file %s\n", modefile);