X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=ebd2e1301887caca3d913f509726cfbdea136a2c;hb=303dd1e70219a7542921f6e63d9391ab326d434f;hp=7d27341effe7f21f397f10ef32761decc9426420;hpb=791c1898ea8f92b07f1d79e90540c257ac38298d;p=tinc diff --git a/src/tincctl.c b/src/tincctl.c index 7d27341e..ebd2e130 100644 --- a/src/tincctl.c +++ b/src/tincctl.c @@ -405,14 +405,14 @@ bool recvdata(int fd, char *data, size_t len) { bool sendline(int fd, char *format, ...) { static char buffer[4096]; char *p = buffer; - size_t blen = 0; + int blen = 0; va_list ap; va_start(ap, format); blen = vsnprintf(buffer, sizeof buffer, format, ap); va_end(ap); - if(blen < 0 || blen >= sizeof buffer) + if(blen < 1 || blen >= sizeof buffer) return false; buffer[blen] = '\n'; @@ -422,7 +422,7 @@ bool sendline(int fd, char *format, ...) { int result = send(fd, p, blen, 0); if(result == -1 && errno == EINTR) continue; - else if(result <= 0); + else if(result <= 0) return false; p += result; blen -= result; @@ -574,7 +574,7 @@ int main(int argc, char *argv[], char *envp[]) { struct addrinfo *res = NULL; if(getaddrinfo(host, port, &hints, &res) || !res) { - fprintf(stderr, "Cannot resolve %s port %s: %s", host ?: "localhost", port, strerror(errno)); + fprintf(stderr, "Cannot resolve %s port %s: %s", host, port, strerror(errno)); return 1; } @@ -593,7 +593,7 @@ int main(int argc, char *argv[], char *envp[]) { #endif if(connect(fd, res->ai_addr, res->ai_addrlen) < 0) { - fprintf(stderr, "Cannot connect to %s port %s: %s\n", host ?: "localhost", port, sockstrerror(sockerrno)); + fprintf(stderr, "Cannot connect to %s port %s: %s\n", host, port, sockstrerror(sockerrno)); return 1; }