curioustorvald/tsvm
1
0
Fork 0
mirror of https://github.com/curioustorvald/tsvm.git synced 2026-06-09 14:44:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

command.js's coreutils now using new filesystem impl

Browse Source
This commit is contained in:
minjaesong
2022-08-18 18:52:33 +09:00
parent 01e7ead7fa
commit 70b9530948
2 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/disk0/tvdos/TVDOS.SYS
View File

@@ -365,7 +365,7 @@ _TVDOS.DRV.FS.SERIAL.remove = (fd) => {
let port = _TVDOS.DRV.FS.SERIAL._toPorts(fd.driveLetter) let port = _TVDOS.DRV.FS.SERIAL._toPorts(fd.driveLetter)
com.sendMessage(port[0], "DELETE") com.sendMessage(port[0], "DELETE")
let response = com.getStatusCode(port[0]) let response = com.getStatusCode(port[0])
return (response === 0) return response
} }
_TVDOS.DRV.FS.SERIAL.exists = (fd) => { _TVDOS.DRV.FS.SERIAL.exists = (fd) => {
return (0 == _TVDOS.DRV.FS.SERIAL._openr(fd)) return (0 == _TVDOS.DRV.FS.SERIAL._openr(fd))

52
assets/disk0/tvdos/bin/command.js
View File

@@ -379,76 +379,80 @@ shell.coreutils = {
}, },
del: function(args) { del: function(args) {
if (args[1] === undefined) { if (args[1] === undefined) {
printerrln(`Usage: ${args[0].toUpperCase()} file_to_delete`); printerrln(`Usage: ${args[0].toUpperCase()} file_to_delete`)
return return
} }
var pathOpenedStatus = filesystem.open(CURRENT_DRIVE, args[1], 'R'); let file = files.open(shell.resolvePathInput(args[1]).full)
if (pathOpenedStatus != 0) { printerrln("File not found"); return pathOpenedStatus; } if (!file.exists) { printerrln("File not found"); return 1 }
return filesystem.remove(CURRENT_DRIVE) let removalStatus = file.remove()
if (removalStatus != 0) { printerrln("File removal failed"); return removalStatus }
}, },
echo: function(args) { echo: function(args) {
if (args[1] !== undefined) { if (args[1] !== undefined) {
args.forEach(function(it,i) { if (i > 0) print(shell.replaceVarCall(it)+" ") }); args.forEach(function(it,i) { if (i > 0) print(shell.replaceVarCall(it)+" ") })
} }
println(); println()
}, },
exit: function(args) { exit: function(args) {
cmdExit = true; cmdExit = true
}, },
mkdir: function(args) { mkdir: function(args) {
if (args[1] === undefined) { if (args[1] === undefined) {
printerrln(`Usage: ${args[0].toUpperCase()} directory_name_to_create`); printerrln(`Usage: ${args[0].toUpperCase()} directory_name_to_create`)
return return
} }
var path = shell.resolvePathInput(args[1]) let path = shell.resolvePathInput(args[1])
if (DEBUG_PRINT) serial.println("command.js > mkdir > pathstr = "+path.string); let file = files.open(path.full)
if (DEBUG_PRINT) serial.println("command.js > mkdir > pathstr = "+path.full)
// check if path is valid // check if path is valid
var dirOpenedStatus = filesystem.open(CURRENT_DRIVE, path.string, 'W'); if (!file.exists) {
var mkdird = filesystem.mkDir(CURRENT_DRIVE); let mkdird = file.mkDir()
if (!mkdird) { printerrln(`${args[0].toUpperCase()} failed for '${path.string}'`); return dirOpenedStatus; } if (!mkdird) { printerrln(`${args[0].toUpperCase()} failed for '${path.full}'`); return 1 }
}
else return 1
}, },
rem: function(args) { rem: function(args) {
return 0; return 0
}, },
set: function(args) { set: function(args) {
// print all the env vars // print all the env vars
if (args[1] === undefined) { if (args[1] === undefined) {
Object.entries(_TVDOS.variables).forEach(function(a) { println(a[0]+"="+a[1]); }) Object.entries(_TVDOS.variables).forEach(function(a) { println(a[0]+"="+a[1]) })
} }
else { else {
// parse key-value pair with splitter '=' // parse key-value pair with splitter '='
var key = undefined; var value = undefined; var key = undefined; var value = undefined
// if syntax "<key> = <value>" is used? // if syntax "<key> = <value>" is used?
if ('=' == args[2]) { if ('=' == args[2]) {
key = args[1].toUpperCase(); value = args[3]; key = args[1].toUpperCase(); value = args[3]
} }
else if (args[2] === undefined) { else if (args[2] === undefined) {
var pair = args[1].split('='); var pair = args[1].split('=')
key = pair[0].toUpperCase(); value = pair[1]; key = pair[0].toUpperCase(); value = pair[1]
} }
if (key == undefined) throw SyntaxError("Input format must be 'key=value'"); if (key == undefined) throw SyntaxError("Input format must be 'key=value'")
// if value is undefined, show what envvar[key] has // if value is undefined, show what envvar[key] has
if (value === undefined) { if (value === undefined) {
if (_TVDOS.variables[key] === undefined) if (_TVDOS.variables[key] === undefined)
println("Environment variable '"+key+"' not found"); println("Environment variable '"+key+"' not found")
else else
println(_TVDOS.variables[key]) println(_TVDOS.variables[key])
} }
else { else {
_TVDOS.variables[key] = shell.replaceVarCall(value); _TVDOS.variables[key] = shell.replaceVarCall(value)
// if key is KEYBOARD, reload the keyboard layout // if key is KEYBOARD, reload the keyboard layout
if ("KEYBOARD" == key) if ("KEYBOARD" == key)
input.changeKeyLayout(_TVDOS.variables.KEYBOARD || "us_qwerty"); input.changeKeyLayout(_TVDOS.variables.KEYBOARD || "us_qwerty")
} }
} }
}, },
ver: function(args) { ver: function(args) {
println(welcome_text); println(welcome_text)
}, },
panic: function(args) { panic: function(args) {
throw Error("Panicking command.js") throw Error("Panicking command.js")