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

Corrections about restoring of directories

Browse Source
This commit is contained in:
Thomas Schmitt
2008-06-12 11:26:31 +00:00
parent 0625c675be
commit b1b4bba42a
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libisoburn/trunk/xorriso/xorrisoburn.c
View File

@ -2836,7 +2836,7 @@ int Xorriso_handle_collision(struct XorrisO *xorriso,
} else {
target_is_dir= S_ISDIR(target_stbuf.st_mode);
}
if(target_is_dir && (!target_is_link) && !(flag&2)) {
if(target_is_dir && (!target_is_link) && !(flag&1)) {
strcpy(xorriso->info_text, "Attempt to replace DISK directory ");
Text_shellsafe(nominal_disk_path,
xorriso->info_text+strlen(xorriso->info_text), 0);
@ -2962,7 +2962,7 @@ much_too_long:;
name= img_path+strlen(img_path);
if(Sfile_str(disk_path, disk_dir_path, 0)<=0)
goto much_too_long;
if(disk_path[0] || disk_path[strlen(disk_path)-1]!='/')
if(disk_path[0]==0 || disk_path[strlen(disk_path)-1]!='/')
strcat(disk_path,"/");
disk_name= disk_path+strlen(disk_path);