$NetBSD: patch-ak,v 1.2 2000/06/03 20:30:28 tron Exp $

--- pop_uidl.c.orig	Fri Jul 10 01:44:08 1998
+++ pop_uidl.c	Sat Jun  3 22:13:46 2000
@@ -59,7 +59,7 @@
 
 	sprintf(buffer, "%d %s", msg_id, mp->uidl_str);
         if (nl = index(buffer, NEWLINE)) *nl = 0;
-	return (pop_msg (p,POP_SUCCESS, buffer));
+	return (pop_msg (p,POP_SUCCESS, "%s", buffer));
       }
     } else {
 	/* yes, we can do this */
@@ -98,6 +98,7 @@
 {
   static char buf[MAXLINELEN];
   char *cp;
+  char *bp;
 
     fseek(p->drop, mp->offset, 0);
     while (fgets(buf, sizeof(buf), p->drop) != NULL) {
@@ -105,6 +106,8 @@
       if (!strncasecmp("From:", buf, 5)) {
 	cp = index(buf, ':');
 	while (*++cp && (*cp == ' ' || *cp == '\t'));
+	if ((bp = index(cp, NEWLINE)) != NULL)
+	  *bp = 0;
 	return(cp);
       }
     }
@@ -149,7 +152,7 @@
 	sprintf(buffer, "%d %s", msg_id, mp->uidl_str);
         if (nl = index(buffer, NEWLINE)) *nl = 0;
 	sprintf(buffer, "%s %d %.128s", buffer, mp->length, from_hdr(p, mp));
-	return (pop_msg (p,POP_SUCCESS, buffer));
+	return (pop_msg (p,POP_SUCCESS, "%s", buffer));
       }
     } else {
 	/* yes, we can do this */
@@ -165,7 +168,7 @@
 
 	    sprintf(buffer, "%d %s", x, mp->uidl_str);
 	    if (nl = index(buffer, NEWLINE)) *nl = 0;	    
-	    sprintf(buffer, "%s %d %.128s", buffer, mp->length, from_hdr(p, mp));
+	    sprintf(buffer, "%s %d %.128s\n", buffer, mp->length, from_hdr(p, mp));
 	    pop_sendline(p, buffer);
         }
     }