static int
dial(char *host, char *port) {
- static struct addrinfo hints;
- int srv;
+ struct addrinfo hints;
struct addrinfo *res, *r;
+ int fd;
memset(&hints, 0, sizeof hints);
hints.ai_family = AF_UNSPEC;
if(getaddrinfo(host, port, &hints, &res) != 0)
eprint("error: cannot resolve hostname '%s':", host);
for(r = res; r; r = r->ai_next) {
- if((srv = socket(r->ai_family, r->ai_socktype, r->ai_protocol)) == -1)
+ if((fd = socket(r->ai_family, r->ai_socktype, r->ai_protocol)) == -1)
continue;
- if(connect(srv, r->ai_addr, r->ai_addrlen) == 0)
+ if(connect(fd, r->ai_addr, r->ai_addrlen) == 0)
break;
- close(srv);
+ close(fd);
}
freeaddrinfo(res);
if(!r)
eprint("error: cannot connect to host '%s'\n", host);
- return srv;
+ return fd;
}
static char *
eat(char *s, int (*p)(int), int r) {
- while(*s != '\0' && p(*s) == r)
+ while(*s != '\0' && p((unsigned char)*s) == r)
s++;
return s;
}
trim(char *s) {
char *e;
- e = s + strlen(s) - 1;
- while(isspace(*e) && e > s)
- e--;
- *(e + 1) = '\0';
+ for (e = s + strlen(s); e > s && isspace((unsigned char)*(e - 1)); e--)
+ ;
+ *e = '\0';
}