Various improvements. Close-on-exec and close on failure on either

[egate.git] / util / gipc.c

diff --git a/util/gipc.c b/util/gipc.c
index 1834246..cb0b697 100644 (file)
--- a/util/gipc.c
+++ b/util/gipc.c
@@ -2,7 +2,14 @@
  * Europagate, 1995
  *
  * $Log: gipc.c,v $
- * Revision 1.4  1995/04/20 15:12:45  adam
+ * Revision 1.6  1995/05/01 16:27:29  adam
+ * Various improvements. Close-on-exec and close on failure on either
+ * read or write FIFO.
+ *
+ * Revision 1.5  1995/04/21  16:38:07  adam
+ * Added more debugging logs.
+ *
+ * Revision 1.4  1995/04/20  15:12:45  adam
  * Minor hacks really.
  *
  * Revision 1.3  1995/04/19  16:02:06  adam
@@ -41,22 +48,45 @@ int gipc_open (GIP gip, const char *server, int sync)
 {
     if (sync) 
     {
-        gw_log (GW_LOG_DEBUG, "gipc", "Open readonly of %s", gip->name);
-        gip->rfd = open (gip->name, O_RDONLY);
-        gw_log (GW_LOG_DEBUG, "gipc", "Open writeonly of %s", server);
+        gw_log (GW_LOG_DEBUG, "gipc", "Open sync writeonly of %s", server);
        gip->wfd = open (server, O_WRONLY);
+        gw_log (GW_LOG_DEBUG, "gipc", "got wfd %d", gip->wfd);
+
+        gw_log (GW_LOG_DEBUG, "gipc", "Open sync readonly of %s", gip->name);
+        gip->rfd = open (gip->name, O_RDONLY);
+        gw_log (GW_LOG_DEBUG, "gipc", "got rfd %d", gip->rfd);
     }
     else
     {
-        gip->wfd = open (server, O_WRONLY|O_NONBLOCK);
+        gw_log (GW_LOG_DEBUG, "gipc", "Open readonly of %s", gip->name);
        gip->rfd = open (gip->name, O_RDONLY|O_NONBLOCK);
+        gw_log (GW_LOG_DEBUG, "gipc", "got rfd %d", gip->rfd);
+
+        gw_log (GW_LOG_DEBUG, "gipc", "Open witeonly of %s", server);
+        gip->wfd = open (server, O_WRONLY|O_NONBLOCK);
+        gw_log (GW_LOG_DEBUG, "gipc", "got wfd %d", gip->wfd);
     }
     if (gip->rfd == -1)
+    {
+        gw_log (GW_LOG_DEBUG, "gipc", "Cannot open %s", gip->name);
+        if (gip->wfd != -1)
+        {
+            close (gip->wfd);
+            gip->wfd = -1;
+        }
         return -1;
+    }
     if (gip->wfd == -1)
+    {
+        gw_log (GW_LOG_DEBUG, "gipc", "Cannot open %s", server);
+        close (gip->rfd);
+        gip->rfd = -1;
         return -2;
+    }
     fcntl (gip->wfd, F_SETFL, 0);
     fcntl (gip->rfd, F_SETFL, 0);
+    fcntl (gip->wfd, F_SETFD, FD_CLOEXEC);
+    fcntl (gip->rfd, F_SETFD, FD_CLOEXEC);
     return 0;
 }