From 423c14828ca7ea0ebe346edf78f4c96ce5ac170f Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Sat, 9 Mar 2024 22:05:18 +0100
Subject: [PATCH] New API calls isoburn_igopt_get_effective_lba_v2(),
 isoburn_igopt_get_data_start_v2()

---
 libisoburn/isoburn.c        | 41 +++++++++++++++++++++++++++++++++++--
 libisoburn/libisoburn.h     | 11 ++++++++++
 libisoburn/libisoburn.ver   |  2 ++
 xorriso/xorriso_timestamp.h |  2 +-
 4 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/libisoburn/isoburn.c b/libisoburn/isoburn.c
index 34c433bf..10f69f15 100644
--- a/libisoburn/isoburn.c
+++ b/libisoburn/isoburn.c
@@ -1502,20 +1502,57 @@ int isoburn_igopt_get_fifo_size(struct isoburn_imgen_opts *o, int *fifo_size)
 }
 
 
-int isoburn_igopt_get_effective_lba(struct isoburn_imgen_opts *o, int *lba)
+int isoburn_igopt_get_effective_lba_v2(struct isoburn_imgen_opts *o,
+                                       off_t *lba)
 {
  *lba= o->effective_lba;
  return(1);
 }
 
 
-int isoburn_igopt_get_data_start(struct isoburn_imgen_opts *o, int *lba)
+int isoburn_igopt_get_effective_lba(struct isoburn_imgen_opts *o, int *lba)
+{
+ int ret;
+ off_t long_lba;
+
+ ret= isoburn_igopt_get_effective_lba_v2(o, &long_lba);
+ if(ret <= 0)
+   return(ret);
+ if(long_lba > 0x7fffffff) {
+   *lba= 0x7fffffff;
+   ret= 0;
+ } else {
+   *lba= long_lba;
+ }
+ return(ret);
+}
+
+
+int isoburn_igopt_get_data_start_v2(struct isoburn_imgen_opts *o, off_t *lba)
 {
  *lba= o->data_start_lba;
  return(1);
 }
 
 
+int isoburn_igopt_get_data_start(struct isoburn_imgen_opts *o, int *lba)
+{
+ int ret;
+ off_t long_lba;
+
+ ret= isoburn_igopt_get_data_start_v2(o, &long_lba);
+ if(ret <= 0)
+   return(ret);
+ if(long_lba > 0x7fffffff) {
+   *lba= 0x7fffffff;
+   ret= 0;
+ } else {
+   *lba= long_lba;
+ }
+ return(ret);
+}
+
+
 int isoburn_igopt_set_scdbackup_tag(struct isoburn_imgen_opts *o, char *name,
                                     char *timestamp, char *tag_written)
 {
diff --git a/libisoburn/libisoburn.h b/libisoburn/libisoburn.h
index 27db8095..9db0ac77 100644
--- a/libisoburn/libisoburn.h
+++ b/libisoburn/libisoburn.h
@@ -1575,6 +1575,12 @@ int isoburn_igopt_get_fifo_size(struct isoburn_imgen_opts *o, int *fifo_size);
 */
 int isoburn_igopt_get_effective_lba(struct isoburn_imgen_opts *o, int *lba);
 
+/** Like isoburn_igopt_get_effective_lba(), but with off_t block addresses.
+    @since 1.5.8
+*/
+int isoburn_igopt_get_effective_lba_v2(struct isoburn_imgen_opts *o,
+                                       off_t *lba);
+
 
 /** Obtain after image preparation the lowest block address of file content
     data. Failure can occur if libisofs is too old to provide this information,
@@ -1589,6 +1595,11 @@ int isoburn_igopt_get_effective_lba(struct isoburn_imgen_opts *o, int *lba);
 */
 int isoburn_igopt_get_data_start(struct isoburn_imgen_opts *o, int *lba);
 
+/** Like isoburn_igopt_get_data_start(), but with off_t block addresses.
+    @since 1.5.8
+*/
+int isoburn_igopt_get_data_start_v2(struct isoburn_imgen_opts *o, off_t *lba);
+
 
 /** Set or get parameters "name" and "timestamp" for a scdbackup checksum
     tag. It will be appended to the libisofs session tag if the image starts at
diff --git a/libisoburn/libisoburn.ver b/libisoburn/libisoburn.ver
index b4813449..d383e6c7 100644
--- a/libisoburn/libisoburn.ver
+++ b/libisoburn/libisoburn.ver
@@ -365,6 +365,8 @@ local: *;
 
 LIBISOBURN1_1.5.8 {
 isoburn_get_mount_params_v2;
+isoburn_igopt_get_data_start_v2;
+isoburn_igopt_get_effective_lba_v2;
 isoburn_read_iso_head_v2;
 isoburn_toc_disc_get_sectors_v2;
 isoburn_toc_session_get_sectors_v2;
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 9e7b8f58..74ab377a 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2024.03.09.204838"
+#define Xorriso_timestamP "2024.03.09.210426"