---

yaml
---
r: 38453
b: refs/heads/try
c: 07c39b1
h: refs/heads/master
i:
  38451: 96aa9c2
v: v3

Author: catamorphism

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 09bb07bed9166105ea961a42b5fff7739ae0d2e9
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
-refs/heads/try: 26334b64a29612be8190bedfbd507fa6ac6f8eb5
+refs/heads/try: 07c39b1436f07b3a88daa39a3fc021c4bb3208e5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/libcore/os.rs

@@ -452,10 +452,19 @@ pub fn self_exe_path() -> Option<Path> {
     fn load_self() -> Option<~str> {
         unsafe {
             use libc::funcs::posix01::unistd::readlink;
-            do fill_charp_buf() |buf, sz| {
+
+            let mut path_str = str::with_capacity(tmpbuf_sz);
+            let len = do str::as_c_str(path_str) |buf| {
+                let buf = buf as *mut c_char;
                 do as_c_charp("/proc/self/exe") |proc_self_buf| {
-                    readlink(proc_self_buf, buf, sz) != (-1 as ssize_t)
+                    readlink(proc_self_buf, buf, tmpbuf_sz as size_t)
                 }
+            };
+            if len == -1 {
+                None
+            } else {
+                str::raw::set_len(&mut path_str, len as uint);
+                Some(path_str)
             }
         }
     }