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

Processing output of -as mkisofs by -pkt_output if enabled

This commit is contained in:
Thomas Schmitt 2010-11-30 11:20:59 +00:00
parent 07c2bb8421
commit 4897fc74f1
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
xorriso/opts_p_z.c
View File

@ -245,6 +245,7 @@ int Xorriso_option_print(struct XorrisO *xorriso, char *text, int flag)
/* Option -print_size /* Option -print_size
@param flag bit0= report in mkisofs compatible form on real stdout @param flag bit0= report in mkisofs compatible form on real stdout
(resp. on result channel if xorriso->packet_output)
*/ */
int Xorriso_option_print_size(struct XorrisO *xorriso, int flag) int Xorriso_option_print_size(struct XorrisO *xorriso, int flag)
{ {
@ -253,8 +254,10 @@ int Xorriso_option_print_size(struct XorrisO *xorriso, int flag)
if(!xorriso->volset_change_pending) { if(!xorriso->volset_change_pending) {
sprintf(xorriso->info_text,"-print_size: No image modifications pending"); sprintf(xorriso->info_text,"-print_size: No image modifications pending");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0);
sprintf(xorriso->result_line,"Image size : 0s\n"); if(!(flag & 1)) {
Xorriso_result(xorriso,0); sprintf(xorriso->result_line,"Image size : 0s\n");
Xorriso_result(xorriso,0);
}
return(2); return(2);
} }
ret= Xorriso_write_session(xorriso, 1); ret= Xorriso_write_session(xorriso, 1);
@ -265,12 +268,16 @@ int Xorriso_option_print_size(struct XorrisO *xorriso, int flag)
} }
if(flag&1) { if(flag&1) {
sprintf(xorriso->result_line,"%d\n", ret); sprintf(xorriso->result_line,"%d\n", ret);
fd= xorriso->dev_fd_1; if(xorriso->packet_output) {
if(fd<0) Xorriso_result(xorriso,0);
fd= 1; } else {
ret= write(fd, xorriso->result_line, strlen(xorriso->result_line)); fd= xorriso->dev_fd_1;
/* (result of write intentionally ignored) */ if(fd<0)
fsync(fd); fd= 1;
ret= write(fd, xorriso->result_line, strlen(xorriso->result_line));
/* (result of write intentionally ignored) */
fsync(fd);
}
} else { } else {
sprintf(xorriso->result_line,"Image size : %ds\n", ret); sprintf(xorriso->result_line,"Image size : %ds\n", ret);
Xorriso_result(xorriso,0); Xorriso_result(xorriso,0);

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2010.11.30.104719" #define Xorriso_timestamP "2010.11.30.112050"