gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make os.date() thread-safe.

Browse Source
This commit is contained in:
Mike Pall 2012-06-28 15:47:16 +02:00
parent a751c8a5b5
commit a6458ce4de
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib_os.c
View File

@ -167,13 +167,24 @@ LJLIB_CF(os_date)
const char *s = luaL_optstring(L, 1, "%c"); const char *s = luaL_optstring(L, 1, "%c");
time_t t = luaL_opt(L, (time_t)luaL_checknumber, 2, time(NULL)); time_t t = luaL_opt(L, (time_t)luaL_checknumber, 2, time(NULL));
struct tm *stm; struct tm *stm;
#if LJ_TARGET_POSIX
struct tm rtm;
#endif
if (*s == '!') { /* UTC? */ if (*s == '!') { /* UTC? */
s++; /* Skip '!' */
#if LJ_TARGET_POSIX
stm = gmtime_r(&t, &rtm);
#else
stm = gmtime(&t); stm = gmtime(&t);
s++; /* skip `!' */ #endif
} else { } else {
#if LJ_TARGET_POSIX
stm = localtime_r(&t, &rtm);
#else
stm = localtime(&t); stm = localtime(&t);
#endif
} }
if (stm == NULL) { /* invalid date? */ if (stm == NULL) { /* Invalid date? */
setnilV(L->top-1); setnilV(L->top-1);
} else if (strcmp(s, "*t") == 0) { } else if (strcmp(s, "*t") == 0) {
lua_createtable(L, 0, 9); /* 9 = number of fields */ lua_createtable(L, 0, 9); /* 9 = number of fields */
@ -192,11 +203,11 @@ LJLIB_CF(os_date)
cc[0] = '%'; cc[2] = '\0'; cc[0] = '%'; cc[2] = '\0';
luaL_buffinit(L, &b); luaL_buffinit(L, &b);
for (; *s; s++) { for (; *s; s++) {
if (*s != '%' || *(s + 1) == '\0') { /* no conversion specifier? */ if (*s != '%' || *(s + 1) == '\0') { /* No conversion specifier? */
luaL_addchar(&b, *s); luaL_addchar(&b, *s);
} else { } else {
size_t reslen; size_t reslen;
char buff[200]; /* should be big enough for any conversion result */ char buff[200]; /* Should be big enough for any conversion result. */
cc[1] = *(++s); cc[1] = *(++s);
reslen = strftime(buff, sizeof(buff), cc, stm); reslen = strftime(buff, sizeof(buff), cc, stm);
luaL_addlstring(&b, buff, reslen); luaL_addlstring(&b, buff, reslen);