Compare commits

...

2 Commits

1 changed files with 11 additions and 10 deletions

View File

@ -242,13 +242,13 @@ proc parseCommand(cmd: string): seq[string] =
else: newitem.add(c)
# runBuiltin runs a shell builtin
proc runBuiltin(builtin: string, args: openArray[string]): string =
proc runBuiltin(builtin: string, args: openArray[string]): (string, int) =
case builtin:
of "set":
if args.len < 2:
raise newShellCommandException("Not enough arguments provided", "set")
shellVariables[args[0]] = args[1..^1].join(" ")
return ""
return ("", 0)
of "setenv":
if args.len < 2:
raise newShellCommandException("Not enough arguments provided", "setenv")
@ -257,11 +257,11 @@ proc runBuiltin(builtin: string, args: openArray[string]): string =
putEnv(args[0], args[1..^1].join(":"))
except OSError as e:
raise newShellCommandException(e.msg, "setenv")
return ""
return ("", 0)
of "echo":
if args[0] == "-n":
return args[1..^1].join(" ")
return args.join(" ") & "\p"
return (args[1..^1].join(" "), 0)
return (args.join(" ") & "\p", 0)
of "exit":
if args.len == 0:
quit(0)
@ -289,13 +289,14 @@ proc execute(cmd: string): int =
let strm=cmd.newStringStream
while not strm.atEnd:
let parsed = strm.readCommand.parseCommand
if parsed == @[]:
if parsed == @[] or parsed == @[""]:
continue
let progname = parsed[0]
let args = parsed[1..parsed.high]
if progname in builtins:
stdout.write(runBuiltin(progname, args))
result = 0
let res=runBuiltin(progname, args)
stdout.write(res[0])
result=res[1]
continue
try:
let ps = startProcess(progname, args=args, options={poUsePath, poParentStreams})
@ -310,12 +311,12 @@ proc eval(cmd: string): string =
let strm=cmd.newStringStream
while not strm.atEnd():
let parsed = strm.readCommand.parseCommand
if parsed == @[]:
if parsed == @[] or parsed == @[""]:
continue
let progname=parsed[0]
let args = parsed[1..parsed.high]
if progname in builtins:
result = runBuiltin(progname, args)
result = runBuiltin(progname, args)[0]
continue
try:
let ps = startProcess(progname, args=args, options={poUsePath})