diff options
| author | Florian Westphal <fw@strlen.de> | 2005-05-28 10:46:50 +0000 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2005-05-28 10:46:50 +0000 |
| commit | 158bf554c3c56a8f1478297c7d3d04918e90180b (patch) | |
| tree | e746d4d8d519d73e1c935cfb0afaa99431581153 | |
| parent | 9c3c7e5a09c131874be099547896107df1919a5f (diff) | |
| download | ngircd-158bf554c3c56a8f1478297c7d3d04918e90180b.tar.gz ngircd-158bf554c3c56a8f1478297c7d3d04918e90180b.zip | |
minor cleanup
| -rw-r--r-- | src/ngircd/resolve.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c index 5b33acc4..14d53804 100644 --- a/src/ngircd/resolve.c +++ b/src/ngircd/resolve.c @@ -14,7 +14,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: resolve.c,v 1.11 2005/03/19 18:43:49 fw Exp $"; +static char UNUSED id[] = "$Id: resolve.c,v 1.12 2005/05/28 10:46:50 fw Exp $"; #include "imp.h" #include <assert.h> @@ -169,7 +169,7 @@ Do_ResolveAddr( struct sockaddr_in *Addr, int w_fd ) char hostname[HOST_LEN]; struct hostent *h; - int len; + size_t len; #ifdef IDENTAUTH char *res; #endif @@ -206,9 +206,12 @@ Do_ResolveAddr( struct sockaddr_in *Addr, int w_fd ) Log_Resolver( LOG_DEBUG, "Ok, IDENT lookup on socket %d done: \"%s\"", Sock, res ? res : "" ); /* Write IDENT result into pipe to parent */ - len = strlen( res ? res : "" ); - if( res != NULL ) res[len] = '\n'; - len++; + if (res) { + len = strlen(res); + res[len] = '\n'; + len++; + } else len = 1; + if( (size_t)write( w_fd, res ? res : "\n", len ) != (size_t)len ) { Log_Resolver( LOG_CRIT, "Resolver: Can't write to parent (IDENT): %s!", strerror( errno )); |