From a73b12ccdd3baffe19f7616537875bd9fa3758f1 Mon Sep 17 00:00:00 2001 From: Steve Lau Date: Mon, 3 Oct 2022 15:03:22 +0800 Subject: [PATCH] fix the break of MSRV --- src/unix/solarish/compat.rs | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/unix/solarish/compat.rs b/src/unix/solarish/compat.rs index acdc20ede33ac..071cb2f514a6d 100644 --- a/src/unix/solarish/compat.rs +++ b/src/unix/solarish/compat.rs @@ -178,7 +178,15 @@ pub unsafe fn getpwent_r( ) -> ::c_int { let old_errno = *::___errno(); *::___errno() = 0; - *result = native_getpwent_r(pwd, buf, buflen.min(::c_int::MAX as ::size_t) as ::c_int); + *result = native_getpwent_r( + pwd, + buf, + if buflen < (::c_int::max_value() as ::size_t) { + buflen as ::c_int + } else { + ::c_int::max_value() + }, + ); let ret = if (*result).is_null() { *::___errno() @@ -198,7 +206,15 @@ pub unsafe fn getgrent_r( ) -> ::c_int { let old_errno = *::___errno(); *::___errno() = 0; - *result = native_getgrent_r(grp, buf, buflen.min(::c_int::MAX as ::size_t) as ::c_int); + *result = native_getgrent_r( + grp, + buf, + if buflen < (::c_int::max_value() as ::size_t) { + buflen as ::c_int + } else { + ::c_int::max_value() + }, + ); let ret = if (*result).is_null() { *::___errno()