blob: c7e62da7eeedeebb61803bccf4cf2a719622e1ab [file] [log] [blame]
Patrick Williams2194f502022-10-16 14:26:09 -05001From 859c21b9a21c53d936301b05044d0c649d6cf32b Mon Sep 17 00:00:00 2001
Brad Bishop87b3cb82019-11-15 16:35:37 -05002From: Khem Raj <raj.khem@gmail.com>
Andrew Geisslere34f8962021-04-15 15:53:51 -05003Date: Wed, 24 Mar 2021 17:36:26 -0400
Andrew Geissler595f6302022-01-24 19:11:47 +00004Subject: [PATCH] hgfsServerLinux: Consider 64bit time_t possibility
Brad Bishop87b3cb82019-11-15 16:35:37 -05005
6Upstream-Status: Pending
Andrew Geisslere34f8962021-04-15 15:53:51 -05007
8Refit for open-vm-tools-11.2.5.
9
Brad Bishop87b3cb82019-11-15 16:35:37 -050010Signed-off-by: Khem Raj <raj.khem@gmail.com>
Andrew Geisslere34f8962021-04-15 15:53:51 -050011Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
12Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Brad Bishop87b3cb82019-11-15 16:35:37 -050013---
Andrew Geissler595f6302022-01-24 19:11:47 +000014 open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | 14 --------------
15 1 file changed, 14 deletions(-)
Brad Bishop87b3cb82019-11-15 16:35:37 -050016
17diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c
Patrick Williams2194f502022-10-16 14:26:09 -050018index f5cc80b76..5a79d6451 100644
Brad Bishop87b3cb82019-11-15 16:35:37 -050019--- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c
20+++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c
Andrew Geissler595f6302022-01-24 19:11:47 +000021@@ -2566,20 +2566,6 @@ HgfsStatToFileAttr(struct stat *stats, // IN: stat information
Andrew Geisslere34f8962021-04-15 15:53:51 -050022 LOG(4, "%s: done, permissions %o%o%o%o, size %"FMT64"u\n", __FUNCTION__,
23 attr->specialPerms, attr->ownerPerms, attr->groupPerms,
24 attr->otherPerms, attr->size);
Brad Bishop87b3cb82019-11-15 16:35:37 -050025-#ifdef __FreeBSD__
Andrew Geissler595f6302022-01-24 19:11:47 +000026-# if !defined(VM_X86_64) && !defined(VM_ARM_64) && __FreeBSD_version >= 500043
Brad Bishop87b3cb82019-11-15 16:35:37 -050027-# define FMTTIMET ""
28-# else
29-# define FMTTIMET "l"
30-# endif
31-#else
32-# define FMTTIMET "l"
33-#endif
Andrew Geisslere34f8962021-04-15 15:53:51 -050034- LOG(4, "access: %"FMTTIMET"d/%"FMT64"u \nwrite: %"FMTTIMET"d/%"FMT64"u \n"
35- "attr: %"FMTTIMET"d/%"FMT64"u\n",
36- stats->st_atime, attr->accessTime, stats->st_mtime, attr->writeTime,
37- stats->st_ctime, attr->attrChangeTime);
Brad Bishop87b3cb82019-11-15 16:35:37 -050038-#undef FMTTIMET
Brad Bishop87b3cb82019-11-15 16:35:37 -050039
40 attr->userId = stats->st_uid;
41 attr->groupId = stats->st_gid;
Patrick Williams2194f502022-10-16 14:26:09 -050042--
432.25.1
44