---

yaml
---
r: 30922
b: refs/heads/incoming
c: 9fe40e8
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: a4a7df0cccc36ed00b46462050ec522eadc2a0fc
+refs/heads/incoming: 9fe40e8a7b86a530371f086effd1a427064b8a6d
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/os.rs

@@ -738,7 +738,7 @@ pub fn set_exit_status(code: int) {
  * Returns a list of the command line arguments.
  */
 #[cfg(target_os = "macos")]
-pub fn args() -> ~[~str] {
+fn real_args() -> ~[~str] {
     unsafe {
         let (argc, argv) = (*_NSGetArgc() as uint, *_NSGetArgv());
         let mut args = ~[];
@@ -749,6 +749,38 @@ pub fn args() -> ~[~str] {
     }
 }
 
+#[cfg(target_os = "linux")]
+fn real_args() -> ~[~str] {
+    fail    // TODO
+}
+
+#[cfg(windows)]
+fn real_args() -> ~[~str] {
+    fail    // TODO
+}
+
+struct OverriddenArgs {
+    val: ~[~str]
+}
+
+fn overridden_arg_key(+v: @OverriddenArgs) {}
+
+pub fn args() -> ~[~str] {
+    unsafe {
+        match task::local_data::local_data_get(overridden_arg_key) {
+            None => real_args(),
+            Some(args) => copy args.val
+        }
+    }
+}
+
+pub fn set_args(+new_args: ~[~str]) {
+    unsafe {
+        let overridden_args = @OverriddenArgs { val: copy new_args };
+        task::local_data::local_data_set(overridden_arg_key, overridden_args);
+    }
+}
+
 #[cfg(target_os = "macos")]
 extern {
     // These functions are in crt_externs.h.