Avoided unnecessary sorting during -extract

master
Thomas Schmitt 14 years ago
parent 94e6000db2
commit bcb54ccaba
  1. 2
      xorriso/xorriso_timestamp.h
  2. 8
      xorriso/xorrisoburn.c

@ -1 +1 @@
#define Xorriso_timestamP "2009.05.29.110831"
#define Xorriso_timestamP "2009.05.29.162300"

@ -4053,11 +4053,12 @@ int Xorriso_restore_tree(struct XorrisO *xorriso, IsoDir *dir,
off_t mem;
struct PermiteM *perm_stack_mem;
struct stat stbuf;
int dir_create= 0, node_register= 0, do_node_count= 0;
int dir_create= 0, node_register= 0, do_node_count= 0, normal_mode= 0;
perm_stack_mem= xorriso->perm_stack;
switch((flag >> 7) & 3) {
case 1: dir_create= 1;
case 0: normal_mode= 1;
break; case 1: dir_create= 1;
break; case 2: node_register= 1;
break; case 3: do_node_count= 1;
}
@ -4119,7 +4120,8 @@ int Xorriso_restore_tree(struct XorrisO *xorriso, IsoDir *dir,
mem= boss_mem;
ret= Xorriso_findi_iter(xorriso, dir, &mem, &iter, &node_array, &node_count,
&node_idx, &node, 1|4);
&node_idx, &node,
1 | 4 * (normal_mode && (xorriso->ino_behavior & 4)));
if(ret<=0)
goto ex;

Loading…
Cancel
Save