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

New options -copright_file , -biblio_file , -abstract_file

Browse Source
This commit is contained in:
Thomas Schmitt
2010-06-26 11:40:36 +00:00
parent 528631a647
commit 7d69b9849c
14 changed files with 267 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libisoburn/trunk/xorriso/drive_mgt.c
View File

@ -436,22 +436,14 @@ int Xorriso_aquire_drive(struct XorrisO *xorriso, char *adr, int flag)
xorriso->system_id[32]= 0;
strncpy(xorriso->volset_id, un0(iso_image_get_volset_id(volset)), 128);
xorriso->volset_id[128]= 0;
/* <<< can be removed as soon as libisofs-0.6.24 is mandatory
*/
if(strcmp(un0(iso_image_get_copyright_file_id(volset)), "_") == 0 &&
strcmp(un0(iso_image_get_abstract_file_id(volset)), "_") == 0 &&
strcmp(un0(iso_image_get_biblio_file_id(volset)), "_") == 0) {
/* This is bug output from libisofs <= 0.6.23 . The texts mean file names
and should have been empty to indicate that there are no such files.
It is obvious that not all three roles can be fulfilled by one file "_"
so that one cannot spoil anything by assuming them empty now.
Modern versions of libisofs are supposed to do this themselves.
*/
iso_image_set_copyright_file_id(volset, "");
iso_image_set_abstract_file_id(volset, "");
iso_image_set_biblio_file_id(volset, "");
}
strncpy(xorriso->copyright_file,
un0(iso_image_get_copyright_file_id(volset)), 37);
xorriso->copyright_file[37]= 0;
strncpy(xorriso->biblio_file, un0(iso_image_get_biblio_file_id(volset)), 37);
xorriso->biblio_file[37]= 0;
strncpy(xorriso->abstract_file,
un0(iso_image_get_abstract_file_id(volset)), 37);
xorriso->abstract_file[37]= 0;
if(xorriso->out_drive_handle != NULL &&
xorriso->out_drive_handle != xorriso->in_drive_handle) {