Merge lp:~bregma/geis/lp-956538 into lp:geis

[Stephen M. Webb]

Fixes FTBFS in PPAs (lp: #956538).

Problem was caused by an ancient kernel version in the PPA coupled with poor error handling in geis_new().

[Chase Douglas (chasedouglas)]

Good bug hunting!

This brings up an amusing fact:

We now can initialize on a pre-2.6.27 kernel, but we can't actually do anything until a 2.6.31 kernel since that's when the first evdev MT protocol was merged.

So, all this just to make a compilation check test work :).

review: Approve

=== modified file 'libutouch-geis/geis_backend_multiplexor.c'
--- libutouch-geis/geis_backend_multiplexor.c	2011-10-17 21:50:41 +0000
+++ libutouch-geis/geis_backend_multiplexor.c	2012-03-16 00:27:18 +0000
@@ -2,7 +2,7 @@
  * @file geis_backend_multiplexor.c
  * @brief internal GEIS backend multiplexor implementation
  *
- * Copyright 2010 Canonical Ltd.
+ * Copyright 2010, 2012 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License as published by the Free
@@ -22,10 +22,12 @@
 #include "geis_backend_multiplexor.h"
 
 #include <errno.h>
+#include <fcntl.h>
 #include "geis_logging.h"
 #include <stdlib.h>
 #include <string.h>
 #include <sys/epoll.h>
+#include <unistd.h>
 
 
 typedef struct CallbackInfo *CallbackInfo;
@@ -220,22 +222,36 @@
   }
   else
   {
-    mx->mx_fd = epoll_create1(EPOLL_CLOEXEC);
+    mx->mx_fd = epoll_create(5);
     if (mx->mx_fd < 0)
     {
       geis_error("error %d creating backend multiplexor: %s",
                  errno, strerror(errno));
-      free(mx);
-    }
+      goto unwind_mx;
+    }
+    if (fcntl(mx->mx_fd, F_SETFD, FD_CLOEXEC) < 0)
+    {
+      geis_error("error %d setting close-on-exec flag: %s",
+                 errno, strerror(errno));
+    }
+
     mx->mx_max_events_per_pump = GEIS_BE_MX_DEFAULT_EVENTS_PER_PUMP;
 
     mx->mx_callback_infos = _callback_info_bag_new();
     if (!mx->mx_callback_infos)
     {
       geis_error("failed to allocate backend multiplexor callback_infos");
+      goto unwind_epoll;
     }
   }
+  goto final_exit;
 
+unwind_epoll:
+  close(mx->mx_fd);
+unwind_mx:
+  free(mx);
+  mx = NULL;
+final_exit:
   return mx;
 }
 
@@ -247,6 +263,7 @@
 geis_backend_multiplexor_delete(GeisBackendMultiplexor mx)
 {
   _callback_info_bag_delete(mx->mx_callback_infos);
+  close(mx->mx_fd);
   free(mx);
 }