Commit b8836621 authored by Rafaël Carré's avatar Rafaël Carré

luarc: use info instead of error when exiting, don't try to interpret empty lines as commands

parent 83e72e86
...@@ -111,7 +111,7 @@ end ...@@ -111,7 +111,7 @@ end
function shutdown(name,client) function shutdown(name,client)
client:append("Bye-bye!") client:append("Bye-bye!")
h:broadcast("Shutting down.") h:broadcast("Shutting down.")
vlc.msg.err("Requested shutdown.") vlc.msg.info("Requested shutdown.")
vlc.quit() vlc.quit()
end end
...@@ -466,17 +466,17 @@ while not vlc.should_die() do ...@@ -466,17 +466,17 @@ while not vlc.should_die() do
local input = client:recv(1000) local input = client:recv(1000)
if string.match(input,"\n$") then if string.match(input,"\n$") then
client.buffer = string.gsub(client.buffer..input,"\r?\n$","") client.buffer = string.gsub(client.buffer..input,"\r?\n$","")
done = true
elseif client.buffer == "" elseif client.buffer == ""
and ((client.type == host.client_type.stdio and input == "") and ((client.type == host.client_type.stdio and input == "")
or (client.type == host.client_type.net and input == "\004")) then or (client.type == host.client_type.net and input == "\004")) then
-- Caught a ^D -- Caught a ^D
client.buffer = "quit" client.buffer = "quit"
done = true
else else
client.buffer = client.buffer .. input client.buffer = client.buffer .. input
end end
if done then if client.buffer == "" then
client:send( client.env.prompt )
else
local cmd,arg = split_input(client.buffer) local cmd,arg = split_input(client.buffer)
client.buffer = "" client.buffer = ""
client:switch_status(host.status.write) client:switch_status(host.status.write)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment