Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 1 | From b44d1d4e4ba77f1d9cf7de73a3bd210d02b5ff36 Mon Sep 17 00:00:00 2001 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [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:26:53 -0400 |
Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 4 | Subject: [PATCH] Use uintmax_t for handling rlim_t |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 5 | |
| 6 | rlimit types are not representable with long or long long |
| 7 | formats, therefore use uintmax_t to typecast rlim_t types |
| 8 | and use %j to print it |
| 9 | |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 10 | Refit patch for open-vm-tools-11.2.5. |
| 11 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 13 | Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> |
| 14 | Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 15 | --- |
| 16 | open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | 4 ++-- |
| 17 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 18 | |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 19 | diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c |
Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 20 | index 87d419a7b..f5cc80b76 100644 |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 21 | --- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c |
| 22 | +++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c |
Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 23 | @@ -5301,8 +5301,8 @@ HgfsWriteCheckIORange(off_t offset, // IN: |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 24 | goto exit; |
| 25 | } |
| 26 | |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 27 | - LOG(6, "%s: File Size limits: 0x%"FMT64"x 0x%"FMT64"x\n", |
| 28 | - __FUNCTION__, fileSize.rlim_cur, fileSize.rlim_max); |
| 29 | + //LOG(6, ("%s: File Size limits: 0x%jx 0x%jx\n", |
| 30 | + // __FUNCTION__, (uintmax_t)fileSize.rlim_cur, (uintmax_t)fileSize.rlim_max)); |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 31 | |
| 32 | /* |
| 33 | * Check the offset is within the file size range. |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 34 | -- |
Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 35 | 2.25.1 |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 36 | |