From 2ca356340a21843f54b5005ace95c328f3cb994a Mon Sep 17 00:00:00 2001
From: wescande <wescande@sutdent.42.fr>
Date: Fri, 2 Mar 2018 18:44:41 +0100
Subject: [PATCH] some minor fix

---
 kernel-rs/src/console.rs | 4 ++++
 kernel-rs/src/lib.rs     | 4 ++--
 kernel-rs/src/vga/mod.rs | 5 ++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/kernel-rs/src/console.rs b/kernel-rs/src/console.rs
index e4067a7b..b43620e8 100644
--- a/kernel-rs/src/console.rs
+++ b/kernel-rs/src/console.rs
@@ -92,6 +92,10 @@ fn print_line(line: &[u8], address: usize) {
     for byte in line {
         print!("{:02x} ", *byte);
     }
+    let length : usize = 16 - line.len();
+    for _ in 0..length {
+        print!("   ");
+    }
     print!("|");
     for byte in line {
         match is_control(*byte as char) {
diff --git a/kernel-rs/src/lib.rs b/kernel-rs/src/lib.rs
index 29f5f1bd..0c0170cd 100644
--- a/kernel-rs/src/lib.rs
+++ b/kernel-rs/src/lib.rs
@@ -37,7 +37,7 @@ pub extern fn kmain(multiboot_information_address: usize) -> ! {
         println!("Kernel initialization has failed: {}", msg);
         cpuio::halt();
     }
-    unsafe { CONTEXT.current_term().color_code = ColorCode::new(Color::White, Color::Cyan); }
+    set_color!(White, Cyan);
     print!("{}{}{}{}{}{}{}{}{}{}{}{}{}{}",
     format_args!("{: ^80}", r#"        ,--,               "#),
     format_args!("{: ^80}", r#"      ,--.'|      ,----,   "#),
@@ -53,7 +53,7 @@ pub extern fn kmain(multiboot_information_address: usize) -> ! {
     format_args!("{: ^80}", r#"      |  : ;|   :    .'    "#),
     format_args!("{: ^80}", r#"      '  ,/ ;   | .'       "#),
     format_args!("{: ^80}", r#"      '--'  `---'          "#));
-    unsafe { CONTEXT.current_term().color_code = ColorCode::new(Color::White, Color::Black); }
+    set_color!();
 
     unsafe { CONTEXT.vga1.prompt();CONTEXT.vga1.flush(); }
     unsafe { CONTEXT.vga2.prompt(); }
diff --git a/kernel-rs/src/vga/mod.rs b/kernel-rs/src/vga/mod.rs
index 8d0dc3ee..c448f91c 100644
--- a/kernel-rs/src/vga/mod.rs
+++ b/kernel-rs/src/vga/mod.rs
@@ -98,10 +98,9 @@ impl Writer {
             b'\n' => {
                 self.write_byte(b'\n');
                 if let Err(msg) = console::exec(&self) {
-                    let color_code_save = self.color_code;
-                    self.color_code = ColorCode::new(Color::Red, Color::Black);
+                    set_color!(Red, Black);
                     println!("Something wrong: {}", msg);
-                    self.color_code = color_code_save;
+                    set_color!();
                 }
                 self.command_len = 0;
                 self.prompt();