summaryrefslogtreecommitdiff
path: root/macros/luatex/latex/pyluatex/pyluatex.lua
diff options
context:
space:
mode:
Diffstat (limited to 'macros/luatex/latex/pyluatex/pyluatex.lua')
-rw-r--r--macros/luatex/latex/pyluatex/pyluatex.lua26
1 files changed, 18 insertions, 8 deletions
diff --git a/macros/luatex/latex/pyluatex/pyluatex.lua b/macros/luatex/latex/pyluatex/pyluatex.lua
index f95ab989c0..f9d8ff68a6 100644
--- a/macros/luatex/latex/pyluatex/pyluatex.lua
+++ b/macros/luatex/latex/pyluatex/pyluatex.lua
@@ -33,7 +33,6 @@ pyluatex = pyluatex or {
-- status.filename: path to pyluatex.sty
local folder = file.pathpart(file.collapsepath(status.filename, true))
-local script = file.join(folder, "pyluatex-interpreter.py")
local tcp = nil
local env_end = nil
@@ -53,6 +52,7 @@ local function err_cmd(message)
end
function pyluatex.start(executable)
+ local script = file.join(folder, "pyluatex-interpreter.py")
local is_windows = package.config:sub(1,1) ~= "/"
local cmd
if is_windows then
@@ -61,15 +61,25 @@ function pyluatex.start(executable)
cmd = executable .. " \"" .. script .. "\" &"
end
local f = io.popen(cmd, "r")
- local port = f:read("*l"):gsub("\r", ""):gsub("\n", "")
+ local port = f:read("*l")
f:close()
- if port then
- tcp = socket.tcp()
- tcp:connect("127.0.0.1", port)
- else
- tex.sprint(err_cmd("Python backend (executable: " .. executable ..
- ") could not be started"))
+ function err(message)
+ tex.sprint(err_cmd("Python backend could not be started (" .. message .. ")"))
+ end
+
+ if port == nil then
+ err("executable: " .. executable)
+ return
+ end
+ port = trim(port)
+ if port:match("^%d+$") == nil then
+ err("invalid TCP port: " .. port)
+ return
+ end
+ tcp = socket.tcp()
+ if tcp:connect("127.0.0.1", port) == nil then
+ err("TCP connection failed")
end
end