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

Made sure that empty relocation directory name leads to root directory.

Browse Source
This commit is contained in:
Thomas Schmitt 2012-03-10 11:29:03 +01:00
parent 76f2a5f4d3
commit 0a8bb0e9b8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libisofs/ecma119_tree.c
View File

@ -439,9 +439,11 @@ int create_tree(Ecma119Image *image, IsoNode *iso, Ecma119Node **tree,
if (depth == 1) { /* root is default */ if (depth == 1) { /* root is default */
image->rr_reloc_node = node; image->rr_reloc_node = node;
} else if (depth == 2) { /* directories in root may be used */ } else if (depth == 2) {
/* Directories in root may be used as relocation dir */
if (image->rr_reloc_dir != NULL) if (image->rr_reloc_dir != NULL)
if (strcmp(iso->name, image->rr_reloc_dir) == 0) if (image->rr_reloc_dir[0] != 0 &&
strcmp(iso->name, image->rr_reloc_dir) == 0)
image->rr_reloc_node = node; image->rr_reloc_node = node;
} }

4
libisofs/libisofs.h
View File

@ -1539,8 +1539,8 @@ int iso_write_opts_set_allow_deep_paths(IsoWriteOpts *opts, int allow);
/** /**
* This call describes the directory where to store Rock Ridge relocated * This call describes the directory where to store Rock Ridge relocated
* directories. * directories.
* If not iso_write_opts_set_allow_deep_paths(,1) is in effect, then it is * If not iso_write_opts_set_allow_deep_paths(,1) is in effect, then it may
* necessary to relocate directories so that no ECMA-119 file path * become necessary to relocate directories so that no ECMA-119 file path
* has more than 8 components. These directories are grafted into either * has more than 8 components. These directories are grafted into either
* the root directory of the ISO image or into a dedicated relocation * the root directory of the ISO image or into a dedicated relocation
* directory. * directory.