diff --git a/libisoburn/trunk/test/xorriso_timestamp.h b/libisoburn/trunk/test/xorriso_timestamp.h index f6fc2b45..21f42731 100644 --- a/libisoburn/trunk/test/xorriso_timestamp.h +++ b/libisoburn/trunk/test/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2007.12.16.122626" +#define Xorriso_timestamP "2007.12.16.144615" diff --git a/libisoburn/trunk/test/xorrisoburn.c b/libisoburn/trunk/test/xorrisoburn.c index 4fcc5ced..03a34a10 100644 --- a/libisoburn/trunk/test/xorrisoburn.c +++ b/libisoburn/trunk/test/xorrisoburn.c @@ -1861,6 +1861,8 @@ much_too_long:; mem+= l; if(l % sizeof(char *)) mem+= sizeof(char *)-(l % sizeof(char *)); + if(flag&1) /* diving and counting is done further below */ + continue; ret= Xorriso_show_du_subs(xorriso, (struct iso_tree_node_dir *) node, path, show_path, &sub_size, boss_mem, 0); if(ret<0) @@ -1868,7 +1870,10 @@ much_too_long:; if(ret==0) continue; } +/* sub_size+= iso_tree_node_get_size(node)+strlen(name)+1; +*/ + sub_size+= iso_tree_node_get_size(node)+2048; if(sub_size>0) (*size)+= sub_size; Xorriso_process_msg_queues(xorriso,0); @@ -1913,6 +1918,12 @@ much_too_long:; path, show_path, &sub_size, boss_mem+mem, flag&1); if(ret<0) goto ex; +/* + sub_size+= iso_tree_node_get_size(node)+strlen(name)+1; +*/ + sub_size+= iso_tree_node_get_size(node)+2048; + if(sub_size>0) + (*size)+= sub_size; report_size= sub_size/1024; if(report_size*1024