libburnia/libisofs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mangle file names inside root directory after reorder the tree.

Browse Source
This commit is contained in:
Vreixo Formoso 2007-12-23 17:19:07 +01:00
parent 041858360a
commit 811655a9a1
1 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/ecma119_tree.c
View File

@ -360,7 +360,7 @@ int contains_name(Ecma119Node *dir, const char *name)
* but never under 3 characters. * but never under 3 characters.
*/ */
static static
int mangle_dir(Ecma119Image *img, Ecma119Node *dir, int max_file_len, int mangle_single_dir(Ecma119Image *img, Ecma119Node *dir, int max_file_len,
int max_dir_len) int max_dir_len)
{ {
int i, nchildren; int i, nchildren;
@ -523,23 +523,37 @@ int mangle_dir(Ecma119Image *img, Ecma119Node *dir, int max_file_len,
qsort(children, nchildren, sizeof(void*), cmp_node_name); qsort(children, nchildren, sizeof(void*), cmp_node_name);
} }
return ISO_SUCCESS;
}
static
int mangle_dir(Ecma119Image *img, Ecma119Node *dir, int max_file_len,
int max_dir_len)
{
int ret;
size_t i;
ret = mangle_single_dir(img, dir, max_file_len, max_dir_len);
if (ret < 0) {
return ret;
}
/* recurse */ /* recurse */
for (i = 0; i < nchildren; ++i) { for (i = 0; i < dir->info.dir.nchildren; ++i) {
int ret; if (dir->info.dir.children[i]->type == ECMA119_DIR) {
if (children[i]->type == ECMA119_DIR) { ret = mangle_dir(img, dir->info.dir.children[i],
ret = mangle_dir(img, children[i], max_file_len, max_dir_len); max_file_len, max_dir_len);
if (ret < 0) { if (ret < 0) {
/* error */ /* error */
return ret; return ret;
} }
} }
} }
return ISO_SUCCESS; return ISO_SUCCESS;
} }
static static
int mangle_tree(Ecma119Image *img) int mangle_tree(Ecma119Image *img, int recurse)
{ {
int max_file, max_dir; int max_file, max_dir;
@ -550,7 +564,11 @@ int mangle_tree(Ecma119Image *img)
} else { } else {
max_file = max_dir = 31; max_file = max_dir = 31;
} }
return mangle_dir(img, img->root, max_file, max_dir); if (recurse) {
return mangle_dir(img, img->root, max_file, max_dir);
} else {
return mangle_single_dir(img, img->root, max_file, max_dir);
}
} }
/** /**
@ -711,22 +729,29 @@ int ecma119_tree_create(Ecma119Image *img)
sort_tree(root); sort_tree(root);
iso_msg_debug(img->image, "Mangling names..."); iso_msg_debug(img->image, "Mangling names...");
ret = mangle_tree(img); ret = mangle_tree(img, 1);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
if (img->rockridge && !img->allow_deep_paths) { if (img->rockridge && !img->allow_deep_paths) {
/* reorder the tree, acording to RRIP, 4.1.5 */
reorder_tree(img, img->root, 1, 0);
}
/* /* reorder the tree, acording to RRIP, 4.1.5 */
* TODO ret = reorder_tree(img, img->root, 1, 0);
* - reparent if RR if (ret < 0) {
* This must be done after mangle_tree, as name mangling may increment return ret;
* file name length. After reparent, the root dir must be mangled again }
*/
/*
* and we need to remangle the root directory, as the function
* above could insert new directories into the root.
* Note that recurse = 0, as we don't need to recurse.
*/
ret = mangle_tree(img, 0);
if (ret < 0) {
return ret;
}
}
return ISO_SUCCESS; return ISO_SUCCESS;
} }