Add smith editor, hashing in login, update ion

programs/ion

@@ -1 +1 @@
-Subproject commit cbb3c3003f654d09cd3b3cf1a179469bb1b558b3
+Subproject commit d0a2e0a224bc1c57718d58b7b2d1cd8d1c80d052

programs/login/Cargo.toml

@@ -3,4 +3,14 @@ name = "login"
 version = "0.1.0"
 
 [dependencies]
+liner = "*"
 syscall = { path = "../../syscall/" }
+
+[dependencies.octavo]
+git = "https://github.com/libOctavo/octavo"
+default-features = false
+features = ["digest"]
+
+[replace]
+"libc:0.2.16" = { git = "https://github.com/redox-os/liblibc.git", branch = "new_kernel" }
+"rustc-serialize:0.3.19" = { git = "https://github.com/redox-os/rustc-serialize.git" }

programs/login/src/main.rs

@@ -1,8 +1,12 @@
+extern crate liner;
+extern crate octavo;
 extern crate syscall;
 
-use std::env;
+use liner::Context;
+use octavo::octavo_digest::Digest;
+use octavo::octavo_digest::sha3::Sha512;
 use std::process::Command;
-use std::thread;
+use std::{env, thread};
 
 pub fn main() {
     let mut args = env::args().skip(1);
@@ -11,8 +15,6 @@ pub fn main() {
     let sh = args.next().expect("login: no sh provided");
     let sh_args: Vec<String> = args.collect();
 
-    env::set_current_dir("file:").expect("login: failed to cd to file:");
-
     let _ = syscall::close(2);
     let _ = syscall::close(1);
     let _ = syscall::close(0);
@@ -21,25 +23,50 @@ pub fn main() {
     let _ = syscall::open(&tty, syscall::flag::O_RDWR);
     let _ = syscall::open(&tty, syscall::flag::O_RDWR);
 
+    env::set_var("COLUMNS", "80");
+    env::set_var("LINES", "30");
+    env::set_var("TTY", &tty);
+
     thread::spawn(move || {
+        let mut con = Context::new();
+
         loop {
-            let mut command = Command::new(&sh);
-            for arg in sh_args.iter() {
-                command.arg(arg);
-            }
+            let user = con.read_line("\x1B[1mredox login:\x1B[0m ", &mut |_| {}).expect("login: failed to read user");
 
-            command.env("HOME", "file:home");
-            command.env("PATH", "file:bin");
-            command.env("COLUMNS", "80");
-            command.env("LINES", "30");
-            command.env("TTY", &tty);
+            if ! user.is_empty() {
+                let password = con.read_line("\x1B[1mpassword:\x1B[0m ", &mut |_| {}).expect("login: failed to read user");
 
-            match command.spawn() {
-                Ok(mut child) => match child.wait() {
-                    Ok(_status) => (), //println!("login: waited for {}: {:?}", sh, status.code()),
-                    Err(err) => panic!("login: failed to wait for '{}': {}", sh, err)
-                },
-                Err(err) => panic!("login: failed to execute '{}': {}", sh, err)
+                let mut output = vec![0; Sha512::output_bytes()];
+                let mut hash = Sha512::default();
+                hash.update(&password.as_bytes());
+                hash.result(&mut output);
+
+                print!("hash: ");
+                for b in output.iter() {
+                    print!("{:X} ", b);
+                }
+                println!("");
+
+                let home = "file:home";
+
+                env::set_current_dir(home).expect("login: failed to cd to home");
+
+                let mut command = Command::new(&sh);
+                for arg in sh_args.iter() {
+                    command.arg(arg);
+                }
+
+                command.env("USER", &user);
+                command.env("HOME", home);
+                command.env("PATH", "file:bin");
+
+                match command.spawn() {
+                    Ok(mut child) => match child.wait() {
+                        Ok(_status) => (), //println!("login: waited for {}: {:?}", sh, status.code()),
+                        Err(err) => panic!("login: failed to wait for '{}': {}", sh, err)
+                    },
+                    Err(err) => panic!("login: failed to execute '{}': {}", sh, err)
+                }
             }
         }
     });

programs/smith

@@ -0,0 +1 @@
+Subproject commit 23405d7cd9f59d37dbaa6b07fe3ab66b065beff5