Big backport from Enterprise

[bacula/bacula] / bacula / src / lib / tree.c

diff --git a/bacula/src/lib/tree.c b/bacula/src/lib/tree.c
index fda5b0a72ca5d5a84cd31d4e1eaccdb4cfd82db7..99baddbccd2c777717f47d3deda982a06dc712ef 100644 (file)
--- a/bacula/src/lib/tree.c
+++ b/bacula/src/lib/tree.c
@@ -1,29 +1,20 @@
 /*
-   Bacula® - The Network Backup Solution
-
-   Copyright (C) 2002-2011 Free Software Foundation Europe e.V.
-
-   The main author of Bacula is Kern Sibbald, with contributions from
-   many others, a complete list can be found in the file AUTHORS.
-   This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version three of the GNU Affero General Public
-   License as published by the Free Software Foundation and included
-   in the file LICENSE.
-
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.
-
-   Bacula® is a registered trademark of Kern Sibbald.
-   The licensor of Bacula is the Free Software Foundation Europe
-   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
-   Switzerland, email:ftf@fsfeurope.org.
+   Bacula(R) - The Network Backup Solution
+
+   Copyright (C) 2000-2017 Kern Sibbald
+
+   The original author of Bacula is Kern Sibbald, with contributions
+   from many others, a complete list can be found in the file AUTHORS.
+
+   You may use this file and others of this release according to the
+   license defined in the LICENSE file, which includes the Affero General
+   Public License, v3.0 ("AGPLv3") and some additional permissions and
+   terms pursuant to its AGPLv3 Section 7.
+
+   This notice must be preserved when any source code is 
+   conveyed and/or propagated.
+
+   Bacula(R) is a registered trademark of Kern Sibbald.
 */
 /*
  * Directory tree build/traverse routines
@@ -36,9 +27,9 @@
 #include "bacula.h"
 #include "findlib/find.h"
 
-#define PAGE_SIZE 4096
+#define B_PAGE_SIZE 4096
 #define MAX_PAGES 2400
-#define MAX_BUF_SIZE (MAX_PAGES * PAGE_SIZE)  /* approx 10MB */
+#define MAX_BUF_SIZE (MAX_PAGES * B_PAGE_SIZE)  /* approx 10MB */
 
 /* Forward referenced subroutines */
 static TREE_NODE *search_and_insert_tree_node(char *fname, int type,
@@ -102,6 +93,8 @@ TREE_ROOT *new_tree(int count)
    root->cached_path = get_pool_memory(PM_FNAME);
    root->type = TN_ROOT;
    root->fname = "";
+   HL_ENTRY* entry = NULL;
+   root->hardlinks.init(entry, &entry->link, 0);
    return root;
 }
 
@@ -172,6 +165,7 @@ void free_tree(TREE_ROOT *root)
    struct s_mem *mem, *rel;
    uint32_t freed_blocks = 0;
 
+   root->hardlinks.destroy();
    for (mem=root->mem; mem; ) {
       rel = mem;
       mem = mem->next;
@@ -192,7 +186,7 @@ void free_tree(TREE_ROOT *root)
 void tree_add_delta_part(TREE_ROOT *root, TREE_NODE *node,
                          JobId_t JobId, int32_t FileIndex)
 {
-   struct delta_list *elt = 
+   struct delta_list *elt =
       (struct delta_list*) tree_alloc(root, sizeof(struct delta_list));
 
    elt->next = node->delta_list;
@@ -334,6 +328,7 @@ static TREE_NODE *search_and_insert_tree_node(char *fname, int type,
    strcpy(node->fname, fname);
    node->parent = parent;
    node->type = type;
+   node->can_access = true;
 
    /* Maintain a linear chain of nodes */
    if (!root->first) {
@@ -386,7 +381,7 @@ TREE_NODE *tree_cwd(char *path, TREE_ROOT *root, TREE_NODE *node)
    /* Handle relative path */
    if (path[0] == '.' && path[1] == '.' && (IsPathSeparator(path[2]) || path[2] == '\0')) {
       TREE_NODE *parent = node->parent ? node->parent : node;
-      if (path[2] == 0) { 
+      if (path[2] == 0) {
          return parent;
       } else {
          return tree_cwd(path+3, root, parent);
@@ -409,6 +404,8 @@ TREE_NODE *tree_relcwd(char *path, TREE_ROOT *root, TREE_NODE *node)
    char *p;
    int len;
    TREE_NODE *cd;
+   char save_char;
+   int match;
 
    if (*path == 0) {
       return node;
@@ -426,10 +423,21 @@ TREE_NODE *tree_relcwd(char *path, TREE_ROOT *root, TREE_NODE *node)
           && strncmp(cd->fname, path, len) == 0) {
          break;
       }
+      /* fnmatch has no len in call so we truncate the string */
+      save_char = path[len];
+      path[len] = 0;
+      match = fnmatch(path, cd->fname, 0) == 0;
+      path[len] = save_char;
+      if (match) {
+         break;
+      }
    }
    if (!cd || (cd->type == TN_FILE && !tree_node_has_child(cd))) {
       return NULL;
    }
+   if (!cd->can_access) {       /* Will display permission denied */
+      return cd;
+   }
    if (!p) {
       Dmsg0(100, "tree_relcwd: no more to lookup. found.\n");
       return cd;