Index: sink.c
===================================================================
RCS file: /home/cvs/debian/fetchmail/sink.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sink.c	24 Jun 2001 03:19:32 -0000	1.10
+++ sink.c	24 Jun 2001 21:29:11 -0000	1.11
@@ -685,9 +685,14 @@
 			return(PS_REFUSED);
 #endif /* __UNUSED__ */
 
+#ifdef HAVE_SNPRINTF
+		    snprintf(errbuf, sizeof(errbuf), "%s: %s",
+				    idp->id, smtp_response);
+#else
 		    strncpy(errbuf, idp->id, sizeof(errbuf));
-		    strncat(errbuf, ": ", sizeof(errbuf));
-		    strncat(errbuf, smtp_response, sizeof(errbuf));
+		    strcat(errbuf, ": ");
+		    strcat(errbuf, smtp_response);
+#endif /* HAVE_SNPRINTF */
 
 		    xalloca(from_responses[*bad_addresses], 
 			    char *, 
@@ -1154,7 +1159,11 @@
 #endif
     va_end(ap);
 
-    strncat(buf, "\r\n", sizeof(buf));
+#ifdef HAVE_SNPRINTF
+    snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\r\n");
+#else
+    strcat(buf, "\r\n");
+#endif /* HAVE_SNPRINTF */
 
     stuffline(ctl, buf);
 }
Index: smtp.c
===================================================================
RCS file: /home/cvs/debian/fetchmail/smtp.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- smtp.c	23 Jun 2001 01:39:36 -0000	1.3
+++ smtp.c	24 Jun 2001 21:29:11 -0000	1.4
@@ -111,7 +111,11 @@
 #endif /* HAVE_SNPRINTF */
 	    "MAIL FROM:<%s>", from);
     if (opts)
-	strncat(buf, opts, sizeof(buf));
+#ifdef HAVE_SNPRINTF
+	snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "%s", opts);
+#else
+	strcat(buf, opts);
+#endif /* HAVE_SNPRINTF */
     SockPrintf(sock,"%s\r\n", buf);
     if (outlevel >= O_MONITOR)
 	report(stdout, "%cMTP> %s\n", smtp_mode, buf);
Index: transact.c
===================================================================
RCS file: /home/cvs/debian/fetchmail/transact.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- transact.c	23 Jun 2001 01:39:36 -0000	1.5
+++ transact.c	24 Jun 2001 21:29:11 -0000	1.6
@@ -1056,7 +1056,11 @@
 			ctl->server.pollname, 
 			ctl->remotename);
 	    }
-	    strncat(buf, ")\r\n", sizeof(buf));
+#ifdef HAVE_SNPRINTF
+	    snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), ")\r\n");
+#else
+	    strcat(buf, ")\r\n");
+#endif /* HAVE_SNPRINTF */
 	    n = stuffline(ctl, buf);
 	    if (n != -1)
 	    {
@@ -1101,8 +1105,13 @@
 		else
 		    buf[1] = '\0';
 
-		strncat(buf, rfc822timestamp(), sizeof(buf));
-		strncat(buf, "\r\n", sizeof(buf));
+#ifdef HAVE_SNPRINTF
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "%s\r\n",
+			rfc822timestamp());
+#else
+		strcat(buf, rfc822timestamp());
+		strcat(buf, "\r\n");
+#endif /* HAVE_SNPRINTF */
 		n = stuffline(ctl, buf);
 	    }
 	}
@@ -1337,7 +1346,11 @@
 #endif
     va_end(ap);
 
-    strncat(buf, "\r\n", sizeof(buf));
+#ifdef HAVE_SNPRINTF
+    snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\r\n");
+#else
+    strcat(buf, "\r\n");
+#endif /* HAVE_SNPRINTF */
     SockWrite(sock, buf, strlen(buf));
 
     if (outlevel >= O_MONITOR)
@@ -1423,7 +1436,11 @@
 #endif
     va_end(ap);
 
-    strncat(buf, "\r\n", sizeof(buf));
+#ifdef HAVE_SNPRINTF
+    snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\r\n");
+#else
+    strcat(buf, "\r\n");
+#endif /* HAVE_SNPRINTF */
     SockWrite(sock, buf, strlen(buf));
 
     if (outlevel >= O_MONITOR)