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

Enabled output of volume id und modification date with -report_system_area cmd

Browse Source
This commit is contained in:
Thomas Schmitt 2015-05-14 13:12:44 +00:00
parent 214fc269a3
commit 0a8b9c3af4
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libisoburn/trunk/xorriso/iso_img.c
View File

@ -1584,6 +1584,8 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso,
uint32_t img_blocks= 0; uint32_t img_blocks= 0;
struct FindjoB *job= NULL; struct FindjoB *job= NULL;
struct stat dir_stbuf; struct stat dir_stbuf;
IsoImage *image;
char *volid, *crt, *mdt, *ext, *eft, uuid[17];
struct mbr_par { struct mbr_par {
uint8_t ptype; uint8_t ptype;
@ -1686,6 +1688,29 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso,
ptable_killer= (mbr_count > 0) | ((gpt_count > 0) << 1) | ptable_killer= (mbr_count > 0) | ((gpt_count > 0) << 1) |
((apm_count > 0) << 2); ((apm_count > 0) << 2);
/* Report volume id and GRUB2 modification date */;
ret= Xorriso_get_volume(xorriso, &image, 0);
if(ret <= 0)
goto ex;
if(mkisofs)
sprintf(buf, "-V ");
else
sprintf(buf, "-volid ");
volid= (char *) un0(iso_image_get_volume_id(image));
Text_shellsafe(volid, buf, 1);
Xorriso_record_cmd_linE
ret= iso_image_get_pvd_times(image, &crt, &mdt, &ext, &eft);
if(ret == ISO_SUCCESS) {
if(mkisofs)
sprintf(buf, "--modification-date=");
else
sprintf(buf, "-volume_date uuid ");
strncpy(uuid, crt, 16);
uuid[16]= 0;
Text_shellsafe(uuid, buf, 1);
}
Xorriso_record_cmd_linE
/* First pass: set up objects, record El Torito and info needed in 2nd pass */ /* First pass: set up objects, record El Torito and info needed in 2nd pass */
for(i= 0; i < line_count; i++) { for(i= 0; i < line_count; i++) {
buf[0]= 0; buf[0]= 0;

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2015.05.14.113925" #define Xorriso_timestamP "2015.05.14.131152"