/* -*-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
*
* (c) 1999 Straylight/Edgeware
*/
-/*----- Licensing notice --------------------------------------------------*
+/*----- Licensing notice --------------------------------------------------*
*
* This file is part of the mLib utilities library.
*
* it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
- *
+ *
* mLib is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Library General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Library General Public
* License along with mLib; if not, write to the Free
* Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
* 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>
{
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);
else
conn_fd(c, s, fd, func, p);
return (0);
+
+fail:
+ close(fd);
+ return (-1);
}
/* --- @conn_kill@ --- *