summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis211 <alexis211@gmail.com>2009-09-15 13:30:09 +0200
committerAlexis211 <alexis211@gmail.com>2009-09-15 13:30:09 +0200
commit0211692f62cdd934ea9c802bc5b09d63eb4399af (patch)
tree435471d1230046284aaf245e761017d73ac2a747
parent6332f2561890edd654eafaeb58db16a131573319 (diff)
downloadMelon-0211692f62cdd934ea9c802bc5b09d63eb4399af.tar.gz
Melon-0211692f62cdd934ea9c802bc5b09d63eb4399af.zip
Added some screenshots and modified some stuff.
-rw-r--r--Media/Screenshots/2009-09-15-131654_728x426_scrot.pngbin0 -> 20650 bytes
-rw-r--r--Media/Screenshots/2009-09-15-131709_728x426_scrot.pngbin0 -> 18653 bytes
-rw-r--r--Media/Screenshots/2009-09-15-131822_728x426_scrot.pngbin0 -> 17573 bytes
-rw-r--r--Media/Screenshots/2009-09-15-131926_728x426_scrot.pngbin0 -> 18678 bytes
-rw-r--r--Media/Screenshots/2009-09-15-132032_728x426_scrot.pngbin0 -> 17959 bytes
-rw-r--r--Source/Kernel/Core/kmain.wtf.cpp8
-rwxr-xr-xSource/Kernel/Melon.kebin149241 -> 149241 bytes
7 files changed, 4 insertions, 4 deletions
diff --git a/Media/Screenshots/2009-09-15-131654_728x426_scrot.png b/Media/Screenshots/2009-09-15-131654_728x426_scrot.png
new file mode 100644
index 0000000..3977401
--- /dev/null
+++ b/Media/Screenshots/2009-09-15-131654_728x426_scrot.png
Binary files differ
diff --git a/Media/Screenshots/2009-09-15-131709_728x426_scrot.png b/Media/Screenshots/2009-09-15-131709_728x426_scrot.png
new file mode 100644
index 0000000..a18bb4a
--- /dev/null
+++ b/Media/Screenshots/2009-09-15-131709_728x426_scrot.png
Binary files differ
diff --git a/Media/Screenshots/2009-09-15-131822_728x426_scrot.png b/Media/Screenshots/2009-09-15-131822_728x426_scrot.png
new file mode 100644
index 0000000..793fbb2
--- /dev/null
+++ b/Media/Screenshots/2009-09-15-131822_728x426_scrot.png
Binary files differ
diff --git a/Media/Screenshots/2009-09-15-131926_728x426_scrot.png b/Media/Screenshots/2009-09-15-131926_728x426_scrot.png
new file mode 100644
index 0000000..0a736e2
--- /dev/null
+++ b/Media/Screenshots/2009-09-15-131926_728x426_scrot.png
Binary files differ
diff --git a/Media/Screenshots/2009-09-15-132032_728x426_scrot.png b/Media/Screenshots/2009-09-15-132032_728x426_scrot.png
new file mode 100644
index 0000000..f81f597
--- /dev/null
+++ b/Media/Screenshots/2009-09-15-132032_728x426_scrot.png
Binary files differ
diff --git a/Source/Kernel/Core/kmain.wtf.cpp b/Source/Kernel/Core/kmain.wtf.cpp
index 78347d7..6dc37ee 100644
--- a/Source/Kernel/Core/kmain.wtf.cpp
+++ b/Source/Kernel/Core/kmain.wtf.cpp
@@ -164,7 +164,7 @@ void kmain(multiboot_info_t* mbd, u32int magic) {
}
} else if (tokens[0] == "cd") {
if (tokens.size() == 1) {
- *kvt << "Where shall I take you, sir ?\n";
+ *kvt << "Error : no argument given.\n";
} else {
FSNode* n = VFS::find(tokens[1], cwd);
if (n == NULL)
@@ -194,7 +194,7 @@ void kmain(multiboot_info_t* mbd, u32int magic) {
} else if (tokens[0] == "pwd") {
*kvt << "Current location : " << VFS::path(cwd) << "\n";
} else if (tokens[0] == "rm") {
- if (tokens.size() == 1) *kvt << "No argument specified. I suppose that means I'll have to erase everything.\n";
+ if (tokens.size() == 1) *kvt << "Error : no argument specified.\n";
for (u32int i = 1; i < tokens.size(); i++) {
if (!VFS::remove(tokens[i], cwd)) {
*kvt << "Error while removing file " << tokens[i] << "\n";
@@ -204,10 +204,10 @@ void kmain(multiboot_info_t* mbd, u32int magic) {
if (tokens.size() > 1) {
for (u32int i = 1; i < tokens.size(); i++) {
if (VFS::createDirectory(tokens[i], cwd) == NULL)
- *kvt << "Error while creating directory" << tokens[i] << "\n";
+ *kvt << "Error while creating directory " << tokens[i] << "\n";
}
} else {
- *kvt << "No argument specified. WTF???\n";
+ *kvt << "No argument specified.\n";
}
} else if (tokens[0] == "wf") {
*kvt << "Sorry, this command isn't implemented yet.\n";
diff --git a/Source/Kernel/Melon.ke b/Source/Kernel/Melon.ke
index bdc10a5..dbba5db 100755
--- a/Source/Kernel/Melon.ke
+++ b/Source/Kernel/Melon.ke
Binary files differ