From a2fe1a4100ae16a132fade38490f75217253c6a6 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Wed, 14 Mar 2012 13:50:46 +0100 Subject: [PATCH] Corrected flaws of revision 926. --- libisofs/ecma119_tree.c | 78 ++++++++++++++++++++++++++++++----------- libisofs/ecma119_tree.h | 7 ++++ libisofs/rockridge.c | 14 ++++++-- 3 files changed, 76 insertions(+), 23 deletions(-) diff --git a/libisofs/ecma119_tree.c b/libisofs/ecma119_tree.c index 695b506..e19a47a 100644 --- a/libisofs/ecma119_tree.c +++ b/libisofs/ecma119_tree.c @@ -149,6 +149,21 @@ needs_transl:; } } +int ecma119_is_dedicated_reloc_dir(Ecma119Image *img, Ecma119Node *node) +{ + +#ifdef Libisofs_with_rr_reloc_diR + + if (img->rr_reloc_node == node && + node != img->root && node != img->partition_root && + (img->rr_reloc_flags & 2)) + return 1; + +#endif /* Libisofs_with_rr_reloc_diR */ + + return 0; +} + static int create_ecma119_node(Ecma119Image *img, IsoNode *iso, Ecma119Node **node) { @@ -928,11 +943,16 @@ int reparent(Ecma119Node *child, Ecma119Node *parent) * 1 success, < 0 error */ static -int reorder_tree(Ecma119Image *img, Ecma119Node *dir, int level, int pathlen) +int reorder_tree(Ecma119Image *img, Ecma119Node *dir, + int dir_level, int dir_pathlen) { - int ret; - size_t max_path; - Ecma119Node *reloc; + int ret, level, pathlen, newpathlen; + size_t max_path, i; + Ecma119Node *reloc, *child; + + /* might change by relocation */ + level = dir_level; + pathlen = dir_pathlen; max_path = pathlen + 1 + max_child_name_len(dir); @@ -964,22 +984,34 @@ int reorder_tree(Ecma119Image *img, Ecma119Node *dir, int level, int pathlen) return ret; } - /* - * we are appended to the root's children now, so there is no - * need to recurse (the root will hit us again) - */ - } else { - size_t i; + if (reloc == img->root || reloc == img->partition_root) { + /* + * we are appended to the root's children now, so there is no + * need to recurse (the root will hit us again) + */ + return ISO_SUCCESS; + } - for (i = 0; i < dir->info.dir->nchildren; i++) { - Ecma119Node *child = dir->info.dir->children[i]; - if (child->type == ECMA119_DIR) { - int newpathlen = pathlen + 1 + strlen(child->iso_name); - ret = reorder_tree(img, child, level + 1, newpathlen); - if (ret < 0) { - return ret; - } - } + /* dir is now the relocated Ecma119Node */ + pathlen = 37 + 1; /* The dir name might get longer by mangling */ + level = 2; + if (img->rr_reloc_dir != NULL) { + pathlen += strlen(img->rr_reloc_node->iso_name) + 1; + if(img->rr_reloc_dir[0] != 0) + level = 3; + } + } + + if (ecma119_is_dedicated_reloc_dir(img, (Ecma119Node *) dir)) + return ISO_SUCCESS; + + for (i = 0; i < dir->info.dir->nchildren; i++) { + child = dir->info.dir->children[i]; + if (child->type == ECMA119_DIR) { + newpathlen = pathlen + 1 + strlen(child->iso_name); + ret = reorder_tree(img, child, level + 1, newpathlen); + if (ret < 0) + return ret; } } return ISO_SUCCESS; @@ -1173,7 +1205,9 @@ int ecma119_tree_create(Ecma119Image *img) img->root = root; } - /* >>> ts B20307 : Shouldn't relocation be done here ? */ + /* >>> ts B20307 : Shouldn't relocation be done here ? + <<< relocation needs mangled names + */ iso_msg_debug(img->image->id, "Matching hardlinks..."); ret = match_hardlinks(img, root, 0); @@ -1204,7 +1238,9 @@ int ecma119_tree_create(Ecma119Image *img) * Note that recurse = 0, as we don't need to recurse. */ - /* >>> ts B20307 : Shouldn't one mangle _after_ relocating ? */ + /* >>> ts B20307 : Shouldn't one mangle _after_ relocating ? + <<< relocation needs mangled names for path length calculation + */ #ifdef Libisofs_with_rr_reloc_diR ret = mangle_tree(img, img->rr_reloc_node, 0); diff --git a/libisofs/ecma119_tree.h b/libisofs/ecma119_tree.h index adaa1d6..852c74d 100644 --- a/libisofs/ecma119_tree.h +++ b/libisofs/ecma119_tree.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2007 Vreixo Formoso + * 2012 Thomas Schmitt * * This file is part of the libisofs project; you can redistribute it and/or * modify it under the terms of the GNU General Public License version 2 @@ -96,5 +97,11 @@ void ecma119_node_free(Ecma119Node *node); */ Ecma119Node *ecma119_search_iso_node(Ecma119Image *img, IsoNode *node); +/** + * Tell whether node is a dedicated relocation directory which only contains + * relocated directories. + */ +int ecma119_is_dedicated_reloc_dir(Ecma119Image *img, Ecma119Node *node); + #endif /*LIBISO_ECMA119_TREE_H_*/ diff --git a/libisofs/rockridge.c b/libisofs/rockridge.c index 39e8875..0fb271e 100644 --- a/libisofs/rockridge.c +++ b/libisofs/rockridge.c @@ -1246,7 +1246,17 @@ size_t rrip_calc_len(Ecma119Image *t, Ecma119Node *n, int type, size_t used_up, /* we need to add a RE entry */ su_size += 4; } + +#ifdef Libisofs_with_rr_reloc_diR + + } else if(ecma119_is_dedicated_reloc_dir(t, n) && + (t->rr_reloc_flags & 1)) { + /* The dedicated relocation directory shall be marked by RE */ + su_size += 4; } + +#endif /* Libisofs_with_rr_reloc_diR */ + } else if (n->type == ECMA119_SPECIAL) { if (S_ISBLK(n->node->mode) || S_ISCHR(n->node->mode)) { /* block or char device, we need a PN entry */ @@ -1435,8 +1445,8 @@ int rrip_get_susp_fields(Ecma119Image *t, Ecma119Node *n, int type, #ifdef Libisofs_with_rr_reloc_diR - } else if(t->rr_reloc_node == n && n != t->root && - (t->rr_reloc_flags & 3) == 3) { + } else if(ecma119_is_dedicated_reloc_dir(t, n) && + (t->rr_reloc_flags & 1)) { /* The dedicated relocation directory shall be marked by RE */ ret = rrip_add_RE(t, node, info); if (ret < 0)