fix: say if no perms for executable instead of printing not found

dev
TorchedSammy 2021-11-21 18:45:44 -05:00
parent 2f816c33cd
commit 06272778f8
Signed by: sammyette
GPG Key ID: 904FC49417B44DCD
2 changed files with 38 additions and 5 deletions

View File

@ -166,3 +166,7 @@ bait.catch('command.not-found', function(cmd)
print(string.format('hilbish: %s not found', cmd))
end)
bait.catch('command.no-perm', function(cmd)
print(string.format('hilbish: %s: no permission', cmd))
end)

View File

@ -4,6 +4,7 @@ import (
"context"
"fmt"
"os"
"path/filepath"
"strings"
"time"
@ -95,7 +96,6 @@ func execCommand(cmd string) error {
}
exechandle := func(ctx context.Context, args []string) error {
hc := interp.HandlerCtx(ctx)
_, argstring := splitInput(strings.Join(args, " "))
// If alias was found, use command alias
@ -142,7 +142,11 @@ func execCommand(cmd string) error {
return interp.NewExitStatus(exitcode)
}
if _, err := interp.LookPathDir(hc.Dir, hc.Env, args[0]); err != nil {
err := lookpath(args[0])
if err == os.ErrPermission {
hooks.Em.Emit("command.no-perm", args[0])
return interp.NewExitStatus(126)
} else if err != nil {
hooks.Em.Emit("command.not-found", args[0])
return interp.NewExitStatus(127)
}
@ -158,6 +162,31 @@ func execCommand(cmd string) error {
return err
}
// custom lookpath function so we know if a command is found *and* has execute permission
func lookpath(file string) error {
for _, dir := range filepath.SplitList(os.Getenv("PATH")) {
path := filepath.Join(dir, file)
err := findExecutable(path)
if err == os.ErrPermission {
return err
} else if err == nil {
return nil
}
}
return os.ErrNotExist
}
func findExecutable(name string) error {
f, err := os.Stat(name)
if err != nil {
return err
}
if m := f.Mode(); !m.IsDir() && m & 0111 != 0 {
return nil
}
return os.ErrPermission
}
func splitInput(input string) ([]string, string) {
// end my suffering
// TODO: refactor this garbage