gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fall back from failure in time a bit better

Browse Source
This commit is contained in:
ISSOtm
2020-01-30 02:07:55 +01:00
parent 93ee417567
commit e2e01e84fa
1 changed files with 33 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/asm/symbol.c
View File

@@ -716,7 +716,6 @@ void sym_SetExportAll(uint8_t set)
void sym_Init(void) void sym_Init(void)
{ {
int32_t i; int32_t i;
time_t now;
for (i = 0; i < MAXMACROARGS; i++) { for (i = 0; i < MAXMACROARGS; i++) {
currentmacroargs[i] = NULL; currentmacroargs[i] = NULL;
@@ -737,8 +736,15 @@ void sym_Init(void)
sym_AddSet("_RS", 0); sym_AddSet("_RS", 0);
now = time(NULL); time_t now = time(NULL);
if (now != (time_t)-1) {
if (now == (time_t)-1) {
warn("Couldn't determine current time");
/* Fall back by pretending we are at the Epoch */
now = 0;
}
const struct tm *time_utc = gmtime(&now);
const struct tm *time_local = localtime(&now); const struct tm *time_local = localtime(&now);
strftime(SavedTIME, sizeof(SavedTIME), "\"%H:%M:%S\"", strftime(SavedTIME, sizeof(SavedTIME), "\"%H:%M:%S\"",
@@ -749,47 +755,22 @@ void sym_Init(void)
sizeof(SavedTIMESTAMP_ISO8601_LOCAL), "\"%Y-%m-%dT%H-%M-%S%z\"", sizeof(SavedTIMESTAMP_ISO8601_LOCAL), "\"%Y-%m-%dT%H-%M-%S%z\"",
time_local); time_local);
const struct tm *time_utc = gmtime(&now);
strftime(SavedTIMESTAMP_ISO8601_UTC, strftime(SavedTIMESTAMP_ISO8601_UTC,
sizeof(SavedTIMESTAMP_ISO8601_UTC), "\"%Y-%m-%dT%H-%M-%SZ\"", sizeof(SavedTIMESTAMP_ISO8601_UTC), "\"%Y-%m-%dT%H-%M-%SZ\"",
time_utc); time_utc);
strftime(SavedDAY, sizeof(SavedDAY), "%d", time_utc);
strftime(SavedMONTH, sizeof(SavedMONTH), "%m", time_utc);
strftime(SavedYEAR, sizeof(SavedYEAR), "%Y", time_utc); strftime(SavedYEAR, sizeof(SavedYEAR), "%Y", time_utc);
strftime(SavedHOUR, sizeof(SavedHOUR), "%H", time_utc); /* This cannot start with zeros */
strftime(SavedMINUTE, sizeof(SavedMINUTE), "%M", time_utc); strftime(SavedMONTH, sizeof(SavedMONTH), "%m", time_utc);
strftime(SavedSECOND, sizeof(SavedSECOND), "%S", time_utc);
helper_RemoveLeadingZeros(SavedDAY);
helper_RemoveLeadingZeros(SavedMONTH); helper_RemoveLeadingZeros(SavedMONTH);
strftime(SavedDAY, sizeof(SavedDAY), "%d", time_utc);
helper_RemoveLeadingZeros(SavedDAY);
strftime(SavedHOUR, sizeof(SavedHOUR), "%H", time_utc);
helper_RemoveLeadingZeros(SavedHOUR); helper_RemoveLeadingZeros(SavedHOUR);
strftime(SavedMINUTE, sizeof(SavedMINUTE), "%M", time_utc);
helper_RemoveLeadingZeros(SavedMINUTE); helper_RemoveLeadingZeros(SavedMINUTE);
strftime(SavedSECOND, sizeof(SavedSECOND), "%S", time_utc);
helper_RemoveLeadingZeros(SavedSECOND); helper_RemoveLeadingZeros(SavedSECOND);
} else {
warnx("Couldn't determine current time.");
/*
* The '?' have to be escaped or they will be treated as
* trigraphs...
*/
snprintf(SavedTIME, sizeof(SavedTIME),
"\"\?\?:\?\?:\?\?\"");
snprintf(SavedDATE, sizeof(SavedDATE),
"\"\?\? \?\?\? \?\?\?\?\"");
snprintf(SavedTIMESTAMP_ISO8601_LOCAL,
sizeof(SavedTIMESTAMP_ISO8601_LOCAL),
"\"\?\?\?\?-\?\?-\?\?T\?\?:\?\?:\?\?+\?\?\?\?\"");
snprintf(SavedTIMESTAMP_ISO8601_UTC,
sizeof(SavedTIMESTAMP_ISO8601_UTC),
"\"\?\?\?\?-\?\?-\?\?T\?\?:\?\?:\?\?Z\"");
snprintf(SavedDAY, sizeof(SavedDAY), "1");
snprintf(SavedMONTH, sizeof(SavedMONTH), "1");
snprintf(SavedYEAR, sizeof(SavedYEAR), "1900");
snprintf(SavedHOUR, sizeof(SavedHOUR), "0");
snprintf(SavedMINUTE, sizeof(SavedMINUTE), "0");
snprintf(SavedSECOND, sizeof(SavedSECOND), "0");
}
sym_AddString("__TIME__", SavedTIME); sym_AddString("__TIME__", SavedTIME);
sym_AddString("__DATE__", SavedDATE); sym_AddString("__DATE__", SavedDATE);