* Update to version 2.19.1

 *  Upgrade UW-IMAP to Panda IMAP from https://github.com/jonabbey/panda-imap.
 *  Replace tabs by spaces in From and Subject fields to control for size in
    screen of these fields. Change only in index screen display.

2 files changed, 38 insertions, 39 deletions

diff --git a/imap/src/osdep/tops-20/shortsym.h b/imap/src/osdep/tops-20/shortsym.h
index 2bd54649..32a93b6a 100644
--- a/imap/src/osdep/tops-20/shortsym.h
+++ b/imap/src/osdep/tops-20/shortsym.h
@@ -1,29 +1,26 @@
 /* ========================================================================
- * Copyright 1988-2008 University of Washington
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * 
+ * Copyright 2008 Mark Crispin
  * ========================================================================
  */
 
 /*
- * Program:	Definitions for compilers with 6-letter symbol limits
+ * Program:	Mailbox Access routines
  *
  * Author:	Mark Crispin
- *		Networks and Distributed Computing
- *		Computing & Communications
- *		University of Washington
- *		Administration Building, AG-44
- *		Seattle, WA  98195
- *		Internet: MRC@CAC.Washington.EDU
  *
  * Date:	24 May 1995
- * Last Edited:	1 January 2008
+ * Last Edited:	19 November 2008
+ *
+ * Previous versions of this file were
+ *
+ * Copyright 1988-2008 University of Washington
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  */
 
 #define auth_link a_link
@@ -45,7 +42,8 @@
 #define body_encodings bencds
 #define body_types btypes
 #define compare_csizedtext cm_szt
-#define compare_cstring cm_str
+#define compare_cstring cm_cst
+#define compare_string cm_str
 #define compare_uchar cm_uch
 #define compare_ulong cm_uln
 #define default_proto d_prot
diff --git a/imap/src/osdep/tops-20/tcp_t20.c b/imap/src/osdep/tops-20/tcp_t20.c
index 7b2a2580..6e045809 100644
--- a/imap/src/osdep/tops-20/tcp_t20.c
+++ b/imap/src/osdep/tops-20/tcp_t20.c
@@ -1,4 +1,18 @@
 /* ========================================================================
+ * Copyright 2008-2010 Mark Crispin
+ * ========================================================================
+ */
+
+/*
+ * Program:	TOPS-20 TCP/IP routines
+ *
+ * Author:	Mark Crispin
+ *
+ * Date:	1 August 1988
+ * Last Edited:	19 November 2008
+ *
+ * Previous versions of this file were
+ *
  * Copyright 1988-2008 University of Washington
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,21 +25,6 @@
  * ========================================================================
  */
 
-/*
- * Program:	TOPS-20 TCP/IP routines
- *
- * Author:	Mark Crispin
- *		Networks and Distributed Computing
- *		Computing & Communications
- *		University of Washington
- *		Administration Building, AG-44
- *		Seattle, WA  98195
- *		Internet: MRC@CAC.Washington.EDU
- *
- * Date:	1 August 1988
- * Last Edited:	13 January 2008
- */
-
 
 /* Dedication:
  * This file is dedicated with affection to the TOPS-20 operating system, which
@@ -146,7 +145,8 @@ TCPSTREAM *tcp_aopen (NETMBX *mb,char *service,char *usrbuf)
 
 char *tcp_getline (TCPSTREAM *stream)
 {
-  unsigned long n,contd;
+  long contd;
+  unsigned long n;
   char *ret = tcp_getline_work (stream,&n,&contd);
   if (ret && contd) {		/* got a line needing continuation? */
     STRINGLIST *stl = mail_newstringlist ();
@@ -332,9 +332,10 @@ char *tcp_localhost (TCPSTREAM *stream)
 char *tcp_canonical (char *name)
 {
   int argblk[5];
-  static char tmp[MAILTMPLEN];
+  char tmp[MAILTMPLEN];
 				/* look like domain literal? */
-  if (name[0] == '[' && name[strlen (name) - 1] == ']') return name;
+  if (name[0] == '[' && name[strlen (name) - 1] == ']')
+    return cpystr (name);
   argblk[1] = _GTHPN;		/* get IP address and primary name */
   argblk[2] = (int) (name-1);	/* pointer to host */
   argblk[4] = (int) (tmp-1);	/* pointer to return destination */
@@ -344,14 +345,14 @@ char *tcp_canonical (char *name)
     argblk[4] = (int) (tmp-1);
     if (!jsys (GTDOM,argblk)) {	/* try the CHIVES domain way */
       argblk[1] = _GTHSN;	/* failed, do the host table then */
-      if (!jsys (GTHST,argblk)) return name;
+      if (!jsys (GTHST,argblk)) return cpystr (name);
       argblk[1] = _GTHNS;	/* convert number to string */
       argblk[2] = (int) (tmp-1);
 				/* get the official name */
-      if (!jsys (GTHST,argblk)) return name;
+      if (!jsys (GTHST,argblk)) return cpystr (name);
     }
   }
-  return tmp;
+  return cpystr (tmp);
 }