Merge branch 'cap2' of https://github.com/Yoric/redox into Yoric-cap2

2016-11-15 14:05:43 -07:00 · 2016-11-15 14:05:43 -07:00 · 297b6e09fc
commit 297b6e09fc
parent ae73dec11a 9c90a8fe42
18 changed files with 254 additions and 108 deletions
--- a/kernel/scheme/sys/context.rs
+++ b/kernel/scheme/sys/context.rs
@ -83,8 +83,8 @@ pub fn resource() -> Result<Vec<u8>> {
            let name = str::from_utf8(&name_bytes).unwrap_or("");

            string.push_str(&format!("{:<6}{:<6}{:<6}{:<6}{:<6}{:<6}{:<8}{}\n",
-                               context.id,
-                               context.ppid,
+                               context.id.into(),
+                               context.ppid.into(),
                               context.euid,
                               context.egid,
                               stat_string,