diff --git a/libisofs/ecma119.c b/libisofs/ecma119.c index 75f29b1..8f1887a 100644 --- a/libisofs/ecma119.c +++ b/libisofs/ecma119.c @@ -41,10 +41,21 @@ #include #include +/* >>> later change this to Xorriso_standalonE */ +#ifdef Xorriso_jte_standalonE + +#ifdef Xorriso_with_libjtE +#include "../libjte/libjte.h" +#endif + +#else + #ifdef Libisofs_with_libjtE #include #endif +#endif /* ! Xorriso_jte_standalonE */ + /* * TODO #00011 : guard against bad path table usage with more than 65535 dirs * image with more than 65535 directories have path_table related problems @@ -110,8 +121,7 @@ static int show_chunk_to_jte(Ecma119Image *target, char *buf, int count) if (target->libjte_handle == NULL) return ISO_SUCCESS; - ret = libjte_show_data_chunk(target->libjte_handle, buf, count, 1, 0, - target->bytes_written + (off_t) count == target->total_size); + ret = libjte_show_data_chunk(target->libjte_handle, buf, count, 1); if (ret <= 0) { iso_libjte_forward_msgs(target->libjte_handle, target->image->id, ISO_LIBJTE_FILE_FAILED, 0); diff --git a/libisofs/filesrc.c b/libisofs/filesrc.c index 36ac0d3..faa8a3d 100644 --- a/libisofs/filesrc.c +++ b/libisofs/filesrc.c @@ -25,10 +25,21 @@ #include +/* >>> later change this to Xorriso_standalonE */ +#ifdef Xorriso_jte_standalonE + +#ifdef Xorriso_with_libjtE +#include "../libjte/libjte.h" +#endif + +#else + #ifdef Libisofs_with_libjtE #include #endif +#endif /* ! Xorriso_jte_standalonE */ + #ifndef PATH_MAX #define PATH_MAX Libisofs_default_path_maX diff --git a/libisofs/libisofs.h b/libisofs/libisofs.h index 09b786a..2c01d45 100644 --- a/libisofs/libisofs.h +++ b/libisofs/libisofs.h @@ -1859,7 +1859,7 @@ int iso_write_opts_set_part_offset(IsoWriteOpts *opts, */ #define iso_libjte_req_major 0 #define iso_libjte_req_minor 1 -#define iso_libjte_req_micro 0 +#define iso_libjte_req_micro 1 /** * Associate a libjte environment object to the upcomming write run. diff --git a/libisofs/messages.c b/libisofs/messages.c index cf8b6ac..24507c1 100644 --- a/libisofs/messages.c +++ b/libisofs/messages.c @@ -17,10 +17,21 @@ #include #include +/* >>> later change this to Xorriso_standalonE */ +#ifdef Xorriso_jte_standalonE + +#ifdef Xorriso_with_libjtE +#include "../libjte/libjte.h" +#endif + +#else + #ifdef Libisofs_with_libjtE #include #endif +#endif /* ! Xorriso_jte_standalonE */ + #include "libiso_msgs.h" #include "libisofs.h" #include "messages.h"