[3.0] 2c0f1ba Workaround a problem in recent libedit versions

Federico G. Schwindt fgsch at lodoss.net
Mon Jun 30 14:32:24 CEST 2014


commit 2c0f1ba2cba0e888ae089394fca5c4b8e0ddd528
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Jun 30 13:08:42 2014 +0100

    Workaround a problem in recent libedit versions
    
    Reinstall the readline handler when we are called in order to clear the
    input line. Tested in a variety of versions by scn and myself.
    
    Fixes #1531

diff --git a/bin/varnishadm/varnishadm.c b/bin/varnishadm/varnishadm.c
index 005c62f..8a4ce45 100644
--- a/bin/varnishadm/varnishadm.c
+++ b/bin/varnishadm/varnishadm.c
@@ -177,6 +177,7 @@ static void send_line(char *l)
 		cli_write(_line_sock, l);
 		cli_write(_line_sock, "\n");
 		add_history(l);
+		rl_callback_handler_install("varnish> ", send_line);
 	} else {
 		RL_EXIT(0);
 	}



More information about the varnish-commit mailing list