X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/e2a18bd0eda077f0920274fd114240bc786f03b1..d45be1af09ff22a4778172ee2e55745c2c3229ed:/ident.c

diff --git a/ident.c b/ident.c
index 6d29f90..52d4542 100644
--- a/ident.c
+++ b/ident.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: ident.c,v 1.2 2000/06/17 10:38:35 mdw Exp $
+ * $Id: ident.c,v 1.6 2004/04/08 01:36:11 mdw Exp $
  *
  * Nonblocking RFC931 client
  *
@@ -27,17 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: ident.c,v $
- * Revision 1.2  2000/06/17 10:38:35  mdw
- * Track changes to selbuf interface.
- *
- * Revision 1.1  1999/10/04 21:41:58  mdw
- * Added ident client from `fw'.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <ctype.h>
@@ -159,6 +148,7 @@ static void parse(char *p, ident_reply *i)
 /* --- @line@ --- *
  *
  * Arguments:	@char *s@ = pointer to string from ident server
+ *		@size_t len@ = length of the line
  *		@void *p@ = pointer to my request block
  *
  * Returns:	---
@@ -166,7 +156,7 @@ static void parse(char *p, ident_reply *i)
  * Use:		Handles a string from an ident server.
  */
 
-static void line(char *s, void *p)
+static void line(char *s, size_t len, void *p)
 {
   ident_request *rq = p;
 
@@ -292,8 +282,9 @@ static void go(ident_request *rq)
   sin.sin_family = AF_INET;
   sin.sin_port = htons(113);
   sin.sin_addr = rq->remote.sin_addr;
-  conn_init(&rq->c, rq->s, fd, (struct sockaddr *)&sin, sizeof(sin),
-	    connected, rq);
+  if (conn_init(&rq->c, rq->s, fd, (struct sockaddr *)&sin, sizeof(sin),
+		connected, rq))
+    goto fail_1;
 
   /* --- Finish off initializing the block --- */
 
@@ -357,7 +348,7 @@ void ident_socket(ident_request *rq, sel_state *s, int sk,
 		  void (*func)(ident_reply */*i*/, void */*p*/),
 		  void *p)
 {
-  int sinsz;
+  size_t sinsz;
   if ((sinsz = sizeof(struct sockaddr_in),
        getsockname(sk, (struct sockaddr *)&rq->local, &sinsz)) ||
       (sinsz = sizeof(struct sockaddr_in),