Upgrade to 2.52

1 files changed, 18 insertions, 28 deletions

diff --git a/mail/popper/files/patch-ah b/mail/popper/files/patch-ah
index 4d839c7d22ea..6933ec6e3867 100644
--- a/mail/popper/files/patch-ah
+++ b/mail/popper/files/patch-ah
@@ -1,19 +1,19 @@
-*** pop_msg.c.orig	Thu Nov 20 00:20:38 1997
---- pop_msg.c	Sun Jun 28 21:39:56 1998
+*** pop_msg.c.orig	Wed Jul  1 23:54:51 1998
+--- pop_msg.c	Thu Jul  2 07:12:46 1998
 ***************
-*** 27,32 ****
---- 27,33 ----
-  {
-      POP             *   p;
-      int                 stat;               /*  POP status indicator */
-+     int			l, len;		    /*  remaining buffer length */
-      char            *   format;             /*  Format string for the message */
+*** 43,48 ****
+--- 43,49 ----
+  #endif
       va_list             ap;
       register char   *   mp;
++     int                 l, len;            /*  remaining buffer length */
+  #ifdef PYRAMID
+      char	    *   arg1, *arg2, *arg3, *arg4, *arg5, *arg6;
+  #endif
 ***************
-*** 50,55 ****
---- 51,57 ----
-  
+*** 67,72 ****
+--- 68,74 ----
+  #endif
       /*  Point to the message buffer */
       mp = message;
 +     len = sizeof(message);
@@ -21,25 +21,20 @@
       /*  Format the POP status code at the beginning of the message */
       if (stat == POP_SUCCESS)
 ***************
-*** 58,74 ****
+*** 75,86 ****
           (void)sprintf (mp,"%s ",POP_ERR);
   
       /*  Point past the POP status indicator in the message message */
 !     mp += strlen(mp);
   
       /*  Append the message (formatted, if necessary) */
-      if (format) 
+      if (format) {
   #ifdef HAVE_VPRINTF
 !         vsprintf(mp,format,ap);
   #else
   # ifdef PYRAMID
-!         (void)sprintf(mp,format, arg1, arg2, arg3, arg4, arg5, arg6);
-  # else
-!         (void)sprintf(mp,format,((int *)ap)[0],((int *)ap)[1],((int *)ap)[2],
-                  ((int *)ap)[3],((int *)ap)[4]);
-  # endif
-  #endif
---- 60,77 ----
+  	(void)sprintf(mp,format, arg1, arg2, arg3, arg4, arg5, arg6);
+--- 77,89 ----
           (void)sprintf (mp,"%s ",POP_ERR);
   
       /*  Point past the POP status indicator in the message message */
@@ -47,14 +42,9 @@
 !     len -= l, mp += l;
   
       /*  Append the message (formatted, if necessary) */
-      if (format) 
+      if (format) {
   #ifdef HAVE_VPRINTF
 ! 	vsnprintf(mp,len-3,format,ap);
   #else
   # ifdef PYRAMID
-! 	(void)snprintf(mp,len-3,format, arg1, arg2, arg3, arg4, arg5, arg6);
-  # else
-! 	(void)snprintf(mp,len-3,format,((int *)ap)[0],((int *)ap)[1],((int *)ap)[2],
-                  ((int *)ap)[3],((int *)ap)[4]);
-  # endif
-  #endif
+  	(void)sprintf(mp,format, arg1, arg2, arg3, arg4, arg5, arg6);