blob: 97a4136ca4971d1cf9ab24ca2a2eb5de7b8f4319 [file] [log] [blame]
Andrew Geissler595f6302022-01-24 19:11:47 +00001From c6836386549fb8f017761ce17a237fa42901434c 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>
Andrew Geissler595f6302022-01-24 19:11:47 +000013
Brad Bishop87b3cb82019-11-15 16:35:37 -050014---
Andrew Geissler595f6302022-01-24 19:11:47 +000015 open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | 14 --------------
16 1 file changed, 14 deletions(-)
Brad Bishop87b3cb82019-11-15 16:35:37 -050017
18diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c
Andrew Geissler595f6302022-01-24 19:11:47 +000019index f5cc80b7..5a79d645 100644
Brad Bishop87b3cb82019-11-15 16:35:37 -050020--- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c
21+++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c
Andrew Geissler595f6302022-01-24 19:11:47 +000022@@ -2566,20 +2566,6 @@ HgfsStatToFileAttr(struct stat *stats, // IN: stat information
Andrew Geisslere34f8962021-04-15 15:53:51 -050023 LOG(4, "%s: done, permissions %o%o%o%o, size %"FMT64"u\n", __FUNCTION__,
24 attr->specialPerms, attr->ownerPerms, attr->groupPerms,
25 attr->otherPerms, attr->size);
Brad Bishop87b3cb82019-11-15 16:35:37 -050026-#ifdef __FreeBSD__
Andrew Geissler595f6302022-01-24 19:11:47 +000027-# if !defined(VM_X86_64) && !defined(VM_ARM_64) && __FreeBSD_version >= 500043
Brad Bishop87b3cb82019-11-15 16:35:37 -050028-# define FMTTIMET ""
29-# else
30-# define FMTTIMET "l"
31-# endif
32-#else
33-# define FMTTIMET "l"
34-#endif
Andrew Geisslere34f8962021-04-15 15:53:51 -050035- LOG(4, "access: %"FMTTIMET"d/%"FMT64"u \nwrite: %"FMTTIMET"d/%"FMT64"u \n"
36- "attr: %"FMTTIMET"d/%"FMT64"u\n",
37- stats->st_atime, attr->accessTime, stats->st_mtime, attr->writeTime,
38- stats->st_ctime, attr->attrChangeTime);
Brad Bishop87b3cb82019-11-15 16:35:37 -050039-#undef FMTTIMET
Brad Bishop87b3cb82019-11-15 16:35:37 -050040
41 attr->userId = stats->st_uid;
42 attr->groupId = stats->st_gid;