curioustorvald/tsvm
1
0
Fork 0
mirror of https://github.com/curioustorvald/tsvm.git synced 2026-03-17 00:16:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

command.js: . and .. on path resolving

Browse Source
This commit is contained in:
minjaesong
2020-11-12 11:11:35 +09:00
parent 78df4d2971
commit 88ef2e05ab
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
assets/tvdos/TVDOS.SYS
View File

@@ -77,18 +77,13 @@ filesystem.isDirectory = function(driveLetter) {
com.sendMessage(port[0], "LISTFILES"); com.sendMessage(port[0], "LISTFILES");
let response = com.getStatusCode(port[0]); let response = com.getStatusCode(port[0]);
if (135 == response) {
throw Error("File not opened");
}
return (response === 0); return (response === 0);
} }
filesystem.mkDir = function(driveLetter) { filesystem.mkDir = function(driveLetter) {
let port = filesystem._toPorts(driveLetter); let port = filesystem._toPorts(driveLetter);
com.sendMessage(port[0], "MKDIR"); com.sendMessage(port[0], "MKDIR");
let response = com.getStatusCode(port[0]); let response = com.getStatusCode(port[0]);
if (135 == response) {
throw Error("File not opened");
}
if (response < 0 || response >= 128) { if (response < 0 || response >= 128) {
let status = com.getDeviceStatus(port[0]); let status = com.getDeviceStatus(port[0]);
throw Error("Creating a directory failed with ("+response+"): "+status.message+"\n"); throw Error("Creating a directory failed with ("+response+"): "+status.message+"\n");

19
assets/tvdos/bin/command.js
View File

@@ -127,9 +127,26 @@ function resolvePathInput(input) {
// replace slashes into revslashes // replace slashes into revslashes
let pathstr = input.replaceAll('/','\\\\'); let pathstr = input.replaceAll('/','\\\\');
let startsWithSlash = input.startsWith('\\'); let startsWithSlash = input.startsWith('\\');
let newPwd = [];
// split them into an array while filtering empty elements except for the root 'head' // split them into an array while filtering empty elements except for the root 'head'
let newPwd = (startsWithSlash ? [""] : shell_pwd).concat(pathstr.split("\\").filter(function(it) { return (it.length > 0); })); let ipwd = (startsWithSlash ? [""] : shell_pwd).concat(pathstr.split("\\").filter(function(it) { return (it.length > 0); }));
serial.println("command.js > resolvePathInput > ipwd = "+ipwd);
serial.println("command.js > resolvePathInput > newPwd = "+newPwd);
// process dots
ipwd.forEach(function(it) {
serial.println("command.js > resolvePathInput > ipwd.forEach > it = "+it);
if (it === ".." && newPwd[1] !== undefined) {
newPwd.pop();
}
else if (it !== ".." && it !== ".") {
newPwd.push(it);
}
serial.println("command.js > resolvePathInput > newPwd = "+newPwd);
});
// construct new pathstr from pwd arr so it will be sanitised // construct new pathstr from pwd arr so it will be sanitised
pathstr = newPwd.join('\\').substring(1); pathstr = newPwd.join('\\').substring(1);