From 0f23bbac0104fe4c51923eb09b7a98c3e6239571 Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Fri, 6 May 2011 16:30:39 -0700
Subject: Fix GenericOS.getenv returning a raw str, return an Option.t[str]
 instead.

---
 src/lib/GenericOS.rs | 9 +++++++--
 src/lib/Term.rs      | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/GenericOS.rs b/src/lib/GenericOS.rs
index c60fa2b8..30b1d1d0 100644
--- a/src/lib/GenericOS.rs
+++ b/src/lib/GenericOS.rs
@@ -1,4 +1,9 @@
-fn getenv(str n) -> str {
-    ret Str.str_from_cstr(OS.libc.getenv(Str.buf(n)));
+fn getenv(str n) -> Option.t[str] {
+  auto s = OS.libc.getenv(Str.buf(n));
+  if (s == 0 as Str.sbuf) {
+    ret Option.none[str];
+  } else {
+    ret Option.some[str](Str.str_from_cstr(s));
+  }
 }
 
diff --git a/src/lib/Term.rs b/src/lib/Term.rs
index fca04bff..b07dcc0c 100644
--- a/src/lib/Term.rs
+++ b/src/lib/Term.rs
@@ -31,7 +31,7 @@ fn reset(IO.buf_writer writer) {
 }
 
 fn color_supported() -> bool {
-    ret Str.eq(GenericOS.getenv("TERM"), "xterm-color");
+    ret GenericOS.getenv("TERM") == Option.some[str]("xterm-color");
 }
 
 fn set_color(IO.buf_writer writer, u8 first_char, u8 color) {
-- 
cgit v1.2.3