Argh! RO[LR]64 broken on 32-bit shifts! Tested and fixed.

[mLib] / conn.c

diff --git a/conn.c b/conn.c
index e734f30459c0e0aa521f2fbd2580520b5e8b9853..7312bcb729c3bb47acce44d7afbfd3c67b4c86d4 100644 (file)
--- a/conn.c
+++ b/conn.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: conn.c,v 1.8 2003/10/12 14:47:10 mdw Exp $
+ * $Id: conn.c,v 1.10 2004/04/08 01:36:11 mdw Exp $
  *
  * Nonblocking connect handling
  *
@@ -27,41 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: conn.c,v $
- * Revision 1.8  2003/10/12 14:47:10  mdw
- * New interface for messing with preconnected sockets.
- *
- * Revision 1.7  2002/01/13 13:28:44  mdw
- * Rearrange @conn_init@ to be a bit more comprehensible.
- *
- * Revision 1.6  2001/06/22 19:35:20  mdw
- * Interface change to @conn_init@ -- return error rather than calling the
- * function.  This reduces the number of different environments the
- * callback has to cope with, and the old behaviour is easily simulatable
- * with the new, while simulating the new behaviour was awkward and
- * painful.
- *
- * Revision 1.5  2000/10/08 11:17:26  mdw
- * (conn_connect): Change sizes to be @size_t@.
- *
- * Revision 1.4  1999/07/26 23:21:02  mdw
- * Bug fix: remove the selector before doing the callback, in case client
- * adds a writer for the connected socket.
- *
- * Revision 1.3  1999/05/23 12:12:37  mdw
- * Interface change to make the `conn' selector useful for generic stream
- * sockets rather than just IPv4 ones.
- *
- * Revision 1.2  1999/05/15 10:33:32  mdw
- * Fix copyright notices.
- *
- * Revision 1.1  1999/05/14 21:01:14  mdw
- * Integrated `select' handling bits from the background resolver project.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <errno.h>
@@ -167,10 +132,8 @@ int conn_init(conn *c, sel_state *s, int fd,
 {
   int f;
 
-  if ((f = fcntl(fd, F_GETFL)) < 0 || fcntl(fd, F_SETFL, f | O_NONBLOCK)) {
-    close(fd);
-    return (-1);
-  }
+  if ((f = fcntl(fd, F_GETFL)) < 0 || fcntl(fd, F_SETFL, f | O_NONBLOCK))
+    goto fail;
 
   if (!connect(fd, dst, dsz))
     func(fd, p);
@@ -179,6 +142,10 @@ int conn_init(conn *c, sel_state *s, int fd,
   else
     conn_fd(c, s, fd, func, p);
   return (0);
+
+fail:
+  close(fd);
+  return (-1);
 }
 
 /* --- @conn_kill@ --- *