From 7eb806d648328115aa272a7446a3aa709560a0fa Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Fri, 3 Oct 2025 11:37:48 +0200 Subject: [PATCH] Replaced new relaxation isoburn_igopt_rrip_tf_year0 by isoburn_igopt_rrip_tf_y1900 with contrary meaning. I.e. the default was changed. --- libisoburn/isoburn.c | 8 ++++---- libisoburn/isoburn.h | 6 +++--- libisoburn/libisoburn.h | 13 ++++++------- xorriso/xorriso_timestamp.h | 2 +- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/libisoburn/isoburn.c b/libisoburn/isoburn.c index 20befd5c..4f79b451 100644 --- a/libisoburn/isoburn.c +++ b/libisoburn/isoburn.c @@ -442,7 +442,7 @@ int isoburn_make_iso_write_opts(struct isoburn *out_o, iso_write_opts_set_joliet_utf16(wopts, opts->joliet_utf16); iso_write_opts_set_always_gmt(wopts, opts->always_gmt); iso_write_opts_set_rrip_tf_long(wopts, opts->rrip_tf_long); - iso_write_opts_set_rrip_tf_year0(wopts, opts->rrip_tf_year0); + iso_write_opts_set_rrip_tf_y1900(wopts, opts->rrip_tf_y1900); iso_write_opts_set_rrip_version_1_10(wopts, opts->rrip_version_1_10); rec_mtime= 0; if(opts->dir_rec_mtime) @@ -1193,7 +1193,7 @@ int isoburn_igopt_new(struct isoburn_imgen_opts **new_o, int flag) o->joliet_utf16= 0; o->always_gmt= 0; o->rrip_tf_long= 0; - o->rrip_tf_year0= 0; + o->rrip_tf_y1900= 0; o->rrip_version_1_10= 0; o->dir_rec_mtime= 0; o->aaip_susp_1_10= 0; @@ -1339,7 +1339,7 @@ int isoburn_igopt_set_relaxed(struct isoburn_imgen_opts *o, int relax) o->allow_7bit_ascii= !!(relax & isoburn_igopt_allow_7bit_ascii); o->joliet_utf16= !!(relax & isoburn_igopt_joliet_utf16); o->rrip_tf_long= !!(relax & isoburn_igopt_rrip_tf_long); - o->rrip_tf_year0= !!(relax & isoburn_igopt_rrip_tf_year0); + o->rrip_tf_y1900= !!(relax & isoburn_igopt_rrip_tf_y1900); return(1); } @@ -1361,7 +1361,7 @@ int isoburn_igopt_get_relaxed(struct isoburn_imgen_opts *o, int *relax) ((!!o->allow_full_ascii) << 18) | ((!!o->joliet_utf16) << 19) | ((!!o->rrip_tf_long) << 20) | - ((!!o->rrip_tf_year0) << 21); + ((!!o->rrip_tf_y1900) << 21); return(1); } diff --git a/libisoburn/isoburn.h b/libisoburn/isoburn.h index ec2b0436..905d1bac 100644 --- a/libisoburn/isoburn.h +++ b/libisoburn/isoburn.h @@ -581,11 +581,11 @@ struct isoburn_imgen_opts { unsigned int rrip_tf_long :1; /** - * Enable writing of time values before year 1900 AD in RRIP field TF. - * If enabled, then dates down to the begin of year 0 (= 1 BC) can be + * Curb writing of old time values in RRIP field TF to year 1900 AD. + * If disabled, then dates down to the begin of year 0 (= 1 BC) can be * written into the Rock Ridge data. */ - unsigned int rrip_tf_year0 :1; + unsigned int rrip_tf_y1900 :1; /** * Write Rock Ridge info as of specification RRIP-1.10 rather than diff --git a/libisoburn/libisoburn.h b/libisoburn/libisoburn.h index 9ac61b5f..d5ca64a0 100644 --- a/libisoburn/libisoburn.h +++ b/libisoburn/libisoburn.h @@ -1470,13 +1470,12 @@ int isoburn_igopt_get_extensions(struct isoburn_imgen_opts *o, int *ext); to individual nodes if one of their timestamps is after 01 Jan 2150 UTC. (libisofs might get changed to support 7-byte timestamps up to end of 2155.) - bit21= rrip_tf_year0 - Enable writing of time values before year 1900 AD in RRIP - field TF. If enabled, then dates down to the begin of + bit21= rrip_tf_y1900 + Curb writing of old time values in RRIP field TF to year + 1900 AD. If not curbed, then dates down to the begin of year 0 (= 1 BC) can be written into the Rock Ridge data. - This is not default, because Linux up to at least version 6.16 - misrepresents times before year 1900 as - Jan 1 1970 00:00:00 UTC. + Note that Linux up to at least version 6.16 misrepresents + times before year 1900 as Jan 1 1970 00:00:00 UTC. @return 1 success, <=0 failure */ #define isoburn_igopt_omit_version_numbers 1 @@ -1500,7 +1499,7 @@ int isoburn_igopt_get_extensions(struct isoburn_imgen_opts *o, int *ext); #define isoburn_igopt_allow_7bit_ascii 0x40000 #define isoburn_igopt_joliet_utf16 0x80000 #define isoburn_igopt_rrip_tf_long 0x100000 -#define isoburn_igopt_rrip_tf_year0 0x200000 +#define isoburn_igopt_rrip_tf_y1900 0x200000 int isoburn_igopt_set_relaxed(struct isoburn_imgen_opts *o, int relax); int isoburn_igopt_get_relaxed(struct isoburn_imgen_opts *o, int *relax); diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index 81c69f57..c6182000 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2025.09.16.191504" +#define Xorriso_timestamP "2025.10.03.093556"