Merge lp:~chasedouglas/geis/looping into lp:geis

[Chase Douglas]

This should alleviate the looping and allow the client to unstick itself
after five seconds. I don't know why geis is not sending the init
message though.

Any ideas on how to test that if geis does not send an init message after
five seconds that control returns to the caller?

[Tormod Volden (tormodvolden)]

FWIW I tried your 185 and 186 patches on top of 2.2.2-0ubuntu1. Now eog and evince segfault instead of looping.

=== modified file 'libutouch-geis/geis_v1.c'
--- libutouch-geis/geis_v1.c	2011-10-17 21:17:25 +0000
+++ libutouch-geis/geis_v1.c	2012-01-11 22:10:27 +0000
@@ -468,15 +468,20 @@
     {
       fd_set read_fds;
       FD_ZERO(&read_fds);
-      FD_SET(0, &read_fds);
       FD_SET(geis_fd, &read_fds);
+      struct timeval timeout = { 5, 0 }; /* wait up to 5 seconds */
 
-      int sstat = select(geis_fd + 1, &read_fds, NULL, NULL, NULL);
+      int sstat = select(geis_fd + 1, &read_fds, NULL, NULL, &timeout);
       if (sstat < 0)
       {
         fprintf(stderr, "error %d in select(): %s\n", errno, strerror(errno));
         break;
       }
+      else if (sstat == 0)
+      {
+        fprintf(stderr, "failed to get init response\n");
+        break;
+      }
 
       if (FD_ISSET(geis_fd, &read_fds))
       {