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

Compute correctly directory size.

Browse Source
This commit is contained in:
Vreixo Formoso 2008-08-19 03:31:50 +02:00
parent 126e60741e
commit ce0949a585
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
libisofs/ecma119.c
View File

@ -117,18 +117,23 @@ size_t calc_dir_size(Ecma119Image *t, Ecma119Node *dir, size_t *ce)
for (i = 0; i < dir->info.dir->nchildren; ++i) { for (i = 0; i < dir->info.dir->nchildren; ++i) {
size_t remaining; size_t remaining;
int section, nsections;
Ecma119Node *child = dir->info.dir->children[i]; Ecma119Node *child = dir->info.dir->children[i];
size_t dirent_len = calc_dirent_len(t, child); size_t dirent_len = calc_dirent_len(t, child);
if (t->rockridge) {
dirent_len += rrip_calc_len(t, child, 0, 255 - dirent_len, &ce_len); nsections = (child->type == ECMA119_FILE) ? child->info.file->nsections : 1;
*ce += ce_len; for (section = 0; section < nsections; ++section) {
} if (t->rockridge && section == nsections - 1) {
remaining = BLOCK_SIZE - (len % BLOCK_SIZE); dirent_len += rrip_calc_len(t, child, 0, 255 - dirent_len, &ce_len);
if (dirent_len > remaining) { *ce += ce_len;
/* child directory entry doesn't fit on block */ }
len += remaining + dirent_len; remaining = BLOCK_SIZE - (len % BLOCK_SIZE);
} else { if (dirent_len > remaining) {
len += dirent_len; /* child directory entry doesn't fit on block */
len += remaining + dirent_len;
} else {
len += dirent_len;
}
} }
} }
@ -459,18 +464,18 @@ int write_one_dir(Ecma119Image *t, Ecma119Node *dir)
len += 2; len += 2;
} }
/* get the SUSP fields if rockridge is enabled */
if (t->rockridge) {
ret = rrip_get_susp_fields(t, child, 0, 255 - len, &info);
if (ret < 0) {
return ret;
}
len += info.suf_len;
}
nsections = (child->type == ECMA119_FILE) ? child->info.file->nsections : 1; nsections = (child->type == ECMA119_FILE) ? child->info.file->nsections : 1;
for (section = 0; section < nsections; ++section) { for (section = 0; section < nsections; ++section) {
/* get the SUSP fields if rockridge is enabled */
if (t->rockridge && section == nsections - 1) {
ret = rrip_get_susp_fields(t, child, 0, 255 - len, &info);
if (ret < 0) {
return ret;
}
len += info.suf_len;
}
if ( (buf + len - buffer) > BLOCK_SIZE) { if ( (buf + len - buffer) > BLOCK_SIZE) {
/* dir doesn't fit in current block */ /* dir doesn't fit in current block */
ret = iso_write(t, buffer, BLOCK_SIZE); ret = iso_write(t, buffer, BLOCK_SIZE);