Requiring libjte-0.1.1 if enabled. Prepared for GNU xorriso to include libjte.
This commit is contained in:
parent
8a75d35c46
commit
f12df92600
@ -41,10 +41,21 @@
|
|||||||
#include <langinfo.h>
|
#include <langinfo.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
|
/* >>> later change this to Xorriso_standalonE */
|
||||||
|
#ifdef Xorriso_jte_standalonE
|
||||||
|
|
||||||
|
#ifdef Xorriso_with_libjtE
|
||||||
|
#include "../libjte/libjte.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
#ifdef Libisofs_with_libjtE
|
#ifdef Libisofs_with_libjtE
|
||||||
#include <libjte/libjte.h>
|
#include <libjte/libjte.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif /* ! Xorriso_jte_standalonE */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* TODO #00011 : guard against bad path table usage with more than 65535 dirs
|
* TODO #00011 : guard against bad path table usage with more than 65535 dirs
|
||||||
* image with more than 65535 directories have path_table related problems
|
* 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)
|
if (target->libjte_handle == NULL)
|
||||||
return ISO_SUCCESS;
|
return ISO_SUCCESS;
|
||||||
ret = libjte_show_data_chunk(target->libjte_handle, buf, count, 1, 0,
|
ret = libjte_show_data_chunk(target->libjte_handle, buf, count, 1);
|
||||||
target->bytes_written + (off_t) count == target->total_size);
|
|
||||||
if (ret <= 0) {
|
if (ret <= 0) {
|
||||||
iso_libjte_forward_msgs(target->libjte_handle,
|
iso_libjte_forward_msgs(target->libjte_handle,
|
||||||
target->image->id, ISO_LIBJTE_FILE_FAILED, 0);
|
target->image->id, ISO_LIBJTE_FILE_FAILED, 0);
|
||||||
|
@ -25,10 +25,21 @@
|
|||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
|
||||||
|
|
||||||
|
/* >>> later change this to Xorriso_standalonE */
|
||||||
|
#ifdef Xorriso_jte_standalonE
|
||||||
|
|
||||||
|
#ifdef Xorriso_with_libjtE
|
||||||
|
#include "../libjte/libjte.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
#ifdef Libisofs_with_libjtE
|
#ifdef Libisofs_with_libjtE
|
||||||
#include <libjte/libjte.h>
|
#include <libjte/libjte.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif /* ! Xorriso_jte_standalonE */
|
||||||
|
|
||||||
|
|
||||||
#ifndef PATH_MAX
|
#ifndef PATH_MAX
|
||||||
#define PATH_MAX Libisofs_default_path_maX
|
#define PATH_MAX Libisofs_default_path_maX
|
||||||
|
@ -1859,7 +1859,7 @@ int iso_write_opts_set_part_offset(IsoWriteOpts *opts,
|
|||||||
*/
|
*/
|
||||||
#define iso_libjte_req_major 0
|
#define iso_libjte_req_major 0
|
||||||
#define iso_libjte_req_minor 1
|
#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.
|
* Associate a libjte environment object to the upcomming write run.
|
||||||
|
@ -17,10 +17,21 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
|
/* >>> later change this to Xorriso_standalonE */
|
||||||
|
#ifdef Xorriso_jte_standalonE
|
||||||
|
|
||||||
|
#ifdef Xorriso_with_libjtE
|
||||||
|
#include "../libjte/libjte.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
#ifdef Libisofs_with_libjtE
|
#ifdef Libisofs_with_libjtE
|
||||||
#include <libjte/libjte.h>
|
#include <libjte/libjte.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif /* ! Xorriso_jte_standalonE */
|
||||||
|
|
||||||
#include "libiso_msgs.h"
|
#include "libiso_msgs.h"
|
||||||
#include "libisofs.h"
|
#include "libisofs.h"
|
||||||
#include "messages.h"
|
#include "messages.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user