Changeset 171 for trunk/src/sh_entropy.c

Timestamp:

Jul 8, 2008, 11:16:14 AM (16 years ago)

Author:

katerina

Message:

Include dnmalloc (ticket #108) and fix bugs #106 (EINPROGRESS) and #107 (compressBound).

File:

• trunk/src/sh_entropy.c (modified) (4 diffs)

trunk/src/sh_entropy.c

@@ -147 +147 @@
         struct sockaddr_un addr;
         int addr_len;
+        int retval;
 
 #ifdef EGD_SOCKET_NAME
@@ -184 +185 @@
             SL_RETURN( -1, _("sh_entropy") );
           }
-        if( connect( fd, (struct sockaddr*)&addr, addr_len) == -1 )
+        do {
+          retval = connect(fd, (struct sockaddr *) &sinr, sizeof(sinr));
+        } while (retval < 0 && (errno == EINTR || errno == EINPROGRESS));
+        if( retval == -1 )
           {
             myerror = errno;
@@ -682 +686 @@
         status = -1;
       }
+#if !defined(USE_UNO)
     else if (WIFSIGNALED(status))
       {
@@ -692 +697 @@
         status = -1;
       }
+#endif
 
     source->pipe = NULL;