diff --git a/libisoburn/trunk/xorriso/xorriso.c b/libisoburn/trunk/xorriso/xorriso.c index 22f42422..f2cdfbf2 100644 --- a/libisoburn/trunk/xorriso/xorriso.c +++ b/libisoburn/trunk/xorriso/xorriso.c @@ -5864,7 +5864,7 @@ int Xorriso_option_abort_on(struct XorrisO *xorriso, char *severity, int flag) /* Option -add */ /* @param flag bit0=do not report the added item - bit1=do not reset pacifier + bit1=do not reset pacifier, no final pacifier message */ int Xorriso_option_add(struct XorrisO *xorriso, int argc, char **argv, int *idx, int flag) @@ -5946,6 +5946,9 @@ problem_handler:; continue; goto ex; } + if(!(flag&2)) + Xorriso_pacifier_callback(xorriso, "files added", xorriso->pacifier_count, + xorriso->pacifier_total, "", 1); ret= 1; ex:; (*idx)= end_idx; @@ -6546,6 +6549,8 @@ problem_handler:; continue; goto ex; } + Xorriso_pacifier_callback(xorriso, "files added", xorriso->pacifier_count, + xorriso->pacifier_total, "", 1); ret= !was_failure; ex:; Xorriso_opt_args(xorriso, "-cpri", @@ -7108,6 +7113,8 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag) " Specifies the volume ID text.", " -joliet \"on\"|\"off\"", " Generate Joliet info additional to Rock Ridge info.", +" -bootimage \"any\"|\"isolinux\" \"discard\"|\"keep\"|\"patch\"", +" Whether to discard or keep an exiting El-Torito boot image.", "", " -uid uid User id to be used for the whole multi-session ISO image.", " -gid gid Group id for the same purpose.", @@ -7887,6 +7894,8 @@ problem_handler:; continue; goto ex; } + Xorriso_pacifier_callback(xorriso, "files added", xorriso->pacifier_count, + xorriso->pacifier_total, "", 1); ret= 1; ex:; if(ret<=0) { diff --git a/libisoburn/trunk/xorriso/xorriso.h b/libisoburn/trunk/xorriso/xorriso.h index 8561b41e..47506f0e 100644 --- a/libisoburn/trunk/xorriso/xorriso.h +++ b/libisoburn/trunk/xorriso/xorriso.h @@ -150,7 +150,7 @@ int Xorriso_option_abort_on(struct XorrisO *xorriso, char *severity, int flag); /* Option -add */ /* @param flag bit0=do not report the added item - bit1=do not reset pacifier + bit1=do not reset pacifier, no final pacifier message */ int Xorriso_option_add(struct XorrisO *xorriso, int argc, char **argv, int *idx, int flag); diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index b910ed8b..5e554d3a 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2008.02.11.112917" +#define Xorriso_timestamP "2008.02.11.113235"