exec.go

@@ -101,9 +101,9 @@ func runInput(input string, priv bool) {
 					cmdFinish(0, input, priv)
 					return
 				}
-				input, exitCode, cont, err = handleSh(input)
+				input, exitCode, err, cont = handleSh(input)
 			case "hybridRev":
-				_, _, _, err = handleSh(input)
+				_, _, err, cont = handleSh(input)
 				if err == nil {
 					cmdFinish(0, input, priv)
 					return
@@ -112,27 +112,55 @@ func runInput(input string, priv bool) {
 			case "lua":
 				input, exitCode, err = handleLua(cmdString)
 			case "sh":
-				input, exitCode, cont, err = handleSh(input)
+				input, exitCode, err, cont = handleSh(input)
 		}
 	} else {
 		// can only be a string or function so
-		input, exitCode, cont, err = runLuaRunner(currentRunner, input)
+		term := rt.NewTerminationWith(l.MainThread().CurrentCont(), 3, false)
+		err = rt.Call(l.MainThread(), currentRunner, []rt.Value{rt.StringValue(input)}, term)
 		if err != nil {
 			fmt.Fprintln(os.Stderr, err)
 			cmdFinish(124, input, priv)
 			return
 		}
-	}
 
-	if cont {
+		var runner *rt.Table
-		input, err = reprompt(input)
+		var ok bool
-		if err == nil {
+		runnerRet := term.Get(0)
-			goto rerun
+		if runner, ok = runnerRet.TryTable(); !ok {
-		} else if err == io.EOF {
+			fmt.Fprintln(os.Stderr, "runner did not return a table")
-			return
+		}
+
+		if code, ok := runner.Get(rt.StringValue("exitCode")).TryInt(); ok {
+			exitCode = uint8(code)
+		}
+		
+		if inp, ok := runner.Get(rt.StringValue("input")).TryString(); ok {
+			input = inp
+		}
+
+		if errStr, ok := runner.Get(rt.StringValue("err")).TryString(); ok {
+			err = fmt.Errorf("%s", errStr)
+		}
+
+		if c, ok := runner.Get(rt.StringValue("continue")).TryBool(); ok {
+			cont = c
 		}
 	}
 
+	if cont {
+		for {
+			input, err = continuePrompt(strings.TrimSuffix(input, "\\"))
+			if err != nil {
+				break
+			}
+
+			if strings.HasSuffix(cmdString, "\\") {
+				continue
+			}
+			goto rerun
+		}
+	}
 	if err != nil {
 		if exErr, ok := isExecError(err); ok {
 			hooks.Em.Emit("command." + exErr.typ, exErr.cmd)
@@ -143,52 +171,6 @@ func runInput(input string, priv bool) {
 	cmdFinish(exitCode, input, priv)
 }
 
-func reprompt(input string) (string, error) {
-	for {
-		in, err := continuePrompt(strings.TrimSuffix(input, "\\"))
-		if err != nil {
-			return input, err
-		}
-
-		if strings.HasSuffix(in, "\\") {
-			continue
-		}
-		return in, nil
-	}
-}
-
-func runLuaRunner(runr rt.Value, userInput string) (input string, exitCode uint8, continued bool, err error) {
-	term := rt.NewTerminationWith(l.MainThread().CurrentCont(), 3, false)
-	err = rt.Call(l.MainThread(), runr, []rt.Value{rt.StringValue(userInput)}, term)
-	if err != nil {
-		return
-	}
-
-	var runner *rt.Table
-	var ok bool
-	runnerRet := term.Get(0)
-	if runner, ok = runnerRet.TryTable(); !ok {
-		fmt.Fprintln(os.Stderr, "runner did not return a table")
-	}
-
-	if code, ok := runner.Get(rt.StringValue("exitCode")).TryInt(); ok {
-		exitCode = uint8(code)
-	}
-
-	if inp, ok := runner.Get(rt.StringValue("input")).TryString(); ok {
-		input = inp
-	}
-
-	if errStr, ok := runner.Get(rt.StringValue("err")).TryString(); ok {
-		err = fmt.Errorf("%s", errStr)
-	}
-
-	if c, ok := runner.Get(rt.StringValue("continue")).TryBool(); ok {
-		continued = c
-	}
-	return
-}
-
 func handleLua(cmdString string) (string, uint8, error) {
 	// First try to load input, essentially compiling to bytecode
 	chunk, err := l.CompileAndLoadLuaChunk("", []byte(cmdString), rt.TableValue(l.GlobalEnv()))
@@ -215,25 +197,25 @@ func handleLua(cmdString string) (string, uint8, error) {
 	return cmdString, 125, err
 }
 
-func handleSh(cmdString string) (string, uint8, bool, error) {
+func handleSh(cmdString string) (string, uint8, error, bool) {
 	_, _, err := execCommand(cmdString, true)
 	if err != nil {
 		// If input is incomplete, start multiline prompting
 		if syntax.IsIncomplete(err) {
 			if !interactive {
-				return cmdString, 126, false, err
+				return cmdString, 126, err, false
 			}
-			return cmdString, 126, true, err
+			return cmdString, 126, err, true
 		} else {
 			if code, ok := interp.IsExitStatus(err); ok {
-				return cmdString, code, false, nil
+				return cmdString, code, nil, false
 			} else {
-				return cmdString, 126, false, err
+				return cmdString, 126, err, false
 			}
 		}
 	}
 
-	return cmdString, 0, false, nil
+	return cmdString, 0, nil, false
 }
 
 // Run command in sh interpreter

runnermode.go

@@ -28,7 +28,7 @@ func shRunner(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
 		return nil, err
 	}
 
-	input, exitCode, cont, err := handleSh(cmd)
+	input, exitCode, err, cont := handleSh(cmd)
 	var luaErr rt.Value = rt.NilValue
 	if err != nil {
 		luaErr = rt.StringValue(err.Error())