From: Marco van Wieringen <mvw@planets.elm.net>
Date: Sun, 6 Sep 2009 16:06:48 +0000 (+0200)
Subject: This patch should fix bug #1366
X-Git-Tag: Release-7.0.0~2635^2~8
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c5ff21069a4b1cd245153ded1fba9ed2d6102ec3;p=bacula%2Fbacula

This patch should fix bug #1366

Signed-off-by: Kern Sibbald <kern@sibbald.com>
---

diff --git a/bacula/src/filed/restore.c b/bacula/src/filed/restore.c
index 4400e14015..cbb0889991 100644
--- a/bacula/src/filed/restore.c
+++ b/bacula/src/filed/restore.c
@@ -367,7 +367,6 @@ void do_restore(JCR *jcr)
             rctx.extract = true;
             /* FALLTHROUGH */
          case CF_CREATED:        /* File created, but there is no content */
-            jcr->JobFiles++;
             rctx.fileAddr = 0;
             print_ls_output(jcr, attr);
 
@@ -377,7 +376,17 @@ void do_restore(JCR *jcr)
                if (attr->type == FT_REG && rsrc_len > 0) {
                   rctx.extract = true;
                }
+
+               /*
+                * Count the resource forks not as regular files being restored.
+                */
+               if (rsrc_len == 0) {
+                  jcr->JobFiles++;
+               }
+            } else {
+               jcr->JobFiles++;
             }
+
             if (!rctx.extract) {
                /* set attributes now because file will not be extracted */
                if (jcr->plugin) {