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

Omitting "ISO offers :" and "ISO loaded :" if no ISO was loaded at all

Browse Source
This commit is contained in:
Thomas Schmitt 2020-12-08 13:33:09 +01:00
parent 3542e8af97
commit 5bc1d998f9
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
xorriso/base_obj.c
View File

@ -168,6 +168,7 @@ int Xorriso_new(struct XorrisO ** xorriso,char *progname, int flag)
m->do_follow_mount= 1; m->do_follow_mount= 1;
m->do_global_uid= 0; m->do_global_uid= 0;
m->global_uid= 0; m->global_uid= 0;
m->isofs_size= 0;
m->isofs_has_what= 0; m->isofs_has_what= 0;
m->tree_loaded= 0; m->tree_loaded= 0;
m->rr_loaded= 0; m->rr_loaded= 0;

3
xorriso/drive_mgt.c
View File

@ -692,6 +692,7 @@ int Xorriso_aquire_drive(struct XorrisO *xorriso, char *adr, char *show_adr,
} }
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);
isoburn_ropt_get_size_what(ropts, &size, &has_what); isoburn_ropt_get_size_what(ropts, &size, &has_what);
xorriso->isofs_size= size;
xorriso->isofs_has_what= has_what; xorriso->isofs_has_what= has_what;
isoburn_ropt_get_tree_loaded(ropts, &(xorriso->tree_loaded), isoburn_ropt_get_tree_loaded(ropts, &(xorriso->tree_loaded),
&(xorriso->rr_loaded)); &(xorriso->rr_loaded));
@ -1283,7 +1284,7 @@ int Xorriso_toc(struct XorrisO *xorriso, int flag)
if(!(flag & 2)) if(!(flag & 2))
Xorriso_show_boot_info(xorriso, 1 | (flag & 8) | ((flag & 1) << 1)); Xorriso_show_boot_info(xorriso, 1 | (flag & 8) | ((flag & 1) << 1));
if(!(flag & 3)) { if(xorriso->isofs_size > 0 && !(flag & 3)) {
sprintf(respt, "ISO offers :%s%s%s%s\n", sprintf(respt, "ISO offers :%s%s%s%s\n",
xorriso->isofs_has_what & 1 ? " Rock_Ridge" : "", xorriso->isofs_has_what & 1 ? " Rock_Ridge" : "",
xorriso->isofs_has_what & 2 ? " Joliet" : "", xorriso->isofs_has_what & 2 ? " Joliet" : "",

1
xorriso/xorriso_private.h
View File

@ -241,6 +241,7 @@ struct XorrisO { /* the global context of xorriso */
int do_overwrite; /* 0=off, 1=on, 2=nondir */ int do_overwrite; /* 0=off, 1=on, 2=nondir */
int do_reassure; /* 0=off, 1=on, 2=tree */ int do_reassure; /* 0=off, 1=on, 2=tree */
uint32_t isofs_size; /* Size of loaded ISO filesystem */
int isofs_has_what; /* bit0= hasRR int isofs_has_what; /* bit0= hasRR
bit1= hasJoliet bit1= hasJoliet
bit2= hasIso1999 bit2= hasIso1999

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2020.12.07.184159" #define Xorriso_timestamP "2020.12.08.122752"