diff --git a/src/g_demo.c b/src/g_demo.c index d39bbaec7..93128fca7 100644 --- a/src/g_demo.c +++ b/src/g_demo.c @@ -63,7 +63,6 @@ // for replay dates #include -#include // menu demo things UINT32 demoDelayTime = 15*TICRATE; @@ -2387,7 +2386,9 @@ void G_LoadDemoInfo(menudemo_t *pdemo) #if defined (_WIN32) // return the file creation time // useful for demos that were renamed -static long G_GetCreationTime(char *filepath) +// windows only, as file creation times are +// very unreliable (or non existant depending on fs) on linux +static time_t G_GetCreationTime(char *filepath) { struct stat fileinfo; @@ -2398,35 +2399,24 @@ static long G_GetCreationTime(char *filepath) } #endif -static char *G_GetDemoDate(menudemo_t *pdemo) +static char *G_GetDemoDate(menudemo_t *pdemo, const char *dateformat) { char *endPos = NULL; - static char datetime[11]; + char *datetime; time_t file_time = 0; - const char *format = NULL; - struct tm *tm_buf = NULL; + struct tm tm_buf; CLEANUP(pfree) char *filename = NULL; // get le filepath filename = strdup(pdemo->filepath); if (!filename) - { -#if defined (_WIN32) - // if we cant get a filename try just getting the file creation time - file_time = G_GetCreationTime(pdemo->filepath); - goto skipfilenametime; -#else return NULL; -#endif - } // get the actual filename Zzz... nameonly(filename); - // the first 10 characters of a replay name usually is a unix timestamp - - // not long enough to contain a valid timestamp + // the first 10 characters of a replay name is a unix timestamp if (strlen(filename) < 10) { #if defined (_WIN32) @@ -2458,67 +2448,49 @@ static char *G_GetDemoDate(menudemo_t *pdemo) #endif } -#if defined (_WIN32) -skipfilenametime: -#endif - // then throw it into localtime to get an actual human readable format lmao - tm_buf = localtime(&file_time); - - // cant believe we ended up in 1970 - if (tm_buf == NULL || tm_buf->tm_year <= 110) +#if defined(_WIN32) +skipfilenametime: + if ((localtime_s(&tm_buf, &file_time) != 0) || + (tm_buf.tm_year <= 110)) // cant believe we ended up in 1970 { -#if defined (_WIN32) // uh ohh, we got an invalid time // try one more time getting the creation time file_time = G_GetCreationTime(pdemo->filepath); - tm_buf = localtime(&file_time); - if (tm_buf == NULL || tm_buf->tm_year <= 110) + if ((localtime_s(&tm_buf, &file_time) != 0) || + (tm_buf.tm_year <= 110)) return NULL; - - goto gotcreationtime; + } #else + if ((localtime_r(&file_time, &tm_buf) == NULL) || + (tm_buf.tm_year <= 110)) // cant believe we ended up in 1970 return NULL; #endif - } -#if defined (_WIN32) -gotcreationtime: -#endif + datetime = malloc(sizeof(pdemo->date)); // mallocma balls - // US ppl are special (: - if (cv_demodateformat.value == 2) - format = "%m.%d.%Y"; - else if (cv_demodateformat.value == 1) - format = "%d.%m.%Y"; - else - { - const char *locale = setlocale(LC_TIME, NULL); + // no mallocma balls... :c + if (!datetime) + return NULL; - if (locale == NULL) - format = "%d.%m.%Y"; // fallback to non US format - else if (strstr(locale, "en_US")) - format = "%m.%d.%Y"; - else - format = "%d.%m.%Y"; - } - - if (strftime(datetime, sizeof(datetime), format, tm_buf) == 0) + if (strftime(datetime, sizeof(datetime), dateformat, &tm_buf) == 0) { + free(datetime); return NULL; } return datetime; } -void G_LoadDemoTitle(menudemo_t *pdemo) +void G_LoadDemoTitle(menudemo_t *pdemo, const char *dateformat) { UINT8 infobuffer[96], *info_p; UINT16 pdemoversion; - char *demodate = NULL; size_t count; + memset(pdemo->date, 0, sizeof(pdemo->date)); + FILE *handle = fopen(pdemo->filepath, "rb"); if (!handle) @@ -2546,8 +2518,6 @@ void G_LoadDemoTitle(menudemo_t *pdemo) pdemoversion = READUINT16(info_p); - memset(pdemo->date, 0, sizeof(pdemo->date)); - switch (pdemoversion) { case DEMOVERSION: // latest always supported @@ -2555,13 +2525,12 @@ void G_LoadDemoTitle(menudemo_t *pdemo) memcpy(pdemo->title, info_p, 64); // demo date - demodate = G_GetDemoDate(pdemo); - + char *demodate = G_GetDemoDate(pdemo, dateformat); if (demodate) { strlcpy(pdemo->date, demodate, sizeof(pdemo->date)); + free(demodate); } - break; #ifdef DEMO_COMPAT_100 case 0x0001: diff --git a/src/g_demo.h b/src/g_demo.h index 280185ce6..d880f3038 100644 --- a/src/g_demo.h +++ b/src/g_demo.h @@ -98,7 +98,7 @@ void G_SetDemoTime(UINT32 ptime, UINT32 plap); UINT8 G_CmpDemoTime(char *oldname, char *newname); void G_LoadDemoInfo(menudemo_t *pdemo); -void G_LoadDemoTitle(menudemo_t *pdemo); // For use in replay search feature +void G_LoadDemoTitle(menudemo_t *pdemo, const char *dateformat); // For use in replay search feature void G_DeferedPlayDemo(const char *demo); typedef enum diff --git a/src/m_menu.c b/src/m_menu.c index 2c8a625ad..19c70a731 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -3989,6 +3989,10 @@ boolean replaynamesloaded = false; // If it's not equal, that means we started more than one thread (left and re-entered menu for example) size_t replaythreadnum = 0; +// for replay dates +#include +const char *demodateformat = "%d.%m.%Y"; + #ifdef HAVE_THREADS I_mutex replayquerymutex; @@ -4025,6 +4029,7 @@ static void ReplayNamesLoadThread(void* userdata) menudemo_t *demolist_all_local = (menudemo_t*)malloc(sizeof(menudemo_t)*demolist_all_size_local); memcpy(demolist_all_local, demolist_all, sizeof(menudemo_t)*demolist_all_size_local); size_t localreplaythreadnum = replaythreadnum; + const char *localdemodateformat = demodateformat; Unlock_search_state(); @@ -4032,13 +4037,7 @@ static void ReplayNamesLoadThread(void* userdata) { if (demolist_all_local[i].type != MD_SUBDIR) { - G_LoadDemoTitle(&demolist_all_local[i]); - - // this is fucking horrid, but i wanna be able to search for dates - /*if (demolist_all_local[i].date[0] != '\0') - { - snprintf(demolist_all_local[i].title, sizeof(demolist_all_local[i].title), "%s %s", demolist_all_local[i].title, demolist_all_local[i].date); - }*/ + G_LoadDemoTitle(&demolist_all_local[i], localdemodateformat); } } @@ -4061,6 +4060,18 @@ static void LoadReplayNames(void) Lock_search_state(); replaythreadnum++; replaynamesloaded = false; + if (cv_demodateformat.value == 2) + demodateformat = "%m.%d.%Y"; + else if (cv_demodateformat.value == 1) + demodateformat = "%d.%m.%Y"; + else + { + // get the date format here + // setlocale reads/writes global state + const char *locale = setlocale(LC_TIME, NULL); + // US ppl are special (: + demodateformat = (locale && strstr(locale, "en_US")) ? "%m.%d.%Y" : "%d.%m.%Y"; + } Unlock_search_state(); #ifdef HAVE_THREADS