Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dosfstools: refresh patches

Browse source 
Signed-off-by: David Bauer <mail@david-bauer.net>
This commit is contained in:
David Bauer 2023-01-16 18:25:40 +01:00
parent 26c095cb4d
commit 8292537e90
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tools/dosfstools/patches/source-date-epoch.patch
View file

@ -19,8 +19,6 @@ Signed-off-by: Bjørn Forsman <bjorn.forsman@gmail.com>
src/mkfs.fat.c | 19 ++++++++++++++++--- src/mkfs.fat.c | 19 ++++++++++++++++---
3 files changed, 53 insertions(+), 7 deletions(-) 3 files changed, 53 insertions(+), 7 deletions(-)
diff --git a/src/boot.c b/src/boot.c
index 4de450d..8f78e1c 100644
--- a/src/boot.c --- a/src/boot.c
+++ b/src/boot.c +++ b/src/boot.c
@@ -33,6 +33,8 @@ @@ -33,6 +33,8 @@
@ -32,7 +30,7 @@ index 4de450d..8f78e1c 100644
#include "common.h" #include "common.h"
#include "fsck.fat.h" #include "fsck.fat.h"
@@ -672,6 +674,7 @@ void write_volume_label(DOS_FS * fs, char *label) @@ -672,6 +674,7 @@ void write_volume_label(DOS_FS * fs, cha
{ {
time_t now; time_t now;
struct tm *mtime; struct tm *mtime;
@ -40,7 +38,7 @@ index 4de450d..8f78e1c 100644
off_t offset; off_t offset;
int created; int created;
DIR_ENT de; DIR_ENT de;
@@ -687,8 +690,24 @@ void write_volume_label(DOS_FS * fs, char *label) @@ -687,8 +690,24 @@ void write_volume_label(DOS_FS * fs, cha
if (de.name[0] == 0xe5) if (de.name[0] == 0xe5)
de.name[0] = 0x05; de.name[0] = 0x05;
@ -67,8 +65,6 @@ index 4de450d..8f78e1c 100644
if (mtime && mtime->tm_year >= 80 && mtime->tm_year <= 207) { if (mtime && mtime->tm_year >= 80 && mtime->tm_year <= 207) {
de.time = htole16((unsigned short)((mtime->tm_sec >> 1) + de.time = htole16((unsigned short)((mtime->tm_sec >> 1) +
(mtime->tm_min << 5) + (mtime->tm_min << 5) +
diff --git a/src/common.c b/src/common.c
index 6a2e396..4f1afcb 100644
--- a/src/common.c --- a/src/common.c
+++ b/src/common.c +++ b/src/common.c
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
@ -83,10 +79,9 @@ index 6a2e396..4f1afcb 100644
uint32_t generate_volume_id(void) uint32_t generate_volume_id(void)
{ {
struct timeval now; struct timeval now;
-
- if (gettimeofday(&now, NULL) != 0 || now.tv_sec == (time_t)-1 || now.tv_sec < 0) {
+ char *source_date_epoch = NULL; + char *source_date_epoch = NULL;
+
- if (gettimeofday(&now, NULL) != 0 || now.tv_sec == (time_t)-1 || now.tv_sec < 0) {
+ source_date_epoch = getenv("SOURCE_DATE_EPOCH"); + source_date_epoch = getenv("SOURCE_DATE_EPOCH");
+ if (source_date_epoch) { + if (source_date_epoch) {
+ char *tmp = NULL; + char *tmp = NULL;
@ -103,8 +98,6 @@ index 6a2e396..4f1afcb 100644
srand(getpid()); srand(getpid());
/* rand() returns int from [0,RAND_MAX], therefore only 31 bits */ /* rand() returns int from [0,RAND_MAX], therefore only 31 bits */
return (((uint32_t)(rand() & 0xFFFF)) << 16) | ((uint32_t)(rand() & 0xFFFF)); return (((uint32_t)(rand() & 0xFFFF)) << 16) | ((uint32_t)(rand() & 0xFFFF));
diff --git a/src/mkfs.fat.c b/src/mkfs.fat.c
index 37fc8ff..1948635 100644
--- a/src/mkfs.fat.c --- a/src/mkfs.fat.c
+++ b/src/mkfs.fat.c +++ b/src/mkfs.fat.c
@@ -1074,7 +1074,7 @@ static void setup_tables(void) @@ -1074,7 +1074,7 @@ static void setup_tables(void)
@ -154,4 +147,4 @@ index 37fc8ff..1948635 100644
+ +
volume_id = generate_volume_id(); volume_id = generate_volume_id();
check_atari(); check_atari();