* 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.

4 files changed, 57 insertions, 71 deletions

diff --git a/imap/src/osdep/vms/env_vms.h b/imap/src/osdep/vms/env_vms.h
index 59160a06..314333bd 100644
--- a/imap/src/osdep/vms/env_vms.h
+++ b/imap/src/osdep/vms/env_vms.h
@@ -1,13 +1,5 @@
 /* ========================================================================
- * Copyright 1988-2006 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-2010 Mark Crispin
  * ========================================================================
  */
 
@@ -15,15 +7,20 @@
  * Program:	VMS environment 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:	2 August 1994
- * Last Edited:	30 August 2006
+ * Last Edited:	15 November 2010
+ * 
+ * Previous versions of this file were:
+ * 
+ * Copyright 1988-2006 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
+ *
  */
 
 
@@ -34,7 +31,7 @@
 
 #include "env.h"
 
-char *myusername ();
+char *myusername (void);
 
 
 /* syslog() emulation */
diff --git a/imap/src/osdep/vms/tcp_vmsl.c b/imap/src/osdep/vms/tcp_vmsl.c
index 692c9212..37e09dfd 100644
--- a/imap/src/osdep/vms/tcp_vmsl.c
+++ b/imap/src/osdep/vms/tcp_vmsl.c
@@ -1,29 +1,25 @@
 /* ========================================================================
- * 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-2010 Mark Crispin
  * ========================================================================
  */
 
 /*
- * Program:	VMS TCP/IP routines for Netlib.
+ * Program:	VMS TCP/IP routines for Netlib
  *
  * 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:	2 August 1994
- * Last Edited:	13 January 2008
+ * Last Edited:	3 April 2010
+ *
+ * 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
  */
 
 /* Thanks to Yehavi Bourvine at The Hebrew University of Jerusalem who
@@ -364,7 +360,7 @@ char *mylocalhost ()
 
 char *tcp_canonical (char *name)
 {
-  return name;
+  return cpystr (name);
 }
 
 
diff --git a/imap/src/osdep/vms/tcp_vmsm.c b/imap/src/osdep/vms/tcp_vmsm.c
index bc9d9ca7..4a5483d6 100644
--- a/imap/src/osdep/vms/tcp_vmsm.c
+++ b/imap/src/osdep/vms/tcp_vmsm.c
@@ -1,13 +1,5 @@
 /* ========================================================================
- * 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-2010 Mark Crispin
  * ========================================================================
  */
 
@@ -15,15 +7,19 @@
  * Program:	VMS TCP/IP routines for Multinet
  *
  * 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:	2 August 1994
- * Last Edited:	13 January 2008
+ * Last Edited:	3 April 2010
+ *
+ * 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
  */
 
 			
@@ -462,10 +458,11 @@ char *tcp_canonical (char *name)
   char host[MAILTMPLEN];
   struct hostent *he;
 				/* look like domain literal? */
-  if (name[0] == '[' && name[strlen (name) - 1] == ']') return name;
+  if (name[0] == '[' && name[strlen (name) - 1] == ']')
+    return cpystr (name);
 				/* note that Unix requires lowercase! */
-  else return (he = gethostbyname (lcase (strcpy (host,name)))) ?
-    he->h_name : name;
+  else return cpystr ((he = gethostbyname (lcase (strcpy (host,name)))) ?
+		      he->h_name : name);
 }
 
 
diff --git a/imap/src/osdep/vms/tcp_vmsn.c b/imap/src/osdep/vms/tcp_vmsn.c
index 4648e48d..6ae12803 100644
--- a/imap/src/osdep/vms/tcp_vmsn.c
+++ b/imap/src/osdep/vms/tcp_vmsn.c
@@ -1,13 +1,5 @@
 /* ========================================================================
- * Copyright 1988-2006 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-2010 Mark Crispin
  * ========================================================================
  */
 
@@ -15,15 +7,19 @@
  * Program:	Dummy VMS TCP/IP routines for non-TCP/IP systems
  *
  * 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:	2 August 1994
- * Last Edited:	30 August 2006
+ * Last Edited:	3 April 2010
+ *
+ * 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
  */
  
 /* TCP/IP manipulate parameters
@@ -208,7 +204,7 @@ char *mylocalhost ()
 
 char *tcp_canonical (char *name)
 {
-  return name;
+  return cpystr (name);
 }