From de9a5b716fe37a569547b2aa1c2b93b6e5110f8e Mon Sep 17 00:00:00 2001
From: Ben Kibbey <bjk@luxsci.net>
Date: Mon, 7 Jan 2013 22:51:22 -0500
Subject: [PATCH] Return value from do_interactive().

pwmd_process() may return an error which affects pwmd_close().

Fix build failure.
---
 src/pwmc.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pwmc.c b/src/pwmc.c
index d33c7021..3d8ed2c7 100644
--- a/src/pwmc.c
+++ b/src/pwmc.c
@@ -375,6 +375,9 @@ status_msg_cb (void *data, const char *line)
 {
   char *p = strchr (line, ' ');
 
+  if (!strcmp (line, "KEEPALIVE"))
+    return 0;
+
   if (*line != '#' && p && strchr (p, ' ') && *++p)
     {
       char *p1 = strchr (p, ' ');
@@ -1176,6 +1179,7 @@ do_interactive ()
       char *result = NULL;
       size_t len;
 
+      rc = 0;
       line = readline ("pwm> ");
       if (interactive_error)
 	{
@@ -1225,7 +1229,7 @@ do_interactive ()
     }
 
   free_inquire (inq);
-  return 0;
+  return rc;
 }
 #endif
 
@@ -1366,7 +1370,6 @@ main (int argc, char *argv[])
   int timeout = 0;
 #ifdef WITH_SSH
   int use_ssh_agent = 1;
-  long socket_timeout = 0;
   char *knownhosts = NULL;
   char *identity = NULL;
 #endif
@@ -1380,6 +1383,7 @@ main (int argc, char *argv[])
 #endif
 #if defined(WITH_SSH) || defined(WITH_GNUTLS)
   pwmd_socket_t socktype;
+  long socket_timeout = 0;
 #endif
   int lock_on_open = 1;
   long lock_timeout = 0;
-- 
2.11.4.GIT