Preparations for ISO/HFS+ hybrid images by Vladimir Serbinenko

libisoburn/isoburn.c

@@ -471,6 +471,7 @@ int isoburn_prepare_disc_aux(struct burn_drive *in_d, struct burn_drive *out_d,
  iso_write_opts_set_iso_level(wopts, opts->level);
  iso_write_opts_set_rockridge(wopts, opts->rockridge);
  iso_write_opts_set_joliet(wopts, opts->joliet);
+ iso_write_opts_set_hfsplus(wopts, opts->hfsplus);
  iso_write_opts_set_iso1999(wopts, opts->iso1999);
  iso_write_opts_set_hardlinks(wopts, opts->hardlinks);
  if(opts->hardlinks)
@@ -1120,6 +1121,7 @@ int isoburn_igopt_set_extensions(struct isoburn_imgen_opts *o, int ext)
  o->no_emul_toc= !!(ext & 512);
  o->will_cancel= !!(ext & 1024);
  o->old_empty= !!(ext & 2048);
+ o->hfsplus= !!(ext&4096);
  return(1);
 }
 
@@ -1130,7 +1132,7 @@ int isoburn_igopt_get_extensions(struct isoburn_imgen_opts *o, int *ext)
        ((!!o->hardlinks) << 3) | ((!!o->aaip) << 5) |
        ((!!o->session_md5) << 6) | ((o->file_md5 & 3) << 7) |
        ((!!o->no_emul_toc) << 9) | ((o->will_cancel) << 10) |
-       ((!!o->old_empty) << 11);
+       ((!!o->old_empty) << 11) | ((!!o->hfsplus) << 12);
  return(1);
 }
 

libisoburn/isoburn.h

@@ -393,6 +393,7 @@ struct isoburn_imgen_opts {
     unsigned int rockridge :1;
     unsigned int joliet :1;
     unsigned int iso1999 :1;
+    unsigned int hfsplus :1;
 
     /* Whether to mark suitable IsoNode as hardlinks in RRIP PX */
     unsigned int hardlinks :1;

libisoburn/libisoburn.h

@@ -1123,6 +1123,7 @@ int isoburn_igopt_get_level(struct isoburn_imgen_opts *o, int *level);
 #define isoburn_igopt_no_emul_toc     512
 #define isoburn_igopt_will_cancel    1024
 #define isoburn_igopt_old_empty      2048
+#define isoburn_igopt_hfsplus        4096
 int isoburn_igopt_set_extensions(struct isoburn_imgen_opts *o, int ext);
 int isoburn_igopt_get_extensions(struct isoburn_imgen_opts *o, int *ext);
 

xorriso/xorriso_timestamp.h

@@ -1 +1 @@
-#define Xorriso_timestamP "2012.05.22.121743"
+#define Xorriso_timestamP "2012.05.24.070718"