[vlc-commits] commit: luatelnet: don't replace \r by extra \n (Pierre Ynard )

git at videolan.org git at videolan.org
Wed Oct 27 01:47:23 CEST 2010


vlc/vlc-1.1 | branch: master | Pierre Ynard <linkfanel at yahoo.fr> | Wed Oct 27 01:26:47 2010 +0200| [4e5c16e39e5c4db8a0c3d2f2bce4e59c4c15a5b0] | committer: Pierre Ynard 

luatelnet: don't replace \r by extra \n

It's useless and create bogus empty commands, that output ugly blank
lines and crap during login
(cherry picked from commit a94688f91336176d32649824369dc9d9bde8d126)

Signed-off-by: Pierre Ynard <linkfanel at yahoo.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=4e5c16e39e5c4db8a0c3d2f2bce4e59c4c15a5b0
---

 share/lua/intf/telnet.lua |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/share/lua/intf/telnet.lua b/share/lua/intf/telnet.lua
index 8de12ff..209ae90 100644
--- a/share/lua/intf/telnet.lua
+++ b/share/lua/intf/telnet.lua
@@ -181,7 +181,7 @@ while not vlc.misc.should_die() do
 
     -- Handle reads
     for _, client in pairs(r) do
-        local str = client.cmds .. string.gsub(client:recv(1000), "\r", "\n")
+        local str = client.cmds .. client:recv(1000)
 
         if not str then -- the telnet client program has leave
             client.cmds = "quit"



More information about the vlc-commits mailing list