git.sur5r.net Git - bacula/bacula/blob - bacula/patches/3.0.2-bug-1366.patch

   1 >From 297ec720cf512a6b5045c962bfb8a2f134ac77b0 Mon Sep 17 00:00:00 2001
   2 From: Marco van Wieringen <mvw@planets.elm.net>
   3 Date: Sun, 6 Sep 2009 18:06:48 +0200
   4 Subject: [PATCH] This patch should fix bug #1366
   5
   6 ---
   7  bacula/src/filed/restore.c |   11 ++++++++++-
   8  1 files changed, 10 insertions(+), 1 deletions(-)
   9
  10 diff --git a/bacula/src/filed/restore.c b/bacula/src/filed/restore.c
  11 index 4400e14..cbb0889 100644
  12 --- a/bacula/src/filed/restore.c
  13 +++ b/bacula/src/filed/restore.c
  14 @@ -367,7 +367,6 @@ void do_restore(JCR *jcr)
  15              rctx.extract = true;
  16              /* FALLTHROUGH */
  17           case CF_CREATED:        /* File created, but there is no content */
  18 -            jcr->JobFiles++;
  19              rctx.fileAddr = 0;
  20              print_ls_output(jcr, attr);
  21
  22 @@ -377,7 +376,17 @@ void do_restore(JCR *jcr)
  23                 if (attr->type == FT_REG && rsrc_len > 0) {
  24                    rctx.extract = true;
  25                 }
  26 +
  27 +               /*
  28 +                * Count the resource forks not as regular files being restored.
  29 +                */
  30 +               if (rsrc_len == 0) {
  31 +                  jcr->JobFiles++;
  32 +               }
  33 +            } else {
  34 +               jcr->JobFiles++;
  35              }
  36 +
  37              if (!rctx.extract) {
  38                 /* set attributes now because file will not be extracted */
  39                 if (jcr->plugin) {
  40 --
  41 1.5.6.5
  42