libburnia/libisofs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New API call iso_write_opts_set_rrip_tf_year0()

Browse Source
This commit is contained in:
Thomas Schmitt
2025-09-16 20:46:49 +02:00
parent 21cd286cd4
commit 1447b1a022
7 changed files with 63 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libisofs/ecma119.c
View File

@@ -4428,6 +4428,15 @@ int iso_write_opts_set_rrip_tf_long(IsoWriteOpts *opts, int enable)
return ISO_SUCCESS;
}
int iso_write_opts_set_rrip_tf_year0(IsoWriteOpts *opts, int enable)
{
if (opts == NULL) {
return ISO_NULL_POINTER;
}
opts->rrip_tf_year0 = enable ? 1 : 0;
return ISO_SUCCESS;
}
int iso_write_opts_set_aaip_susp_1_10(IsoWriteOpts *opts, int oldvers)
{
if (opts == NULL) {

7
libisofs/ecma119.h
View File

@@ -221,6 +221,13 @@ struct iso_write_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
* written into the Rock Ridge data.
*/
unsigned int rrip_tf_year0 :1;
/**
* See iso_write_opts_set_hardlinks()
*/

12
libisofs/libisofs.h
View File

@@ -1890,6 +1890,18 @@ int iso_write_opts_set_rrip_1_10_px_ino(IsoWriteOpts *opts, int enable);
*/
int iso_write_opts_set_rrip_tf_long(IsoWriteOpts *opts, int enable);
/**
* Enable writing of time values before year 1900 AD in RRIP field TF.
* Without this call or with enable==0, such values will be defaulted to
* Jan 1 1900 UTC because Linux up to at least version 6.16 misrepresents times
* before year 1900 as Jan 1 1970 00:00:00 UTC.
* If enabled, then dates down to the begin of year 0 (= 1 BC) can be written
* into the Rock Ridge data.
*
* @since 1.5.8
*/
int iso_write_opts_set_rrip_tf_year0(IsoWriteOpts *opts, int enable);
/**
* Write AAIP as extension according to SUSP 1.10 rather than SUSP 1.12.
* I.e. without announcing it by an ER field and thus without the need

1
libisofs/libisofs.ver
View File

@@ -401,5 +401,6 @@ iso_util_get_effective_lfa_mask;
iso_util_get_lfa_masks;
iso_write_opts_set_gpt_with_gaps;
iso_write_opts_set_rrip_tf_long;
iso_write_opts_set_rrip_tf_year0;
} LIBISOFS6;

39
libisofs/rockridge.c
View File

@@ -218,6 +218,7 @@ int rrip_add_TF(Ecma119Image *t, Ecma119Node *n, struct susp_info *susp,
IsoNode *iso;
uint8_t *TF;
int len;
time_t node_time;
if (n->rrip_tf_long) {
len = ISO_TF_LONG_SIZE;
@@ -237,15 +238,27 @@ int rrip_add_TF(Ecma119Image *t, Ecma119Node *n, struct susp_info *susp,
iso = n->node;
if (n->rrip_tf_long) {
node_time= iso->mtime;
if ((!t->opts->rrip_tf_year0) &&
node_time < ISO_RR_SHORT_FORM_TIME_START)
node_time= ISO_RR_SHORT_FORM_TIME_START;
iso_datetime_17(&TF[5],
t->replace_timestamps ? t->timestamp : iso->mtime,
t->opts->always_gmt);
t->replace_timestamps ? t->timestamp : node_time,
t->opts->always_gmt);
node_time= iso->atime;
if ((!t->opts->rrip_tf_year0) &&
node_time < ISO_RR_SHORT_FORM_TIME_START)
node_time= ISO_RR_SHORT_FORM_TIME_START;
iso_datetime_17(&TF[5 + 17],
t->replace_timestamps ? t->timestamp : iso->atime,
t->opts->always_gmt);
t->replace_timestamps ? t->timestamp : node_time,
t->opts->always_gmt);
node_time= iso->ctime;
if ((!t->opts->rrip_tf_year0) &&
node_time < ISO_RR_SHORT_FORM_TIME_START)
node_time= ISO_RR_SHORT_FORM_TIME_START;
iso_datetime_17(&TF[5 + 2 * 17],
t->replace_timestamps ? t->timestamp : iso->ctime,
t->opts->always_gmt);
t->replace_timestamps ? t->timestamp : node_time,
t->opts->always_gmt);
} else {
iso_datetime_7(&TF[5],
t->replace_timestamps ? t->timestamp : iso->mtime,
@@ -1537,12 +1550,18 @@ void iso_decide_rrip_tf_form(Ecma119Image *t, Ecma119Node *n)
} else {
iso_node= n->node;
if (sizeof(iso_node->atime) > 4) {
/* Check [acm]time for (nearly) year 2156 or later */
if (iso_node->atime > ISO_RR_SHORT_FORM_TIME_LIMIT) {
/* Check [acm]time for year 1900 and (nearly) year 2156 */
if (iso_node->atime > ISO_RR_SHORT_FORM_TIME_LIMIT ||
(iso_node->atime < ISO_RR_SHORT_FORM_TIME_START &&
t->opts->rrip_tf_year0)) {
n->rrip_tf_long = 1;
} else if (iso_node->ctime > ISO_RR_SHORT_FORM_TIME_LIMIT) {
} else if (iso_node->ctime > ISO_RR_SHORT_FORM_TIME_LIMIT ||
(iso_node->ctime < ISO_RR_SHORT_FORM_TIME_START &&
t->opts->rrip_tf_year0)) {
n->rrip_tf_long = 1;
} else if (iso_node->mtime > ISO_RR_SHORT_FORM_TIME_LIMIT) {
} else if (iso_node->mtime > ISO_RR_SHORT_FORM_TIME_LIMIT ||
(iso_node->mtime < ISO_RR_SHORT_FORM_TIME_START &&
t->opts->rrip_tf_year0)) {
n->rrip_tf_long = 1;
}
}

3
libisofs/rockridge.h
View File

@@ -95,6 +95,9 @@ struct susp_info
*/
#define ISO_RR_SHORT_FORM_TIME_LIMIT 5680281600
/* Lower limit for use of 7-byte time form: 01 Jan 1900 00:00:00 UTC
*/
#define ISO_RR_SHORT_FORM_TIME_START -2208988800
/* SUSP 5.1 */
struct susp_CE {

4
libisofs/util.c
View File

@@ -1674,8 +1674,8 @@ void iso_datetime_17(unsigned char *buf, time_t t, int always_gmt)
tzoffset = 0;
}
if (tm.tm_year <= -1900) {
strcpy((char *) buf, "00010101000000");
if (tm.tm_year < -1900) {
strcpy((char *) buf, "00000101000000");
} else if (tm.tm_year >= 8100) {
strcpy((char *) buf, "99991231235959");
} else {