summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Hackmann <ghackmann@google.com>2014-05-06 08:48:18 -0700
committerColin Cross <ccross@android.com>2014-07-21 17:10:34 -0700
commit70467735953ea9cceae9870ee0c426a0d21912ee (patch)
tree78024e552cf407a29b73c0d164f586d937ccff81
parent143b9e3dd6b86d5ac14b6d57588561aed45ab7ca (diff)
downloadsystem_core-70467735953ea9cceae9870ee0c426a0d21912ee.zip
system_core-70467735953ea9cceae9870ee0c426a0d21912ee.tar.gz
system_core-70467735953ea9cceae9870ee0c426a0d21912ee.tar.bz2
adb: replace utimes() with utime()
Fix the win_sdk host build by replacing utimes() with utime(). utime() is functionally equivalent to utimes() when dealing with non-fractional second timestamps, and is supported by the Windows CRT. (The Windows CRT uses the nonstandard name _utime(), but mingw creates aliases to the POSIX names.) Change-Id: I513c6c5de05376c34cbb0894a94259acba8ae6f1
-rw-r--r--adb/file_sync_client.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/adb/file_sync_client.c b/adb/file_sync_client.c
index 3f540c1..d3cb113 100644
--- a/adb/file_sync_client.c
+++ b/adb/file_sync_client.c
@@ -25,6 +25,7 @@
#include <limits.h>
#include <sys/types.h>
#include <zipfile/zipfile.h>
+#include <utime.h>
#include "sysdeps.h"
#include "adb.h"
@@ -935,8 +936,8 @@ static int remote_build_list(int syncfd, copyinfo **filelist,
static int set_time_and_mode(const char *lpath, unsigned int time, unsigned int mode)
{
- struct timeval times[2] = { {time, 0}, {time, 0} };
- int r1 = utimes(lpath, times);
+ struct utimbuf times = { time, time };
+ int r1 = utime(lpath, &times);
/* use umask for permissions */
mode_t mask=umask(0000);