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

Bug fix: Names read from Joliet tree where stripped of trailing ";1"

Browse Source
This commit is contained in:
Thomas Schmitt 2015-09-07 13:17:08 +02:00
parent 6c3dc3ce4a
commit 7ac5b75748
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libisofs/fs_image.c
View File

@ -1415,7 +1415,7 @@ int iso_file_source_new_ifs(IsoImageFilesystem *fs, IsoFileSource *parent,
struct ecma119_dir_record *record, struct ecma119_dir_record *record,
IsoFileSource **src, int flag) IsoFileSource **src, int flag)
{ {
int ret; int ret, ecma119_map;
struct stat atts; struct stat atts;
time_t recorded; time_t recorded;
_ImageFsData *fsdata; _ImageFsData *fsdata;
@ -1934,7 +1934,10 @@ if (name != NULL && !namecont) {
/* remove trailing version number */ /* remove trailing version number */
len = strlen(name); len = strlen(name);
if (fsdata->ecma119_map >= 1 && fsdata->ecma119_map <= 3 && ecma119_map = fsdata->ecma119_map;
if (fsdata->iso_root_block == fsdata->svd_root_block)
ecma119_map = 0;
if (ecma119_map >= 1 && ecma119_map <= 3 &&
len > 2 && name[len-2] == ';' && name[len-1] == '1') { len > 2 && name[len-2] == ';' && name[len-1] == '1') {
if (len > 3 && name[len-3] == '.') { if (len > 3 && name[len-3] == '.') {
/* /*
@ -1947,9 +1950,9 @@ if (name != NULL && !namecont) {
} }
} }
if (fsdata->ecma119_map == 2 || fsdata->ecma119_map == 3) { if (ecma119_map == 2 || ecma119_map == 3) {
for (cpt = name; *cpt != 0; cpt++) { for (cpt = name; *cpt != 0; cpt++) {
if (fsdata->ecma119_map == 2) { if (ecma119_map == 2) {
if (islower(*cpt)) if (islower(*cpt))
*cpt = toupper(*cpt); *cpt = toupper(*cpt);
} else { } else {