abstract this out

1 files changed, 5 insertions, 16 deletions

diff --git a/src/ios.rs b/src/ios.rs
index 227d4d7..f926aad 100644
--- a/src/ios.rs
+++ b/src/ios.rs
@@ -1,4 +1,5 @@
 use core::libc::{c_int,c_uint};
+use util::guard;
 
 pub fn cooked () -> int {
     unsafe { c::cooked() as int }
@@ -17,8 +18,10 @@ pub fn echo (enable: bool) -> int {
 }
 
 pub fn preserve<T> (body: &fn () -> T) -> T {
-    let _guard = PreserveTermios();
-    body()
+    let orig = unsafe { c::get() };
+    do guard(|| { unsafe { c::set(orig) } }) {
+        body()
+    }
 }
 
 pub fn isatty() -> bool {
@@ -36,20 +39,6 @@ pub fn size() -> (uint, uint) {
 
 enum struct_termios {}
 
-struct PreserveTermios {
-    priv state: *struct_termios,
-}
-
-fn PreserveTermios () -> ~PreserveTermios {
-    ~PreserveTermios { state: unsafe { c::get() } }
-}
-
-impl Drop for PreserveTermios {
-    fn finalize (&self) {
-        unsafe { c::set(self.state) }
-    }
-}
-
 #[link_name = "termios_wrapper"]
 extern mod c {
     fn cooked () -> c_int;