From c5c9d4e7bfaf35ef347abe8d5410b2765c4a05ce Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sun, 7 Aug 2016 10:48:03 +0200 Subject: [PATCH] Setting Ecma119Image.now to maximum of effective olume creation date and volume modification date. --- libisofs/ecma119.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/libisofs/ecma119.c b/libisofs/ecma119.c index d584dcc..dad1398 100644 --- a/libisofs/ecma119.c +++ b/libisofs/ecma119.c @@ -2320,6 +2320,48 @@ ex:; return ret; } +/* Determine the alleged time of image production by predicting the volume + creation and modification timestamps and taking the maximum of both. +*/ +static +void ecma119_determine_now_time(Ecma119Image *target) +{ + IsoWriteOpts *o; + time_t now = 0, t, t0; + uint8_t time_text[18]; + int i; + + t0 = time(NULL); + o = target->opts; + if (o->vol_uuid[0]) { + for(i = 0; i < 16; i++) + if(o->vol_uuid[i] < '0' || o->vol_uuid[i] > '9') + break; + else + time_text[i] = o->vol_uuid[i]; + for(; i < 16; i++) + time_text[i] = '1'; + time_text[16] = time_text[17] = 0; + t = iso_datetime_read_17(time_text); + if (t > now) + now = t; + } else { + if (o->vol_creation_time > 0) { + if (o->vol_creation_time > now) + now = o->vol_creation_time; + } else if (t0 > now) { + now = t0; + } + if (o->vol_modification_time > 0) { + if (o->vol_modification_time > now) + now = o->vol_modification_time; + } else if (t0 > now) { + now = t0; + } + } + target->now = now; +} + static int ecma119_image_new(IsoImage *src, IsoWriteOpts *in_opts, Ecma119Image **img) { @@ -2375,7 +2417,7 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *in_opts, Ecma119Image **img) target->dir_mode = opts->replace_dir_mode == 2 ? opts->dir_mode : 0555; target->file_mode = opts->replace_file_mode == 2 ? opts->file_mode : 0444; - target->now = time(NULL); + ecma119_determine_now_time(target); target->replace_timestamps = opts->replace_timestamps ? 1 : 0; target->timestamp = opts->replace_timestamps == 2 ?