octoleo
/
s3fs-fuse
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #909 from ggtakec/master 

Ignore after period character of floating point in x-amz-meta-mtime
This commit is contained in:
Takeshi Nakatani 2019-01-20 17:58:55 +09:00 committed by GitHub
parent 1d4867830b f2184e34dd
commit 5292fa74d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/s3fs_util.cpp
View File

@ -748,9 +748,23 @@ bool delete_files_in_dir(const char* dir, bool is_remove_own)
//-------------------------------------------------------------------
// Utility functions for convert
//-------------------------------------------------------------------
time_t get_mtime(const char *s)
time_t get_mtime(const char *str)
{
return static_cast<time_t>(s3fs_strtoofft(s));
// [NOTE]
// In rclone, there are cases where ns is set to x-amz-meta-mtime
// with floating point number. s3fs uses x-amz-meta-mtime by
// truncating the floating point or less (in seconds or less) to
// correspond to this.
//
string strmtime("");
if(str && '\0' != *str){
strmtime = str;
string::size_type pos = strmtime.find('.', 0);
if(string::npos != pos){
strmtime = strmtime.substr(0, pos);
}
}
return static_cast<time_t>(s3fs_strtoofft(strmtime.c_str()));
}
static time_t get_time(headers_t& meta, bool overcheck, const char *header)