From 3931741c1dcf84febe9b1b13edd075d2ca7644f9 Mon Sep 17 00:00:00 2001
From: david <david@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Tue, 28 Aug 2012 14:30:08 +0000
Subject: [PATCH] Fix format string errors in Ncat logging functions.

---
 ncat/ncat_listen.c | 2 +-
 ncat/ncat_main.c   | 2 +-
 ncat/ncat_proxy.c  | 2 +-
 ncat/util.c        | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ncat/ncat_listen.c b/ncat/ncat_listen.c
index 85c1a7355..d39320b53 100644
--- a/ncat/ncat_listen.c
+++ b/ncat/ncat_listen.c
@@ -915,7 +915,7 @@ static int chat_announce_connect(int fd, const union sockaddr_u *su)
             continue;
 
         if (getpeername(i, &su.sockaddr, &len) == -1)
-            bye("getpeername for sd %d failed: %s.", strerror(errno));
+            bye("getpeername for sd %d failed: %s.", i, strerror(errno));
 
         if (count > 0)
             strbuf_sprintf(&buf, &size, &offset, ", ");
diff --git a/ncat/ncat_main.c b/ncat/ncat_main.c
index 47cd710fd..488aea8c2 100644
--- a/ncat/ncat_main.c
+++ b/ncat/ncat_main.c
@@ -339,7 +339,7 @@ int main(int argc, char *argv[])
         case 'd':
             o.linedelay = tval2msecs(optarg);
             if (o.linedelay <= 0)
-                bye("Invalid -d delay (must be greater than 0).", optarg);
+                bye("Invalid -d delay \"%s\" (must be greater than 0).", optarg);
             if (o.linedelay >= 100 * 1000 && tval_unit(optarg) == NULL)
                 bye("Since April 2010, the default unit for -d is seconds, so your time of \"%s\" is %.1f minutes. Use \"%sms\" for %g milliseconds.", optarg, o.linedelay / 1000.0 / 60, optarg, o.linedelay / 1000.0);
             break;
diff --git a/ncat/ncat_proxy.c b/ncat/ncat_proxy.c
index 729d9848a..c726ed257 100644
--- a/ncat/ncat_proxy.c
+++ b/ncat/ncat_proxy.c
@@ -460,7 +460,7 @@ static int handle_connect(struct socket_buffer *client_sock,
     line = socket_buffer_remainder(client_sock, &len);
     if (send(s, line, len, 0) < 0) {
         if (o.debug)
-            logdebug("Error sending %u leftover bytes: %s.\n", len, strerror(errno));
+            logdebug("Error sending %lu leftover bytes: %s.\n", (unsigned long) len, strerror(errno));
         Close(s);
         return 0;
     }
diff --git a/ncat/util.c b/ncat/util.c
index 0e0f64637..b292bc9b3 100644
--- a/ncat/util.c
+++ b/ncat/util.c
@@ -310,8 +310,8 @@ int addr_is_local(const union sockaddr_u *su)
         if (addr->ai_family != su->storage.ss_family)
             continue;
         if (addr->ai_addrlen > sizeof(addr_su)) {
-            bye("getaddrinfo returned oversized address (%u > %u)",
-                addr->ai_addrlen, sizeof(addr_su));
+            bye("getaddrinfo returned oversized address (%lu > %lu)",
+                (unsigned long) addr->ai_addrlen, (unsigned long) sizeof(addr_su));
         }
         memcpy(&addr_su, addr->ai_addr, addr->ai_addrlen);
         if (su->storage.ss_family == AF_INET) {