libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Final UPDATE message after grafting in files from disk

Browse Source
This commit is contained in:
Thomas Schmitt 2008-02-11 11:33:17 +00:00
parent 3b3be3d857
commit 9d4709e4a5
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libisoburn/trunk/xorriso/xorriso.c
View File

@ -5864,7 +5864,7 @@ int Xorriso_option_abort_on(struct XorrisO *xorriso, char *severity, int flag)
/* Option -add */ /* Option -add */
/* @param flag bit0=do not report the added item /* @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 Xorriso_option_add(struct XorrisO *xorriso, int argc, char **argv,
int *idx, int flag) int *idx, int flag)
@ -5946,6 +5946,9 @@ problem_handler:;
continue; continue;
goto ex; goto ex;
} }
if(!(flag&2))
Xorriso_pacifier_callback(xorriso, "files added", xorriso->pacifier_count,
xorriso->pacifier_total, "", 1);
ret= 1; ret= 1;
ex:; ex:;
(*idx)= end_idx; (*idx)= end_idx;
@ -6546,6 +6549,8 @@ problem_handler:;
continue; continue;
goto ex; goto ex;
} }
Xorriso_pacifier_callback(xorriso, "files added", xorriso->pacifier_count,
xorriso->pacifier_total, "", 1);
ret= !was_failure; ret= !was_failure;
ex:; ex:;
Xorriso_opt_args(xorriso, "-cpri", Xorriso_opt_args(xorriso, "-cpri",
@ -7108,6 +7113,8 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
" Specifies the volume ID text.", " Specifies the volume ID text.",
" -joliet \"on\"|\"off\"", " -joliet \"on\"|\"off\"",
" Generate Joliet info additional to Rock Ridge info.", " 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.", " -uid uid User id to be used for the whole multi-session ISO image.",
" -gid gid Group id for the same purpose.", " -gid gid Group id for the same purpose.",
@ -7887,6 +7894,8 @@ problem_handler:;
continue; continue;
goto ex; goto ex;
} }
Xorriso_pacifier_callback(xorriso, "files added", xorriso->pacifier_count,
xorriso->pacifier_total, "", 1);
ret= 1; ret= 1;
ex:; ex:;
if(ret<=0) { if(ret<=0) {

2
libisoburn/trunk/xorriso/xorriso.h
View File

@ -150,7 +150,7 @@ int Xorriso_option_abort_on(struct XorrisO *xorriso, char *severity, int flag);
/* Option -add */ /* Option -add */
/* @param flag bit0=do not report the added item /* @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 Xorriso_option_add(struct XorrisO *xorriso, int argc, char **argv,
int *idx, int flag); int *idx, int flag);

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2008.02.11.112917" #define Xorriso_timestamP "2008.02.11.113235"