mirror of
https://github.com/s3fs-fuse/s3fs-fuse.git
synced 2024-11-10 23:00:57 +00:00
Merge pull request #1101 from gaul/gmtime
Avoid race when using thread-unsafe gmtime
This commit is contained in:
commit
0afef077ed
@ -234,7 +234,8 @@ string get_date_rfc850()
|
|||||||
{
|
{
|
||||||
char buf[100];
|
char buf[100];
|
||||||
time_t t = time(NULL);
|
time_t t = time(NULL);
|
||||||
strftime(buf, sizeof(buf), "%a, %d %b %Y %H:%M:%S GMT", gmtime(&t));
|
struct tm res;
|
||||||
|
strftime(buf, sizeof(buf), "%a, %d %b %Y %H:%M:%S GMT", gmtime_r(&t, &res));
|
||||||
return buf;
|
return buf;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -248,14 +249,16 @@ void get_date_sigv3(string& date, string& date8601)
|
|||||||
string get_date_string(time_t tm)
|
string get_date_string(time_t tm)
|
||||||
{
|
{
|
||||||
char buf[100];
|
char buf[100];
|
||||||
strftime(buf, sizeof(buf), "%Y%m%d", gmtime(&tm));
|
struct tm res;
|
||||||
|
strftime(buf, sizeof(buf), "%Y%m%d", gmtime_r(&tm, &res));
|
||||||
return buf;
|
return buf;
|
||||||
}
|
}
|
||||||
|
|
||||||
string get_date_iso8601(time_t tm)
|
string get_date_iso8601(time_t tm)
|
||||||
{
|
{
|
||||||
char buf[100];
|
char buf[100];
|
||||||
strftime(buf, sizeof(buf), "%Y%m%dT%H%M%SZ", gmtime(&tm));
|
struct tm res;
|
||||||
|
strftime(buf, sizeof(buf), "%Y%m%dT%H%M%SZ", gmtime_r(&tm, &res));
|
||||||
return buf;
|
return buf;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user