Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 1 | From c6836386549fb8f017761ce17a237fa42901434c Mon Sep 17 00:00:00 2001 |
Brad Bishop | 87b3cb8 | 2019-11-15 16:35:37 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 3 | Date: Wed, 24 Mar 2021 17:36:26 -0400 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 4 | Subject: [PATCH] hgfsServerLinux: Consider 64bit time_t possibility |
Brad Bishop | 87b3cb8 | 2019-11-15 16:35:37 -0500 | [diff] [blame] | 5 | |
| 6 | Upstream-Status: Pending |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 7 | |
| 8 | Refit for open-vm-tools-11.2.5. |
| 9 | |
Brad Bishop | 87b3cb8 | 2019-11-15 16:35:37 -0500 | [diff] [blame] | 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 11 | Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> |
| 12 | Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 13 | |
Brad Bishop | 87b3cb8 | 2019-11-15 16:35:37 -0500 | [diff] [blame] | 14 | --- |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 15 | open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | 14 -------------- |
| 16 | 1 file changed, 14 deletions(-) |
Brad Bishop | 87b3cb8 | 2019-11-15 16:35:37 -0500 | [diff] [blame] | 17 | |
| 18 | diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 19 | index f5cc80b7..5a79d645 100644 |
Brad Bishop | 87b3cb8 | 2019-11-15 16:35:37 -0500 | [diff] [blame] | 20 | --- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c |
| 21 | +++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 22 | @@ -2566,20 +2566,6 @@ HgfsStatToFileAttr(struct stat *stats, // IN: stat information |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 23 | 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 Bishop | 87b3cb8 | 2019-11-15 16:35:37 -0500 | [diff] [blame] | 26 | -#ifdef __FreeBSD__ |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 27 | -# if !defined(VM_X86_64) && !defined(VM_ARM_64) && __FreeBSD_version >= 500043 |
Brad Bishop | 87b3cb8 | 2019-11-15 16:35:37 -0500 | [diff] [blame] | 28 | -# define FMTTIMET "" |
| 29 | -# else |
| 30 | -# define FMTTIMET "l" |
| 31 | -# endif |
| 32 | -#else |
| 33 | -# define FMTTIMET "l" |
| 34 | -#endif |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 35 | - 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 Bishop | 87b3cb8 | 2019-11-15 16:35:37 -0500 | [diff] [blame] | 39 | -#undef FMTTIMET |
Brad Bishop | 87b3cb8 | 2019-11-15 16:35:37 -0500 | [diff] [blame] | 40 | |
| 41 | attr->userId = stats->st_uid; |
| 42 | attr->groupId = stats->st_gid; |