From e7a0a24fa88e369eb3d345573200955e99324156 Mon Sep 17 00:00:00 2001
From: Alexis211 <alexis211@gmail.com>
Date: Mon, 21 Dec 2009 18:56:08 +0100
Subject: More work on the status bar

---
 Source/Kernel/Shell/KernelShell-sys.class.cpp | 22 ++++++++++++++++++++++
 Source/Kernel/Shell/KernelShell.class.cpp     | 26 ++++++--------------------
 Source/Kernel/Shell/KernelShell.class.h       |  1 +
 3 files changed, 29 insertions(+), 20 deletions(-)

(limited to 'Source/Kernel/Shell')

diff --git a/Source/Kernel/Shell/KernelShell-sys.class.cpp b/Source/Kernel/Shell/KernelShell-sys.class.cpp
index 85ba207..b1ab274 100644
--- a/Source/Kernel/Shell/KernelShell-sys.class.cpp
+++ b/Source/Kernel/Shell/KernelShell-sys.class.cpp
@@ -81,6 +81,28 @@ void KernelShell::mount(Vector<String>& args) {
 	}
 }
 
+void KernelShell::unmount(Vector<String>& args) {
+	if (args.size() == 2) {
+		FSNode* n = VFS::find(args[1], m_cwd);
+		bool ok = false;
+		if (n == 0) {
+			ok = false;
+		} else {
+			String p = VFS::path(n);
+			for (u32int i = 0; i < VFS::filesystems.size(); i++) {
+				if (VFS::path(VFS::filesystems[i]->getRootNode()) == p) {
+					ok = VFS::unmount(VFS::filesystems[i]);
+					break;
+				}
+			}
+		}
+		if (ok) *m_vt << "Ok, filesystem unmounted.\n";
+		else *m_vt << "Error.\n";
+	} else {
+		*m_vt << "Usage: unmount <mountpoint>\n";
+	}
+}
+
 void KernelShell::readblock(Vector<String>& args) {
 	if (args.size() == 3) {
 		Vector<Device*> devcs = Dev::findDevices("block");
diff --git a/Source/Kernel/Shell/KernelShell.class.cpp b/Source/Kernel/Shell/KernelShell.class.cpp
index 71a717a..9fec9c7 100644
--- a/Source/Kernel/Shell/KernelShell.class.cpp
+++ b/Source/Kernel/Shell/KernelShell.class.cpp
@@ -5,6 +5,7 @@
 #include <MemoryManager/PhysMem.ns.h>
 #include <TaskManager/Task.ns.h>
 #include <VFS/VFS.ns.h>
+#include <DeviceManager/Disp.ns.h>
 
 u32int KernelShell::m_instances = 0;
 
@@ -62,6 +63,7 @@ u32int KernelShell::run() {
 		{"part", &KernelShell::part},
 		{"readblock", &KernelShell::readblock},
 		{"mount", &KernelShell::mount},
+		{"unmount", &KernelShell::unmount},
 		{"hexdump", &KernelShell::hexdump},
 
 		{0, 0}
@@ -98,26 +100,10 @@ u32int KernelShell::run() {
 		} else if (tokens[0] == "exit") {
 			if (tokens.size() == 1) return 0;
 			return tokens[1].toInt();
-		} else if (tokens[0] == "unmount") {
-			if (tokens.size() == 2) {
-				FSNode* n = VFS::find(tokens[1], m_cwd);
-				bool ok = false;
-				if (n == 0) {
-					ok = false;
-				} else {
-					String p = VFS::path(n);
-					for (u32int i = 0; i < VFS::filesystems.size(); i++) {
-						if (VFS::path(VFS::filesystems[i]->getRootNode()) == p) {
-							ok = VFS::unmount(VFS::filesystems[i]);
-							break;
-						}
-					}
-				}
-				if (ok) *m_vt << "Ok, filesystem unmounted.\n";
-				else *m_vt << "Error.\n";
-			} else {
-				*m_vt << "Usage: unmount <mountpoint>\n";
-			}
+		} else if (tokens[0] == "mode") {
+			bool ch = (m_vt == kvt);
+			Disp::selectMode();
+			if (ch) m_vt = kvt;
 		} else if (tokens[0] != "" or tokens.size() != 1) {
 			u32int i = 0;
 			bool found = false;
diff --git a/Source/Kernel/Shell/KernelShell.class.h b/Source/Kernel/Shell/KernelShell.class.h
index 9655def..1552d28 100644
--- a/Source/Kernel/Shell/KernelShell.class.h
+++ b/Source/Kernel/Shell/KernelShell.class.h
@@ -37,6 +37,7 @@ class KernelShell {
 	void part(Vector<String>& args);
 	void readblock(Vector<String>& args);
 	void mount(Vector<String>& args);
+	void unmount(Vector<String>& args);
 
 	void setup(DirectoryNode* cwd, VirtualTerminal *vt);
 
-- 
cgit v1.2.3