Made compile_xorriso.sh -nglibisofs work on ./ng_src

libisoburn/trunk/test/compile_xorriso.sh

@@ -46,10 +46,14 @@ do
   then
     nglibisofs=1
     isofs=./nglibisofs-develop/src
+    isoburn=./libisoburn-develop/ng_src
+    gen=-nglibisofs
   elif test "$i" = "-oglibisofs"
   then
     nglibisofs=0
     isofs=./libisofs-develop/libisofs
+    isoburn=./libisoburn-develop/src
+    gen=-oglibisofs
   elif test "$i" = "-static"
   then
     static_opts="-static"
@@ -101,13 +105,12 @@ else
   libisofs="$libisofs $isofs"/volume.o
   xorrisoburn_c="xorrisoburn.c"
 fi
-echo "+ $libisofs"
 
 timestamp="$(date -u '+%Y.%m.%d.%H%M%S')"
 echo "Version timestamp :  $(sed -e 's/#define Xorriso_timestamP "//' -e 's/"$//' "$xorr"/xorriso_timestamp.h)"
 echo "Build timestamp   :  $timestamp"
 
-echo "compiling program $xorr/xorriso.c $static_opts $debug_opts $def_opts"
+echo "compiling program $xorr/xorriso.c $static_opts $debug_opts $def_opts $gen"
 cc -I. -DXorriso_with_maiN -DXorriso_with_regeX -DXorriso_with_readlinE \
   $warn_opts \
   $static_opts \

libisoburn/trunk/test/ng_xorrisoburn.c

@@ -98,7 +98,7 @@ int Xorriso_startup_libraries(struct XorrisO *xorriso, int flag)
  } else
    print_sev= "NEVER";
 
-/* >>> NG  How to set severities before isoburn_read_volset() ?
+/* >>> NG  How to set severities before isoburn_read_image() ?
        iso_image_set_msgs_severities() demands an IsoImage
 */
 /*
@@ -180,7 +180,8 @@ int Xorriso_create_empty_iso(struct XorrisO *xorriso, int flag)
  }
  memset(&ropts, sizeof(ropts), 0);
  ropts.pretend_blank= 1;
- ret= isoburn_read_volset(drive, &ropts, (void **) &volset);
+ ropts.input_charset= NULL;
+ ret= isoburn_read_image(drive, &ropts, &volset);
  Xorriso_process_msg_queues(xorriso,0);
  if(ret<=0) {
    sprintf(xorriso->info_text, "Failed to create new empty ISO image object");
@@ -272,7 +273,7 @@ int Xorriso_aquire_drive(struct XorrisO *xorriso, char *adr, int flag)
        return(ret);
    } else {
      iso_image_ref((IsoImage *) xorriso->in_volset_handle);
-     ret= isoburn_attach_volset(drive, xorriso->in_volset_handle);
+     ret= isoburn_attach_image(drive, (IsoImage *) xorriso->in_volset_handle);
      if(ret<=0) {
        sprintf(xorriso->info_text,
                "Failed to attach ISO image object to outdev");
@@ -306,7 +307,7 @@ int Xorriso_aquire_drive(struct XorrisO *xorriso, char *adr, int flag)
  ropts.mode= 0555;
  ropts.pretend_blank= 0;
 
- if(isoburn_read_volset(drive, &ropts, (void **) &volset) <= 0) {
+ if(isoburn_read_image(drive, &ropts, &volset) <= 0) {
    Xorriso_process_msg_queues(xorriso,0);
    sprintf(xorriso->info_text,"Cannot read ISO image volset");
    Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0);
@@ -322,7 +323,7 @@ int Xorriso_aquire_drive(struct XorrisO *xorriso, char *adr, int flag)
    if(ret<=0)
      goto ex;
    iso_image_ref((IsoImage *) xorriso->in_volset_handle);
-   isoburn_attach_volset(out_drive, xorriso->in_volset_handle);
+   isoburn_attach_image(out_drive, xorriso->in_volset_handle);
  }
  Xorriso_process_msg_queues(xorriso,0);
  Xorriso_toc(xorriso, 1);
@@ -438,28 +439,24 @@ int Xorriso_write_session(struct XorrisO *xorriso, int flag)
  if(ret<=0)
    return(0);
 
+ memset(&sopts, 0, sizeof(sopts));
+
  sopts.level= 2;
-
+ sopts.rockridge= 1;
-/* >>> NG  libisofs control gesture in libisoburn
+ sopts.joliet= !!xorriso->do_joliet;
- sopts.flags= ECMA119_ROCKRIDGE;
+ sopts.omit_version_numbers= 0;
- if(xorriso->do_joliet)
+ sopts.allow_deep_paths= 1;
-   sopts.flags|= ECMA119_JOLIET;
+ sopts.joliet_longer_paths= 0;
-*/
-
- sopts.relaxed_constraints= 0;
  sopts.copy_eltorito= 1;
- sopts.no_cache_inodes= 0;
  sopts.sort_files= 1;
- sopts.default_mode= 1;
+ sopts.replace_dir_mode= 2*!!xorriso->do_global_mode;
- sopts.replace_dir_mode= xorriso->do_global_mode;
  sopts.dir_mode= xorriso->global_dir_mode;
- sopts.replace_file_mode= xorriso->do_global_mode;
+ sopts.replace_file_mode= 2*!!xorriso->do_global_mode;
  sopts.file_mode= xorriso->global_file_mode;
- sopts.replace_uid= (xorriso->do_global_uid);
+ sopts.replace_uid= 2*!!xorriso->do_global_uid;
  sopts.uid= xorriso->global_uid;
- sopts.replace_gid= (xorriso->do_global_gid);
+ sopts.replace_gid= 2*!!xorriso->do_global_gid;
  sopts.gid= xorriso->global_gid;
- sopts.input_charset= NULL;
  sopts.ouput_charset= NULL;
  sopts.fifo_size= xorriso->fs * 2048;
 
@@ -1226,13 +1223,14 @@ int Xorriso_process_msg_queues(struct XorrisO *xorriso, int flag)
  char severity[80];
  IsoImage *volume;
 
- ret= Xorriso_get_volume(xorriso, &volume, 0);
+ if(xorriso->in_volset_handle==NULL)
- if(ret<=0)
    start_pass= 1;
+ else
+   volume= (IsoImage *) xorriso->in_volset_handle;
 
  if(!xorriso->libs_are_started)
    return(1);
- for(pass= 0; pass< 2; pass++) {
+ for(pass= start_pass; pass< 2; pass++) {
    while(1) {
      if(pass==0)
        ret= iso_image_obtain_msgs(volume, "ALL", &error_code,

libisoburn/trunk/test/xorriso_timestamp.h

@@ -1 +1 @@
-#define Xorriso_timestamP "2008.01.10.151924"
+#define Xorriso_timestamP "2008.01.10.152353"