applied Adriens patch - sic - simple irc client
HTML git clone git://git.suckless.org/sic
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit c2fcf48e6d334234859c5e015ec6cc816bca451b
DIR parent ee77b8efaef863413e87c2484021b0b1199b1eff
HTML Author: Anselm R. Garbe <arg@10kloc.org>
Date: Mon, 4 Sep 2006 08:54:14 +0200
applied Adriens patch
Diffstat:
M sic.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
---
DIR diff --git a/sic.c b/sic.c
@@ -11,6 +11,7 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
+#include <unistd.h>
#include <sys/socket.h>
#include <sys/time.h>
@@ -20,7 +21,7 @@
enum { Tnick, Tuser, Tcmd, Tchan, Targ, Ttext, Tlast };
static char *server = "irc.oftc.net";
-static int port = 6667;
+static unsigned short port = 6667;
static char *nick = NULL;
static char *fullname = NULL;
static char *password = NULL;
@@ -241,7 +242,7 @@ main(int argc, char *argv[])
int i;
struct timeval tv;
struct hostent *hp;
- struct sockaddr_in addr = { 0 };
+ static struct sockaddr_in addr; /* initially filled with 0's */
char ping[256];
fd_set rd;
@@ -257,7 +258,7 @@ main(int argc, char *argv[])
server = argv[++i];
break;
case 'p':
- port = atoi(argv[++i]);
+ port = (unsigned short)atoi(argv[++i]);
break;
case 'n':
nick = argv[++i];
@@ -280,10 +281,13 @@ main(int argc, char *argv[])
fprintf(stderr, "sic: cannot connect server '%s'\n", server);
exit(EXIT_FAILURE);
}
- hp = gethostbyname(server);
+ if (NULL == (hp = gethostbyname(server))) {
+ fprintf(stderr, "sic: cannot resolve hostname '%s'\n", server);
+ exit(EXIT_FAILURE);
+ }
addr.sin_family = AF_INET;
addr.sin_port = htons(port);
- bcopy(hp->h_addr, &addr.sin_addr, hp->h_length);
+ memcpy(&addr.sin_addr, hp->h_addr, hp->h_length);
if(connect(srv, (struct sockaddr *) &addr, sizeof(struct sockaddr_in))) {
close(srv);
fprintf(stderr, "sic: cannot connect server '%s'\n", server);