Move to Rust types

Author: marmistrz

src/sys/ptrace.rs

@@ -151,7 +151,7 @@ pub fn ptrace_setsiginfo(pid: Pid, sig: &siginfo_t) -> Result<()> {
     }
 }
 
-//-------------------------- Second part: a low-level wrapper for ptrace ----------------------//
+//-------------------------- Second part: a high-level wrapper for ptrace ----------------------//
 
 #[cfg(target_arch = "x86_64")]
 // We're going to export it anyway
@@ -187,13 +187,15 @@ pub enum Register {
     GS = 26 * 8,
 }
 
+type Word = usize;
+
 /// Makes the `PTRACE_SYSCALL` request to ptrace
 pub fn syscall(pid: Pid) -> Result<()> {
     ptrace(ptrace::PTRACE_SYSCALL, pid, ptr::null_mut(), ptr::null_mut()).map(|_| ()) // ignore the useless return value
 }
 
 /// Makes the `PTRACE_PEEKUSER` request to ptrace
-pub fn peekuser(pid: Pid, reg: Register) -> Result<c_long> {
+pub fn peekuser(pid: Pid, reg: Register) -> Result<Word> {
     let reg_arg = (reg as i32) as *mut c_void;
     ptrace(ptrace::PTRACE_PEEKUSER, pid, reg_arg, ptr::null_mut())
 }
@@ -212,7 +214,7 @@ pub fn traceme() -> Result<()> {
 /// 
 /// This function allows to access arbitrary data in the traced process
 /// and may crash the inferior if used incorrectly and is thus marked `unsafe`.
-pub unsafe fn peekdata(pid: Pid, addr: c_long) -> Result<c_long> {
+pub unsafe fn peekdata(pid: Pid, addr: usize) -> Result<Word> {
     ptrace(ptrace::PTRACE_PEEKDATA, pid, addr as *mut c_void, ptr::null_mut())
 }
 
@@ -221,11 +223,35 @@ pub unsafe fn peekdata(pid: Pid, addr: c_long) -> Result<c_long> {
 /// This function allows to access arbitrary data in the traced process
 /// and may crash the inferior or introduce race conditions if used 
 /// incorrectly and is thus marked `unsafe`.
-pub unsafe fn pokedata(pid: Pid, addr: c_long, val: c_long) -> Result<()> {
+pub unsafe fn pokedata(pid: Pid, addr: usize, val: Word) -> Result<()> {
     ptrace(
         ptrace::PTRACE_POKEDATA,
         pid,
         addr as *mut c_void,
         val as *mut c_void,
     ).map(|_| ()) // ignore the useless return value
-}
+}
+
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_registry() {
+        let mut reg = OverrideRegistry::new();
+        let atenter = |_| {
+            HandlerData {
+                buflen: 0,
+                bufptr: 0,
+            }
+        };
+        let atexit = |_, _| {};
+
+        reg.add(17, atenter, atexit);
+        let el = reg.find(17).unwrap();
+        assert_eq!(el.syscall, 17);
+        let len = (el.atenter)(Pid::from_raw(17)).buflen;
+        assert_eq!(len, 0);
+    }
+}