summaryrefslogtreecommitdiff
path: root/Source/Applications
diff options
context:
space:
mode:
authorAlexis211 <alexis211@gmail.com>2009-12-09 16:03:02 +0100
committerAlexis211 <alexis211@gmail.com>2009-12-09 16:03:02 +0100
commit1a1e0efa7b1894848c81d7f7e80bdcf6e8591c3f (patch)
treee8f48d76c145635acf5acf19dd5274038f3d21de /Source/Applications
parent99e021d4d6b29bb180a7c6a8883251408b7a3f62 (diff)
parent8ec4ea37162121bf76d9df4b469478697ef6ba04 (diff)
downloadMelon-1a1e0efa7b1894848c81d7f7e80bdcf6e8591c3f.tar.gz
Melon-1a1e0efa7b1894848c81d7f7e80bdcf6e8591c3f.zip
Merge branch 'master' into mountpoints
Conflicts: Makefile
Diffstat (limited to 'Source/Applications')
-rw-r--r--Source/Applications/Shell/Shell.ns.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/Applications/Shell/Shell.ns.cpp b/Source/Applications/Shell/Shell.ns.cpp
index d34c360..56a6b5f 100644
--- a/Source/Applications/Shell/Shell.ns.cpp
+++ b/Source/Applications/Shell/Shell.ns.cpp
@@ -1,5 +1,6 @@
#include "Shell.ns.h"
#include <Binding/Sys.ns.h>
+#include <Binding/Process.class.h>
namespace Shell {
@@ -64,6 +65,8 @@ u32int run() {
outvt << "Uptime : " << (s64int)Sys::uptime() << "s\n";
} else if (cmd[0] == "free") {
outvt << "Free RAM : " << (s64int)Sys::freeRam() << " Kio of " << (s64int)Sys::totalRam() << " Kio\n";
+ } else if (cmd[0] == "uid") {
+ outvt << "User ID : " << (s64int)(Process::get().getUid()) << "\n";
} else if (cmd[0] == "help") {
while (cmd.size() > 1) cmd.pop();
cmd.push("/Applications/Shell/Help.txt");