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

Bug fix: ECMA-119 ".." pointed always to the same block as ".".

Browse Source 
Bug fix: iso_write_opts_set_rrip_version_1_10() caused wrong size of
         root record CE,
Stability enhancement: util.c:str2ascii() got a fallback for the case
                       that charset "WCHAR_T" is not available,
Debugging wrapper around iconv*() calls,
Experiments about inode numbers in fs_image,
Experiment to insert obsolete RR entries.
(Sorry for the obfuscation. Most is due to a hard ride on Solaris.
 See macros at the end of libisofs/libisofs.h)
This commit is contained in:
Thomas Schmitt
2009-03-10 14:32:05 +01:00
parent 4f468171ad
commit 4d0063f7e2
4 changed files with 491 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
libisofs/ecma119.c
View File

@ -419,7 +419,11 @@ int ecma119_writer_write_vol_desc(IsoImageWriter *writer)
}
static
#ifdef Libisofs_use_parent_for_dot_doT
int write_one_dir(Ecma119Image *t, Ecma119Node *dir, Ecma119Node *parent)
#else
int write_one_dir(Ecma119Image *t, Ecma119Node *dir)
#endif
{
int ret;
uint8_t buffer[BLOCK_SIZE];
@ -462,7 +466,11 @@ int write_one_dir(Ecma119Image *t, Ecma119Node *dir)
}
}
len = 34 + info.suf_len;
#ifdef Libisofs_use_parent_for_dot_doT
write_one_dir_record(t, parent, 1, buf, 1, &info, 0);
#else
write_one_dir_record(t, dir, 1, buf, 1, &info, 0);
#endif
buf += len;
for (i = 0; i < dir->info.dir->nchildren; i++) {
@ -519,13 +527,24 @@ int write_one_dir(Ecma119Image *t, Ecma119Node *dir)
}
static
#ifdef Libisofs_use_parent_for_dot_doT
/* ts A90309 : todo ? : rename parameter "root" to "dir" */
int write_dirs(Ecma119Image *t, Ecma119Node *root, Ecma119Node *parent)
#else
int write_dirs(Ecma119Image *t, Ecma119Node *root)
#endif
{
int ret;
size_t i;
/* write all directory entries for this dir */
#ifdef Libisofs_use_parent_for_dot_doT
ret = write_one_dir(t, root, parent);
#else
ret = write_one_dir(t, root);
#endif
if (ret < 0) {
return ret;
}
@ -534,7 +553,11 @@ int write_dirs(Ecma119Image *t, Ecma119Node *root)
for (i = 0; i < root->info.dir->nchildren; i++) {
Ecma119Node *child = root->info.dir->children[i];
if (child->type == ECMA119_DIR) {
#ifdef Libisofs_use_parent_for_dot_doT
ret = write_dirs(t, child, root);
#else
ret = write_dirs(t, child);
#endif
if (ret < 0) {
return ret;
}
@ -653,7 +676,11 @@ int ecma119_writer_write_data(IsoImageWriter *writer)
t = writer->target;
/* first of all, we write the directory structure */
#ifdef Libisofs_use_parent_for_dot_doT
ret = write_dirs(t, t->root, t->root);
#else
ret = write_dirs(t, t->root);
#endif
if (ret < 0) {
return ret;
}