From b7573134cb5b72084fd5079d927f196d40dee9e8 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Thu, 2 Aug 2007 19:10:08 +0000 Subject: [PATCH] Fixed broken SUSP handling --- libisofs/ecma119_tree.c | 4 ---- libisofs/susp.c | 6 ++---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/libisofs/ecma119_tree.c b/libisofs/ecma119_tree.c index d31ce6a..63c150d 100644 --- a/libisofs/ecma119_tree.c +++ b/libisofs/ecma119_tree.c @@ -251,10 +251,6 @@ create_symlink(struct ecma119_write_target *t, assert(t && iso && parent && parent->type == ECMA119_DIR); ret = create_ecma119_node(t, parent, (struct iso_tree_node*) iso); - ret->iso_name = iso->node.name ? ((t->iso_level == 1) ? - iso_1_fileid(iso->node.name, t->input_charset) - : iso_2_fileid(iso->node.name, t->input_charset)) - : NULL; ret->type = ECMA119_SYMLINK; ret->info.dest = iso->dest; /* TODO strdup? */ ret->attrib.st_nlink = 1; diff --git a/libisofs/susp.c b/libisofs/susp.c index 5e9889b..f1717d5 100755 --- a/libisofs/susp.c +++ b/libisofs/susp.c @@ -205,10 +205,8 @@ susp_finalize(struct ecma119_write_target *t, struct ecma119_tree_node *dir) assert(dir->type = ECMA119_DIR); - if (dir->info.dir.depth != 1) { - susp_fin_CE(t, dir); - } - + susp_fin_CE(t, dir); + for (i = 0; i < dir->info.dir.nchildren; i++) { if (dir->info.dir.children[i]->type == ECMA119_DIR) susp_finalize(t, dir->info.dir.children[i]);