mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-21 12:32:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

fsdev: Convert time into proper POSIX UTC timestamps (FS reports local time instead)

Browse Source
This commit is contained in:
fincs 2019-09-22 18:14:10 +02:00
parent c3f0210cf6
commit b30b567228
No known key found for this signature in database
GPG Key ID: 62C7609ADA219C60
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
nx/source/runtime/devices/fs_dev.c
View File

@ -7,10 +7,12 @@
#include <sys/iosupport.h> #include <sys/iosupport.h>
#include <sys/param.h> #include <sys/param.h>
#include <unistd.h> #include <unistd.h>
#include <time.h>
#include "runtime/devices/fs_dev.h" #include "runtime/devices/fs_dev.h"
#include "runtime/util/utf.h" #include "runtime/util/utf.h"
#include "services/fs.h" #include "services/fs.h"
#include "services/time.h"
/*! @internal /*! @internal
@ -256,6 +258,28 @@ static ssize_t fsdev_convertfromfspath(uint8_t *out, uint8_t *in, size_t len)
return strnlen((char*)out, len); return strnlen((char*)out, len);
} }
static time_t fsdev_converttimetoutc(u64 timestamp)
{
// Parse timestamp into y/m/d h:m:s
time_t posixtime = (time_t)timestamp;
struct tm *t = gmtime(&posixtime);
// Convert time/date into an actual UTC POSIX timestamp using the system's timezone rules
TimeCalendarTime caltime;
caltime.year = 1900 + t->tm_year;
caltime.month = 1 + t->tm_mon;
caltime.day = t->tm_mday;
caltime.hour = t->tm_hour;
caltime.minute = t->tm_min;
caltime.second = t->tm_sec;
u64 new_timestamp;
Result rc = timeToPosixTimeWithMyRule(&caltime, &new_timestamp, 1, NULL);
if (R_SUCCEEDED(rc))
posixtime = (time_t)new_timestamp;
return posixtime;
}
extern int __system_argc; extern int __system_argc;
extern char** __system_argv; extern char** __system_argv;
@ -965,9 +989,9 @@ fsdev_fstat(struct _reent *r,
if(file->timestamps.is_valid) if(file->timestamps.is_valid)
{ {
st->st_ctime = file->timestamps.created; st->st_ctime = fsdev_converttimetoutc(file->timestamps.created);
st->st_mtime = file->timestamps.modified; st->st_mtime = fsdev_converttimetoutc(file->timestamps.modified);
st->st_atime = file->timestamps.accessed; st->st_atime = fsdev_converttimetoutc(file->timestamps.accessed);
} }
return 0; return 0;
@ -1030,9 +1054,9 @@ fsdev_stat(struct _reent *r,
rc = fsFsGetFileTimeStampRaw(&device->fs, fs_path, &timestamps); rc = fsFsGetFileTimeStampRaw(&device->fs, fs_path, &timestamps);
if(R_SUCCEEDED(rc) && timestamps.is_valid) if(R_SUCCEEDED(rc) && timestamps.is_valid)
{ {
st->st_ctime = timestamps.created; st->st_ctime = fsdev_converttimetoutc(timestamps.created);
st->st_mtime = timestamps.modified; st->st_mtime = fsdev_converttimetoutc(timestamps.modified);
st->st_atime = timestamps.accessed; st->st_atime = fsdev_converttimetoutc(timestamps.accessed);
} }
} }