[multipathd] readline support for daemon control shell

... with history

diff --git a/multipathd/Makefile b/multipathd/Makefile
index 5af3f83..cca8b0f 100644 (file)
--- a/multipathd/Makefile
+++ b/multipathd/Makefile
@@ -15,7 +15,7 @@ rcdir = /etc/init.d
 #
 CFLAGS = -pipe -g -Wall -Wunused -Wstrict-prototypes \
         -DDAEMON -I$(multipathdir) -I$(checkersdir)
-LDFLAGS = -lpthread -ldevmapper -lsysfs
+LDFLAGS = -lpthread -ldevmapper -lsysfs -lreadline
 
 #
 # debuging stuff

diff --git a/multipathd/uxclnt.c b/multipathd/uxclnt.c
index fc019dc..d6f1f65 100644 (file)
--- a/multipathd/uxclnt.c
+++ b/multipathd/uxclnt.c
@@ -8,6 +8,8 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/poll.h>
+#include <readline/readline.h>
+#include <readline/history.h>
 
 #include <uxsock.h>
 
@@ -16,21 +18,18 @@
  */
 static void process(int fd)
 {
-       char line[1000];
+       char *line;
        char *reply;
 
-       while (fgets(line, sizeof(line), stdin)) {
+       while (line = readline("multipathd> ")) {
                size_t len = strlen(line);
 
-               if (line[len-1] == '\n') {
-                       line[len-1] = 0;
-                       len--;
-               }
-               
                if (send_packet(fd, line, strlen(line)) != 0) break;
                if (recv_packet(fd, &reply, &len) != 0) break;
 
                printf("%*.*s\n", (int)len, (int)len, reply);
+               add_history(line);
+               free(line);
                free(reply);
        }
 }