From 6e8861776238b71b78649764fc069f370dfa4b92 Mon Sep 17 00:00:00 2001
From: Peter Limkilde Svendsen <peter.limkilde@gmail.com>
Date: Wed, 12 Jun 2019 23:47:11 +0200
Subject: [PATCH] Use fallible conversion in getpagesize()
---
src/header/unistd/mod.rs | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/src/header/unistd/mod.rs b/src/header/unistd/mod.rs
index 012153d45..d5ea3f4c1 100644
--- a/src/header/unistd/mod.rs
+++ b/src/header/unistd/mod.rs
@@ -1,5 +1,6 @@
//! unistd implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/unistd.h.html
+use core::convert::TryFrom;
use core::{mem, ptr, slice};
use c_str::CStr;
@@ -334,7 +335,21 @@ pub extern "C" fn getlogin_r(name: *mut c_char, namesize: size_t) -> c_int {
#[no_mangle]
pub extern "C" fn getpagesize() -> c_int {
- sysconf(_SC_PAGESIZE) as c_int
+ match c_int::try_from(sysconf(_SC_PAGESIZE)) {
+ Ok(page_size) => page_size,
+ Err(_) => {
+ /* Behavior not specified by POSIX for this case. The -1
+ * value mimics sysconf()'s behavior, though.
+ *
+ * As specified for the limits.h header, the minimum
+ * acceptable value for {PAGESIZE} is 1. The -1 value thus
+ * cannot be mistaken for an acceptable value.
+ *
+ * POSIX does not specify any possible errors for this
+ * function, hence no errno setting. */
+ -1
+ }
+ }
}
// #[no_mangle]
--
GitLab