---

yaml
---
r: 31449
b: refs/heads/dist-snap
c: cdd052f
h: refs/heads/master
i:
  31447: 06e5c49
v: v3

Author: dgryski

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 872ef0f3124eaca8e0c67095c4117c93922b670d
+refs/heads/dist-snap: cdd052f6ea1fb268a25e467147643344ec9a6b8c
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/libcore/io.rs

@@ -330,20 +330,25 @@ fn with_str_reader<T>(s: ~str, f: fn(reader) -> T) -> T {
 // Writing
 enum fileflag { append, create, truncate, no_flag, }
 
+// What type of writer are we?
+enum writer_type { screen, file }
+
 // FIXME (#2004): Seekable really should be orthogonal.
 // FIXME (#2004): eventually u64
 iface writer {
     fn write(v: &[const u8]);
     fn seek(int, seek_style);
     fn tell() -> uint;
     fn flush() -> int;
+    fn get_type() -> writer_type;
 }
 
 impl <T: writer, C> of writer for {base: T, cleanup: C} {
     fn write(bs: &[const u8]) { self.base.write(bs); }
     fn seek(off: int, style: seek_style) { self.base.seek(off, style); }
     fn tell() -> uint { self.base.tell() }
     fn flush() -> int { self.base.flush() }
+    fn get_type() -> writer_type { file }
 }
 
 impl of writer for *libc::FILE {
@@ -364,6 +369,13 @@ impl of writer for *libc::FILE {
     }
     fn tell() -> uint { libc::ftell(self) as uint }
     fn flush() -> int { libc::fflush(self) as int }
+    fn get_type() -> writer_type {
+        let fd = libc::fileno(self);
+        if libc::isatty(fd) == 0 {
+            ret file;
+        }
+        ret screen;
+    }
 }
 
 fn FILE_writer(f: *libc::FILE, cleanup: bool) -> writer {
@@ -399,6 +411,9 @@ impl of writer for fd_t {
         fail;
     }
     fn flush() -> int { 0 }
+    fn get_type() -> writer_type {
+        if libc::isatty(self) == 0 { file } else { screen }
+    }
 }
 
 class fd_res {
@@ -646,6 +661,7 @@ impl of writer for mem_buffer {
     }
     fn tell() -> uint { self.pos }
     fn flush() -> int { 0 }
+    fn get_type() -> writer_type { ret file }
 }
 
 fn mem_buffer() -> mem_buffer {

branches/dist-snap/src/libstd/net_tcp.rs

@@ -840,6 +840,9 @@ impl tcp_socket_buf of io::writer for @tcp_socket_buf {
     fn flush() -> int {
         0
     }
+    fn get_type() -> io::writer_type {
+        io::file
+    }
 }
 
 // INTERNAL API