Bug fix: -osirrox on:sort_lba_on -extract from / restored nearly nothing

master
Thomas Schmitt 11 years ago
parent 661ae74800
commit d40b26e8bd
  1. 12
      xorriso/disk_ops.c
  2. 2
      xorriso/xorriso_timestamp.h

@ -1667,14 +1667,20 @@ int Xorriso_make_restore_path(struct XorrisO *xorriso,
ipfx= Xorriso_lst_get_text(s, 0);
li= strlen(ipfx);
dpfx= Xorriso_lst_get_text(d, 0);
if(strncmp(img_path, ipfx, li) != 0)
if(li == 1 && ipfx[0] == '/') {
li= 0;
if(img_path[0] != '/')
continue;
if(img_path[li] != 0 && img_path[li] != '/')
} else {
if(strncmp(img_path, ipfx, li) != 0)
continue;
if(img_path[li] != 0 && img_path[li] != '/')
continue;
}
if(strlen(dpfx) + strlen(img_path) - li + 1 >= SfileadrL)
return(-1);
if(img_path[li]=='/')
sprintf(disk_path, "%s/%s", dpfx, img_path + strlen(ipfx) + 1);
sprintf(disk_path, "%s/%s", dpfx, img_path + li + 1);
else
strcpy(disk_path, dpfx);
found_s= s;

@ -1 +1 @@
#define Xorriso_timestamP "2012.02.25.154938"
#define Xorriso_timestamP "2012.02.25.194514"

Loading…
Cancel
Save