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

Enabled -multi and -msinfo with -as cdrecord

Browse Source
This commit is contained in:
Thomas Schmitt
2008-07-10 14:16:57 +00:00
parent e84b0e3fb0
commit 8f145f8094
5 changed files with 141 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7066,9 +7066,10 @@ int Xorriso_reaquire_outdev(struct XorrisO *xorriso, int flag)
int Xorriso_cdrskin(struct XorrisO *xorriso, char *whom, int argc, char **argv,
int flag)
{
int ret, i, k, mem_do_close, aq_ret, eject_ret;
int ret, i, k, mem_do_close, aq_ret, eject_ret, msc1, msc2;
int do_atip= 0, do_checkdrive= 0, do_eject= 0, do_scanbus= 0;
int do_toc= 0, do_verbous= 0, do_version= 0, do_help= 0, do_waiti= 0;
int do_multi= 0, do_msinfo= 0;
char track_source[SfileadrL], sfe[5*SfileadrL], dev_adr[SfileadrL], *cpt;
char mem_report_about_text[80], *report_about= "SORRY", blank_mode[80];
char speed[80];
@ -7127,8 +7128,11 @@ int Xorriso_cdrskin(struct XorrisO *xorriso, char *whom, int argc, char **argv,
"\tblank=type\tblank a CD-RW disc (see blank=help)",
"\tfs=#\t\tSet fifo size to # (0 to disable, default is 4 MB)",
"\t-eject\t\teject the disk after doing the work",
"\t-dummy\t\tdo everything with laser turned off",
"\t-msinfo\t\tretrieve multi-session info for mkisofs >= 1.10",
"\t-toc\t\tretrieve and print TOC/PMA data",
"\t-atip\t\tretrieve media state, print \"Is *erasable\"",
"\t-multi\t\tgenerate a TOC that allows multi session",
"\t-waiti\t\twait until input is available before opening SCSI",
"\tpadsize=#\tAmount of padding",
"\t-data\t\tSubsequent tracks are CD-ROM data mode 1 (default)",
@ -7166,7 +7170,7 @@ static char blank_help[][80]= {
speed[0]= 0;
if(xorriso->in_drive_handle != NULL) {
ret= Xorriso_option_dev(xorriso, "", 1); /* give up indev */
ret= Xorriso_option_dev(xorriso, "", 1|32); /* give up indev */
if(ret!=1)
return(ret);
}
@ -7271,26 +7275,23 @@ no_volunteer:;
speed[79]= 0;
} else if(strcmp(argv[i], "-multi")==0) {
/* >>> MULTI : allow -multi */
/* MULTI : allow -multi */
/*
sprintf(xorriso->info_text, "-as %s: Option -multi not supported.", whom);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
ret= 0; goto ex;
*/
do_multi= 1;
} else if(strcmp(argv[i], "-msinfo")==0) {
/* >>> MULTI : allow -msinfo */
/* MULTI : allow -msinfo */
/*
sprintf(xorriso->info_text, "-as %s: Option -msinfo not supported.",whom);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
ret= 0; goto ex;
/* >>> MULTI : allow --grow_overwriteable_iso */
/* >>> MULTI : allow write_start_address= */
/* >>> MULTI : combine write_start_address=32 with --grow_overwriteable_iso */
/* >>> MULTI : ??? how about cdrskin. shouldn't it combine too ? */
*/
do_msinfo= 1;
} else if(strcmp(argv[i], "--devices")==0) {
do_scanbus= 2;
} else if(strcmp(argv[i], "-scanbus")==0) {
@ -7303,11 +7304,19 @@ no_volunteer:;
} else if(strcmp(argv[i], "-toc")==0) {
do_toc= 1;
} else if(strcmp(argv[i], "--grow_overwriteable_iso")==0) {
/* >>> MULTI : allow --grow_overwriteable_iso */
sprintf(xorriso->info_text,
"-as %s: Option --grow_overwriteable_iso not supported.",
whom);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
ret= 0; goto ex;
/* >>> MULTI : allow write_start_address= */
/* >>> MULTI : combine write_start_address=32 with --grow_overwriteable_iso */
/* >>> MULTI : ??? how about cdrskin. shouldn't it combine too ? */
} else if(strcmp(argv[i], "-v")==0 || strcmp(argv[i],"-verbose")==0) {
do_verbous++;
} else if(strcmp(argv[i], "-vv")==0) {
@ -7363,7 +7372,13 @@ no_volunteer:;
sprintf(xorriso->info_text, "xorriso: Option -waiti pausing is done.\n");
}
if(dev_adr[0]) {
ret= Xorriso_option_dev(xorriso, dev_adr, 2|8); /* overwriteables as blank */
/* >>> MULTI :
if grow_overwriteable_iso :
consider overwriteables with ISO as appendable */
/* bit3= overwriteables as blank */
ret= Xorriso_option_dev(xorriso, dev_adr, 2|8|32);
if(ret<=0)
goto ex;
}
@ -7391,7 +7406,7 @@ no_volunteer:;
}
if(!(do_checkdrive || do_atip || do_toc || blank_mode[0] || track_source[0] ||
do_eject))
do_eject || do_msinfo))
{ret= 1; goto ex;}
if(xorriso->out_drive_handle==NULL) {
@ -7400,6 +7415,15 @@ no_volunteer:;
ret= 0; goto ex;
}
/* MULTI : perform -msinfo */
if(do_msinfo) {
ret= Xorriso_msinfo(xorriso, &msc1, &msc2, 2);
if(ret<=0)
goto ex;
sprintf(xorriso->result_line, "%d,%d\n", msc1, msc2);
Xorriso_result(xorriso, 1);
}
if(speed[0]) {
ret= Xorriso_option_speed(xorriso, speed, 0);
if(ret<=0)
@ -7442,9 +7466,9 @@ no_volunteer:;
}
if(track_source[0]) {
/* >>> MULTI : do not close if -multi */
/* MULTI : do not close if -multi */
xorriso->do_close= 1;
xorriso->do_close= !do_multi;
ret= Xorriso_burn_track(xorriso, track_source, 0);
aq_ret= Xorriso_reaquire_outdev(xorriso, 2*(ret>0));
if(ret<=0 && ret<aq_ret)
@ -9156,6 +9180,7 @@ int Xorriso_option_cut_out(struct XorrisO *xorriso, char *disk_path,
bit3= regard overwriteable media as blank
bit4= if the drive is a regular disk file: truncate it to
the write start address
bit5= do not print toc of aquired drive
@return <=0 error , 1 success, 2 revoked by -reassure
*/
int Xorriso_option_dev(struct XorrisO *xorriso, char *in_adr, int flag)
@ -9213,9 +9238,9 @@ int Xorriso_option_dev(struct XorrisO *xorriso, char *in_adr, int flag)
Text_shellsafe(xorriso->outdev, sfe, 0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0);
}
ret= Xorriso_give_up_drive(xorriso, flag&3);
ret= Xorriso_give_up_drive(xorriso, (flag&3)|((flag&32)>>2));
} else
ret= Xorriso_aquire_drive(xorriso, adr, (flag&3)|((flag&(8|16))>>1));
ret= Xorriso_aquire_drive(xorriso, adr, (flag&(3|32))|(((flag&(8|16))>>1)));
if(ret<=0)
return(ret);
if(xorriso->in_drive_handle == NULL)