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

Directed -as mkisofs -print-size to real stdout

Browse Source
This commit is contained in:
Thomas Schmitt 2008-02-23 11:40:42 +00:00
parent d3cdbc2bfb
commit 584aeb7dab
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
xorriso/xorriso.c
View File

@ -6788,7 +6788,7 @@ not_enough_args:;
} }
} }
if(do_print_size) { if(do_print_size) {
ret= Xorriso_option_print_size(xorriso, 0); ret= Xorriso_option_print_size(xorriso, 1);
if(ret<=0) if(ret<=0)
goto ex; goto ex;
} }
@ -9072,10 +9072,12 @@ 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
*/
int Xorriso_option_print_size(struct XorrisO *xorriso, int flag) int Xorriso_option_print_size(struct XorrisO *xorriso, int flag)
{ {
int ret; int ret, fd;
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");
@ -9090,8 +9092,16 @@ int Xorriso_option_print_size(struct XorrisO *xorriso, int flag)
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0);
return(0); return(0);
} }
sprintf(xorriso->result_line,"Image size : %ds\n", ret); if(flag&1) {
Xorriso_result(xorriso,0); sprintf(xorriso->result_line,"%d\n", ret);
fd= xorriso->dev_fd_1;
if(fd<0)
fd= 1;
write(fd, xorriso->result_line, strlen(xorriso->result_line));
} else {
sprintf(xorriso->result_line,"Image size : %ds\n", ret);
Xorriso_result(xorriso,0);
}
return(1); return(1);
} }

4
xorriso/xorriso.h
View File

@ -353,7 +353,9 @@ int Xorriso_option_pkt_output(struct XorrisO *xorriso, char *mode, int flag);
/* Option -print */ /* Option -print */
int Xorriso_option_print(struct XorrisO *xorriso, char *text, int flag); 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
*/
int Xorriso_option_print_size(struct XorrisO *xorriso, int flag); int Xorriso_option_print_size(struct XorrisO *xorriso, int flag);
/* Option -prog */ /* Option -prog */

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2008.02.23.102903" #define Xorriso_timestamP "2008.02.23.113902"