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

Little improves to image reading.

Browse Source
This commit is contained in:
Vreixo Formoso 2008-01-08 17:33:06 +01:00
parent 5d81305042
commit 7bb4eaf46d
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demo/iso_read.c
View File

@ -119,7 +119,7 @@ int main(int argc, char **argv)
0, /* preferjoliet */ 0, /* preferjoliet */
0, /* uid; */ 0, /* uid; */
0, /* gid; */ 0, /* gid; */
0, /* mode */ 0444, /* mode */
NULL /* input_charset */ NULL /* input_charset */
}; };

22
src/fs_image.c
View File

@ -734,7 +734,17 @@ int iso_file_source_new_ifs(IsoImageFilesystem *fs, IsoFileSource *parent,
return ISO_UNSUPPORTED_ECMA119; return ISO_UNSUPPORTED_ECMA119;
} }
//TODO check for unsupported extended attribs? /*
* Check for extended attributes, that are not supported. Note that even
* if we don't support them, it is easy to ignore them.
*/
if (record->len_xa[0]) {
iso_msg_fatal(fsdata->messenger, LIBISO_IMG_UNSUPPORTED,
"Unsupported image. This image has at least one file with "
"Extended Attributes, that are not supported");
return ISO_UNSUPPORTED_ECMA119;
}
//TODO check for other flags? //TODO check for other flags?
/* /*
@ -942,7 +952,15 @@ int iso_file_source_new_ifs(IsoImageFilesystem *fs, IsoFileSource *parent,
/* remove trailing version number */ /* remove trailing version number */
len = strlen(name); len = strlen(name);
if (len > 2 && name[len-2] == ';' && name[len-1] == '1') { if (len > 2 && name[len-2] == ';' && name[len-1] == '1') {
name[len-2] = '\0'; if (len > 3 && name[len-3] == '.') {
/*
* the "." is mandatory, so in most cases is included only
* for standard compliance
*/
name[len-3] = '\0';
} else {
name[len-2] = '\0';
}
} }
} }
} }