---

yaml
---
r: 64154
b: refs/heads/snap-stage3
c: 07e52eb
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: ec6d4a1733b07d4cc561eda7463ad596a9d52bf0
+refs/heads/snap-stage3: 07e52eb7fc75466d294a1fd9d614f5e0276ab834
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/os.rs

@@ -1134,8 +1134,15 @@ pub fn last_os_error() -> ~str {
  * ignored and the process exits with the default failure status
  */
 pub fn set_exit_status(code: int) {
-    unsafe {
-        rustrt::rust_set_exit_status(code as libc::intptr_t);
+    use rt;
+    use rt::OldTaskContext;
+
+    if rt::context() == OldTaskContext {
+        unsafe {
+            rustrt::rust_set_exit_status(code as libc::intptr_t);
+        }
+    } else {
+        rt::util::set_exit_status(code);
     }
 }
 

branches/snap-stage3/src/libstd/rt/mod.rs

@@ -260,7 +260,15 @@ pub fn run(main: ~fn()) -> int {
         }
 
         unsafe {
-            let exit_code = if exit_success { 0 } else { DEFAULT_ERROR_CODE };
+            let exit_code = if exit_success {
+                use rt::util;
+
+                // If we're exiting successfully, then return the global
+                // exit status, which can be set programmatically.
+                util::get_exit_status()
+            } else {
+                DEFAULT_ERROR_CODE
+            };
             (*exit_code_clone.get()).store(exit_code, SeqCst);
         }
     };

branches/snap-stage3/src/libstd/rt/util.rs

@@ -97,3 +97,25 @@ memory and partly incapable of presentation to others.",
 
     unsafe { libc::abort(); }
 }
+
+pub fn set_exit_status(code: int) {
+
+    unsafe {
+        return rust_set_exit_status_newrt(code as libc::uintptr_t);
+    }
+
+    extern {
+        fn rust_set_exit_status_newrt(code: libc::uintptr_t);
+    }
+}
+
+pub fn get_exit_status() -> int {
+
+    unsafe {
+        return rust_get_exit_status_newrt() as int;
+    }
+
+    extern {
+        fn rust_get_exit_status_newrt() -> libc::uintptr_t;
+    }
+}

branches/snap-stage3/src/rt/rust_builtin.cpp

@@ -960,6 +960,21 @@ rust_get_global_args_ptr() {
     return &global_args_ptr;
 }
 
+static lock_and_signal exit_status_lock;
+static uintptr_t exit_status = 0;
+
+extern "C" CDECL void
+rust_set_exit_status_newrt(uintptr_t code) {
+    scoped_lock with(exit_status_lock);
+    exit_status = code;
+}
+
+extern "C" CDECL uintptr_t
+rust_get_exit_status_newrt() {
+    scoped_lock with(exit_status_lock);
+    return exit_status;
+}
+
 //
 // Local Variables:
 // mode: C++

branches/snap-stage3/src/rt/rustrt.def.in

@@ -270,3 +270,5 @@ rust_get_global_args_ptr
 rust_current_boxed_region
 rust_take_global_args_lock
 rust_drop_global_args_lock
+rust_set_exit_status_newrt
+rust_get_exit_status_newrt