Corrections made during porting to nglibisofs

This commit is contained in:
Thomas Schmitt 2008-01-09 17:55:27 +00:00
parent 3fc1b26caa
commit fca4b8e2df
2 changed files with 5 additions and 10 deletions

View File

@ -1 +1 @@
#define Xorriso_timestamP "2008.01.02.175011" #define Xorriso_timestamP "2008.01.09.175418"

View File

@ -916,7 +916,8 @@ cannot_lstat:;
ret= Xorriso_transfer_properties(xorriso, &stbuf, node, 0); ret= Xorriso_transfer_properties(xorriso, &stbuf, node, 0);
if(ret<=0) if(ret<=0)
goto was_problem; goto was_problem;
} } else
{ret= 0; goto was_problem;}
} else } else
node= iso_tree_add_node(dir, srcpt); node= iso_tree_add_node(dir, srcpt);
} }
@ -1874,7 +1875,8 @@ int Xorriso_sorted_node_array(struct XorrisO *xorriso,
*nodec= i; *nodec= i;
if(*nodec<=0) if(*nodec<=0)
return(1); return(1);
qsort(*node_array, *nodec, sizeof(struct iso_tree *), Xorriso__node_name_cmp); qsort(*node_array, *nodec, sizeof(struct iso_tree_node *),
Xorriso__node_name_cmp);
return(1); return(1);
} }
@ -2923,17 +2925,10 @@ int Xorriso_findi(struct XorrisO *xorriso, struct FindjoB *job,
if(ret<0) if(ret<0)
goto ex; goto ex;
if(ret>0) { if(ret>0) {
#ifdef NIX
sprintf(xorriso->result_line, "%s\n", Text_shellsafe(dir_path, sfe, 0));
Xorriso_result(xorriso, 0);
#else
ret= Xorriso_findi_action(xorriso, job, path, dir_path, ret= Xorriso_findi_action(xorriso, job, path, dir_path,
(struct iso_tree_node *) dir_node, depth, 0); (struct iso_tree_node *) dir_node, depth, 0);
if(ret<=0) if(ret<=0)
goto ex; goto ex;
#endif /* ! NIX */
} }
} }
if(!LIBISO_ISDIR((struct iso_tree_node *) dir_node)) if(!LIBISO_ISDIR((struct iso_tree_node *) dir_node))