---

yaml
---
r: 13222
b: refs/heads/master
c: 9a2b240
h: refs/heads/master
v: v3

Author: arkaitzj

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 3c4a1ab0c4eed8c7511454ed16bdee6cd988c47a
+refs/heads/master: 9a2b240c89bbc0c1f2d969fd59ce458a2b40eab5
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rt/rust_sched_loop.cpp

@@ -54,7 +54,13 @@ rust_sched_loop::log(rust_task* task, uint32_t level, char const *fmt, ...) {
     char buf[BUF_BYTES];
     va_list args;
     va_start(args, fmt);
-    vsnprintf(buf, sizeof(buf), fmt, args);
+    int formattedbytes = vsnprintf(buf, sizeof(buf), fmt, args);
+    if( formattedbytes and (unsigned)formattedbytes > BUF_BYTES ){
+        const char truncatedstr[] = "[...]";
+        memcpy( &buf[BUF_BYTES-sizeof(truncatedstr)],
+                truncatedstr,
+                sizeof(truncatedstr));
+    }
     _log.trace_ln(task, level, buf);
     va_end(args);
 }

trunk/src/test/bench/shootout-mandelbrot.rs

@@ -141,20 +141,19 @@ fn writer(path: str, writech: comm::chan<comm::chan<line>>, size: uint)
 }
 
 fn main(args: [str]) {
+    let path = if vec::len(args) < 4_u { "" }
+    else { args[3] };
+
     let args = if os::getenv("RUST_BENCH").is_some() {
         ["", "4000", "10"]
+    } else if args.len() <= 1u {
+        ["", "80", "10"]
     } else {
         args
     };
 
-    let path = if vec::len(args) < 4_u { "" }
-    else { args[3] };
-
-    let yieldevery = if vec::len(args) < 3_u { 10_u }
-    else { uint::from_str(args[2]).get() };
-
-    let size = if vec::len(args) < 2_u { 80_u }
-    else { uint::from_str(args[1]).get() };
+    let size = uint::from_str(args[1]).get();
+    let yieldevery = uint::from_str(args[2]).get();
 
     let writep = comm::port();
     let writech = comm::chan(writep);