mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3163 from akallabeth/set_file_time

Browse Source 
Implemented SetFileTime
This commit is contained in:
Martin Fleisz 2016-03-02 09:43:46 +01:00
commit 857c37393b
8 changed files with 154 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/android-build-freerdp.sh
View File

@ -80,6 +80,7 @@ fi
common_run mkdir -p $BUILD_SRC
CMAKE_CMD_ARGS="-DANDROID_NDK=$ANDROID_NDK \
-DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} \
-DCMAKE_TOOLCHAIN_FILE=$SRC_DIR/cmake/AndroidToolchain.cmake \
-DCMAKE_INSTALL_PREFIX=$BUILD_DST \
-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \

3
scripts/android-build.conf
View File

@ -4,10 +4,11 @@
SCRIPT_PATH=$(dirname "${BASH_SOURCE[0]}")
SCRIPT_PATH=$(realpath "$SCRIPT_PATH")
WITH_JPEG=1
WITH_JPEG=0
WITH_OPENH264=1
WITH_OPENSSL=1
BUILD_DEPS=1
ANDROID_NATIVE_API_LEVEL=android-12
JPEG_TAG=master
OPENH264_TAG=v1.5.0

3
winpr/include/winpr/file.h
View File

@ -288,6 +288,9 @@ WINPR_API BOOL UnlockFile(HANDLE hFile, DWORD dwFileOffsetLow, DWORD dwFileOffse
WINPR_API BOOL UnlockFileEx(HANDLE hFile, DWORD dwReserved, DWORD nNumberOfBytesToUnlockLow,
DWORD nNumberOfBytesToUnlockHigh, LPOVERLAPPED lpOverlapped);
WINPR_API BOOL SetFileTime(HANDLE hFile, const FILETIME *lpCreationTime,
const FILETIME *lpLastAccessTime, const FILETIME *lpLastWriteTime);
WINPR_API HANDLE FindFirstFileA(LPCSTR lpFileName, LPWIN32_FIND_DATAA lpFindFileData);
WINPR_API HANDLE FindFirstFileW(LPCWSTR lpFileName, LPWIN32_FIND_DATAW lpFindFileData);

116
winpr/libwinpr/file/file.c
View File

@ -40,6 +40,8 @@
#include <errno.h>
#include <fcntl.h>
#include <sys/file.h>
#include <sys/stat.h>
#include <sys/time.h>
static BOOL FileIsHandled(HANDLE handle)
{
@ -346,6 +348,113 @@ static BOOL FileUnlockFileEx(HANDLE hFile, DWORD dwReserved, DWORD nNumberOfByte
return TRUE;
}
static BOOL FileSetFileTime(HANDLE hFile, const FILETIME *lpCreationTime,
const FILETIME *lpLastAccessTime, const FILETIME *lpLastWriteTime)
{
int rc;
#if defined(__APPLE__) || defined(ANDROID)
struct stat buf;
#endif
#ifdef ANDROID
struct timeval timevals[2];
#else
struct timespec times[2]; /* last access, last modification */
#endif
WINPR_FILE* pFile = (WINPR_FILE*)hFile;
const UINT64 EPOCH_DIFF = 11644473600ULL;
if (!hFile)
return FALSE;
#if defined(__APPLE__) || defined(ANDROID)
rc = fstat(fileno(pFile->fp), &buf);
if (rc < 0)
return FALSE;
#endif
if (!lpLastAccessTime)
{
#ifdef __APPLE__
#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
times[0] = buf.st_atimespec;
#else
times[0].tv_sec = buf.st_atime;
times[0].tv_nsec = buf.st_atimensec;
#endif
#elif ANDROID
timevals[0].tv_sec = buf.st_mtime;
timevals[0].tv_usec = buf.st_mtimensec / 1000UL;
#else
times[0].tv_sec = UTIME_OMIT;
times[0].tv_nsec = UTIME_OMIT;
#endif
}
else
{
UINT64 tmp = ((UINT64)lpLastAccessTime->dwHighDateTime) << 32
| lpLastAccessTime->dwLowDateTime;
tmp -= EPOCH_DIFF;
tmp /= 10ULL;
#ifdef ANDROID
tmp /= 10000ULL;
timevals[0].tv_sec = tmp / 10000ULL;
timevals[0].tv_usec = tmp % 10000ULL;
#else
times[0].tv_sec = tmp / 10000000ULL;
times[0].tv_nsec = tmp % 10000000ULL;
#endif
}
if (!lpLastWriteTime)
{
#ifdef __APPLE__
#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
times[1] = buf.st_mtimespec;
#else
times[1].tv_sec = buf.st_mtime;
times[1].tv_nsec = buf.st_mtimensec;
#endif
#elif ANDROID
timevals[1].tv_sec = buf.st_mtime;
timevals[1].tv_usec = buf.st_mtimensec / 1000UL;
#else
times[1].tv_sec = UTIME_OMIT;
times[1].tv_nsec = UTIME_OMIT;
#endif
}
else
{
UINT64 tmp = ((UINT64)lpLastWriteTime->dwHighDateTime) << 32
| lpLastWriteTime->dwLowDateTime;
tmp -= EPOCH_DIFF;
tmp /= 10ULL;
#ifdef ANDROID
tmp /= 10000ULL;
timevals[1].tv_sec = tmp / 10000ULL;
timevals[1].tv_usec = tmp % 10000ULL;
#else
times[1].tv_sec = tmp / 10000000ULL;
times[1].tv_nsec = tmp % 10000000ULL;
#endif
}
// TODO: Creation time can not be handled!
#ifdef __APPLE__
rc = futimes(fileno(pFile->fp), times);
#elif ANDROID
rc = utimes(pFile->lpFileName, timevals);
#else
rc = futimens(fileno(pFile->fp), times);
#endif
if (rc != 0)
return FALSE;
return TRUE;
}
static HANDLE_OPS fileOps = {
FileIsHandled,
FileCloseHandle,
@ -365,7 +474,8 @@ static HANDLE_OPS fileOps = {
NULL, /* FileLockFile */
FileLockFileEx,
FileUnlockFile,
FileUnlockFileEx
FileUnlockFileEx,
FileSetFileTime
};
static HANDLE_OPS shmOps = {
@ -387,8 +497,8 @@ static HANDLE_OPS shmOps = {
NULL, /* FileLockFile */
NULL, /* FileLockFileEx */
NULL, /* FileUnlockFile */
NULL /* FileUnlockFileEx */
NULL, /* FileUnlockFileEx */
NULL /* FileSetFileTime */
};

21
winpr/libwinpr/file/generic.c
View File

@ -623,6 +623,27 @@ BOOL UnlockFileEx(HANDLE hFile, DWORD dwReserved, DWORD nNumberOfBytesToUnlockLo
return FALSE;
}
BOOL WINAPI SetFileTime(HANDLE hFile, const FILETIME *lpCreationTime,
const FILETIME *lpLastAccessTime, const FILETIME *lpLastWriteTime)
{
ULONG Type;
WINPR_HANDLE *handle;
if (hFile == INVALID_HANDLE_VALUE)
return FALSE;
if (!winpr_Handle_GetInfo(hFile, &Type, &handle))
return FALSE;
handle = (WINPR_HANDLE *)hFile;
if (handle->ops->SetFileTime)
return handle->ops->SetFileTime(handle, lpCreationTime,
lpLastAccessTime, lpLastWriteTime);
WLog_ERR(TAG, "%s operation not implemented", __FUNCTION__);
return FALSE;
}
struct _WIN32_FILE_SEARCH
{
DIR* pDir;

17
winpr/libwinpr/file/namedPipeClient.c
View File

@ -51,14 +51,14 @@ static HANDLE_CREATOR _NamedPipeClientHandleCreator;
static BOOL NamedPipeClientIsHandled(HANDLE handle)
{
WINPR_NAMED_PIPE* pFile = (WINPR_NAMED_PIPE*) handle;
WINPR_NAMED_PIPE* pFile = (WINPR_NAMED_PIPE*) handle;
if (!pFile || (pFile->Type != HANDLE_TYPE_NAMED_PIPE) || (pFile == INVALID_HANDLE_VALUE))
{
SetLastError(ERROR_INVALID_HANDLE);
return FALSE;
}
return TRUE;
if (!pFile || (pFile->Type != HANDLE_TYPE_NAMED_PIPE) || (pFile == INVALID_HANDLE_VALUE))
{
SetLastError(ERROR_INVALID_HANDLE);
return FALSE;
}
return TRUE;
}
BOOL NamedPipeClientCloseHandle(HANDLE handle)
@ -124,7 +124,8 @@ static HANDLE_OPS ops = {
NULL, /* FileLockFile */
NULL, /* FileLockFileEx */
NULL, /* FileUnlockFile */
NULL /* FileUnlockFileEx */
NULL, /* FileUnlockFileEx */
NULL /* SetFileTime */
};
static HANDLE NamedPipeClientCreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes,

3
winpr/libwinpr/handle/handle.h
View File

@ -77,6 +77,8 @@ typedef BOOL (*pcUnlockFile)(HANDLE hFile, DWORD dwFileOffsetLow, DWORD dwFileOf
DWORD nNumberOfBytesToUnlockLow, DWORD nNumberOfBytesToUnlockHigh);
typedef BOOL (*pcUnlockFileEx)(HANDLE hFile, DWORD dwReserved, DWORD nNumberOfBytesToUnlockLow,
DWORD nNumberOfBytesToUnlockHigh, LPOVERLAPPED lpOverlapped);
typedef BOOL (*pcSetFileTime)(HANDLE hFile, const FILETIME *lpCreationTime,
const FILETIME *lpLastAccessTime, const FILETIME *lpLastWriteTime);
typedef struct _HANDLE_OPS
{
@ -99,6 +101,7 @@ typedef struct _HANDLE_OPS
pcLockFileEx LockFileEx;
pcUnlockFile UnlockFile;
pcUnlockFileEx UnlockFileEx;
pcSetFileTime SetFileTime;
} HANDLE_OPS;
struct winpr_handle

3
winpr/libwinpr/pipe/pipe.c
View File

@ -191,7 +191,8 @@ static HANDLE_OPS ops = {
NULL, /* FileLockFile */
NULL, /* FileLockFileEx */
NULL, /* FileUnlockFile */
NULL /* FileUnlockFileEx */
NULL, /* FileUnlockFileEx */
NULL /* SetFileTime */
};