commit 93c76de88befbfc1f483ce8336c7ee1f0c7f7563
author Yu Ding <dingelish@gmail.com> Sun Jan 19 20:05:36 2020 -0800
committer GitHub <noreply@github.com> Sun Jan 19 20:05:36 2020 -0800
tree fc5cd91fbc34ecec701e32b0cc09baf663f61935
parent 07f40b0d2d06351a9baa9217c6ae870261e2feaf
parent 35fe6b2159e717dceb9ae6f72e06dc8cf91bdd32

Merge pull request #201 from volcano0dr/urts

remove #![feature(ptr_offset_from)] in sgx_urts. Thanks to @volcano0dr !

sgx_urts/src/env.rs

diff --git a/sgx_urts/src/env.rs b/sgx_urts/src/env.rs
index 39502e3..f079642 100644
--- a/sgx_urts/src/env.rs
+++ b/sgx_urts/src/env.rs
@@ -103,27 +103,27 @@
                 let mut temp_pwd = &mut *pwd;
                 let p = -1_isize as usize;
                 if !temp_pwd.pw_name.is_null() {
-                    temp_pwd.pw_name = temp_pwd.pw_name.offset_from(buf) as * mut c_char;
+                    temp_pwd.pw_name = usize::checked_sub(temp_pwd.pw_name as _, buf as _).unwrap_or(p) as * mut c_char;
                 } else {
-                    temp_pwd.pw_name = p as usize as * mut c_char;
+                    temp_pwd.pw_name = p as * mut c_char;
                 }
                 if !temp_pwd.pw_passwd.is_null() {
-                    temp_pwd.pw_passwd = temp_pwd.pw_passwd.offset_from(buf) as * mut c_char;
+                    temp_pwd.pw_passwd = usize::checked_sub(temp_pwd.pw_passwd as _, buf as _).unwrap_or(p) as * mut c_char;
                 } else {
-                    temp_pwd.pw_passwd = p as usize as * mut c_char;
+                    temp_pwd.pw_passwd = p as * mut c_char;
                 }
                 if !temp_pwd.pw_gecos.is_null() {
-                    temp_pwd.pw_gecos = temp_pwd.pw_gecos.offset_from(buf) as * mut c_char;
+                    temp_pwd.pw_gecos = usize::checked_sub(temp_pwd.pw_gecos as _, buf as _).unwrap_or(p) as * mut c_char;
                 } else {
                     temp_pwd.pw_gecos = p as * mut c_char;
                 }
                 if !temp_pwd.pw_dir.is_null() {
-                    temp_pwd.pw_dir = temp_pwd.pw_dir.offset_from(buf) as * mut c_char;
+                    temp_pwd.pw_dir = usize::checked_sub(temp_pwd.pw_dir as _, buf as _).unwrap_or(p) as * mut c_char;
                 } else {
                     temp_pwd.pw_dir = p as * mut c_char;
                 }
                 if !temp_pwd.pw_shell.is_null() {
-                    temp_pwd.pw_shell = temp_pwd.pw_shell.offset_from(buf) as * mut c_char;
+                    temp_pwd.pw_shell = usize::checked_sub(temp_pwd.pw_shell as _, buf as _).unwrap_or(p) as * mut c_char;
                 } else {
                     temp_pwd.pw_shell = p as * mut c_char;
                 }

sgx_urts/src/lib.rs

diff --git a/sgx_urts/src/lib.rs b/sgx_urts/src/lib.rs
index 4c434b6..2019043 100644
--- a/sgx_urts/src/lib.rs
+++ b/sgx_urts/src/lib.rs
@@ -16,7 +16,6 @@
 // under the License..
 
 #![allow(clippy::not_unsafe_ptr_arg_deref)]
-#![feature(ptr_offset_from)]
 extern crate libc;
 extern crate sgx_types;