sigmasternchen/Wish
1
0
Fork 0
mirror of https://github.com/sigmasternchen/Wish synced 2025-03-15 15:38:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

found a few bugs

Browse source
This commit is contained in:
overflowerror 2014-05-17 23:18:27 +02:00
parent 249d953f3f
commit 1db0c81db5
1 changed files with 45 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
wish-sys/sys-part/bin/wsh.js
View file

@ -1,6 +1,17 @@
const NO_INTERNAL_COMMAND = 1337;
WshClass = function() { WshClass = function() {
} }
WshClass.prototype = new Process(); WshClass.prototype = new Process();
WshClass.prototype.iCommands = {
"exit": function(params, own) {
var rv = 0;
if (params.length > 1)
rv = parseInt(params[1]);
Kernel.ProcessManager.quit(own);
throw rv;
}
}
WshClass.prototype.state = 0; WshClass.prototype.state = 0;
WshClass.prototype.Environment = function() { WshClass.prototype.Environment = function() {
} }
@ -13,15 +24,22 @@ WshClass.prototype.main = function(args) {
Kernel.Scheduler.add(this); Kernel.Scheduler.add(this);
this.uid = Kernel.ProcessManager.getUserByPID(this.pid); this.uid = Kernel.ProcessManager.getUserByPID(this.pid);
this.username = Kernel.UserManager.getUserById(this.uid).username; this.username = Kernel.UserManager.getUserById(this.uid).username;
this.Environment.array['HOME'] = args[2]; if (args[2]) {
this.Environment.array['PWD'] = args[2]; this.Environment.array['HOME'] = args[2];
this.Environment.array['PWD'] = args[2];
} else if (!this.Environment.array['HOME']) {
this.Environment.array['HOME'] = "/";
this.Environment.array['PWD'] = "/";
} else {
this.Environment.array['PWD'] = this.Environment.array['HOME'];
}
} }
WshClass.prototype.tick = function() { WshClass.prototype.tick = function() {
var stdout = this.files['stdout']; var stdout = this.files['stdout'];
var stdin = this.files['stdin']; var stdin = this.files['stdin'];
switch(this.state) { switch(this.state) {
case 0: case 0:
stdout.write("Welcome to WishOS 0.1 (WOSKernel 0.1)\n\n"); stdout.write("Welcome to WishOS 0.1 (WOSKernel 0.9)\n\n");
console.log("wsh: loading profile"); console.log("wsh: loading profile");
var prof = new File("/etc/profile.d/env.json"); var prof = new File("/etc/profile.d/env.json");
var array = JSON.parse(prof.read().replace(EOF, "")); var array = JSON.parse(prof.read().replace(EOF, ""));
@ -29,10 +47,13 @@ WshClass.prototype.tick = function() {
for (var i = 0; i < array.length; i++) { for (var i = 0; i < array.length; i++) {
while(array[i][1].indexOf("\\033") != -1) while(array[i][1].indexOf("\\033") != -1)
array[i][1] = array[i][1].replace("\\033", "\033"); array[i][1] = array[i][1].replace("\\033", "\033");
console.log("wsh: set env." + array[i][0] + " = \"" + array[i][1] + "\"");
this.Environment.array[array[i][0]] = array[i][1]; this.Environment.array[array[i][0]] = array[i][1];
} }
console.log("wsh: checking for home directory: " + this.Environment.array['HOME']);
var file = new File(this.Environment.array['HOME']); var file = new File(this.Environment.array['HOME']);
if (!file.exists() || !(file.getPermissions() & PERM_D)) { if (!file.exists() || !(file.getPermissions() & PERM_D)) {
console.log("wsh: home dir not found or not a directory");
stdout.write("\033[31mHome directory not found. Using / instead.\n\n"); stdout.write("\033[31mHome directory not found. Using / instead.\n\n");
this.Environment.array['HOME'] = "/"; this.Environment.array['HOME'] = "/";
this.Environment.array['PWD'] = "/"; this.Environment.array['PWD'] = "/";
@ -132,7 +153,7 @@ WshClass.prototype.parseLine = function() {
for (var i = 0; i < lparts.length; i++) for (var i = 0; i < lparts.length; i++)
parts.push(lparts[i]); parts.push(lparts[i]);
} }
params = parts; params = parts;
if (params.length == 0) { if (params.length == 0) {
this.input = new Array(); this.input = new Array();
@ -171,7 +192,14 @@ WshClass.prototype.parseLine = function() {
this.input = new Array(); this.input = new Array();
return; return;
} }
console.log("wsh: checking if internal command")
var rv = this.internalCommand(params)
if (rv != NO_INTERNAL_COMMAND) {
return rv;
}
var ok = false; var ok = false;
var name = params[0]; var name = params[0];
var file = ""; var file = "";
@ -209,9 +237,19 @@ WshClass.prototype.parseLine = function() {
prog.files['stdin'] = this.files['stdin']; prog.files['stdin'] = this.files['stdin'];
prog.files['stdout'] = this.files['stdout']; prog.files['stdout'] = this.files['stdout'];
prog.Environment = this.Environment; prog.Environment = this.Environment;
console.log("wsh: program start: " + file); console.log("wsh: program main start: " + file);
prog.main(params); prog.main(params);
console.log("wsh: main shut down"); console.log("wsh: program main return");
}
WshClass.prototype.internalCommand = function(params) {
if (this.iCommands[params[0]]) {
console.log("wsh: internal command");
console.log("wsh: executing internal representation");
return this.iCommands[params[0]](params, this);
} else {
console.log("wsh: no internal command");
return NO_INTERNAL_COMMAND;
}
} }
WshClass.prototype.tryFile = function(name) { WshClass.prototype.tryFile = function(name) {
var file = new File(name); var file = new File(name);