diff -Naur fetchmail-5.9.7.orig/interface.c fetchmail-5.9.7/interface.c
--- fetchmail-5.9.7.orig/interface.c	Sun Sep 30 07:53:07 2001
+++ fetchmail-5.9.7/interface.c	Mon Feb  4 12:26:26 2002
@@ -269,7 +269,7 @@
 		kvm_read(kvmfd, ifnet_addr, &ifnet, sizeof(ifnet));
 		kvm_read(kvmfd, (unsigned long) ifnet.if_name, tname, sizeof tname);
 #ifdef HAVE_SNPRINTF
-		snprintf(tname, sizeof tname - 1,
+		snprintf(tname, sizeof tname,
 #else
         	sprintf(tname,
 #endif
diff -Naur fetchmail-5.9.7.orig/sink.c fetchmail-5.9.7/sink.c
--- fetchmail-5.9.7.orig/sink.c	Sat Feb  2 10:58:20 2002
+++ fetchmail-5.9.7/sink.c	Mon Feb  4 12:26:26 2002
@@ -706,14 +706,14 @@
 	    else {
 		if (ctl->smtpname) {
 #ifdef HAVE_SNPRINTF
-		    snprintf(addr, sizeof(addr)-1, "%s", ctl->smtpname);
+		    snprintf(addr, sizeof(addr), "%s", ctl->smtpname);
 #else
 		    sprintf(addr, "%s", ctl->smtpname);
 #endif /* HAVE_SNPRINTF */
 
 		} else {
 #ifdef HAVE_SNPRINTF
-		  snprintf(addr, sizeof(addr)-1, "%s(_at_)%s", idp->id, ctl->destaddr);
+		  snprintf(addr, sizeof(addr), "%s(_at_)%s", idp->id, ctl->destaddr);
 #else
 		  sprintf(addr, "%s(_at_)%s", idp->id, ctl->destaddr);
 #endif /* HAVE_SNPRINTF */
@@ -785,7 +785,7 @@
 	else
 	{
 #ifdef HAVE_SNPRINTF
-	    snprintf(addr, sizeof(addr)-1, "%s(_at_)%s", run.postmaster, ctl->destaddr);
+	    snprintf(addr, sizeof(addr), "%s(_at_)%s", run.postmaster, ctl->destaddr);
 #else
 	    sprintf(addr, "%s(_at_)%s", run.postmaster, ctl->destaddr);
 #endif /* HAVE_SNPRINTF */
diff -Naur fetchmail-5.9.7.orig/transact.c fetchmail-5.9.7/transact.c
--- fetchmail-5.9.7.orig/transact.c	Sat Feb  2 05:38:33 2002
+++ fetchmail-5.9.7/transact.c	Mon Feb  4 12:26:26 2002
@@ -1355,7 +1355,7 @@
     va_start(ap);
 #endif
 #ifdef HAVE_VSNPRINTF
-    vsnprintf(buf + strlen(buf), sizeof(buf), fmt, ap);
+    vsnprintf(buf + strlen(buf), sizeof(buf)-strlen(buf), fmt, ap);
 #else
     vsprintf(buf + strlen(buf), fmt, ap);
 #endif
@@ -1445,7 +1445,7 @@
     va_start(ap);
 #endif
 #ifdef HAVE_VSNPRINTF
-    vsnprintf(buf + strlen(buf), sizeof(buf), fmt, ap);
+    vsnprintf(buf + strlen(buf), sizeof(buf)-strlen(buf), fmt, ap);
 #else
     vsprintf(buf + strlen(buf), fmt, ap);
 #endif