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

1 files changed, 25 insertions, 18 deletions

diff --git a/imap/src/osdep/nt/ssl_none.c b/imap/src/osdep/nt/ssl_none.c
index e4dedda7..a87c4be6 100644
--- a/imap/src/osdep/nt/ssl_none.c
+++ b/imap/src/osdep/nt/ssl_none.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 Mark Crispin
  * ========================================================================
  */
 
@@ -15,15 +7,20 @@
  * Program:	Dummy (no SSL) authentication/encryption module
  *
  * 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:	7 February 2001
- * Last Edited:	30 August 2006
+ * Last Edited:	19 November 2008
+ *
+ * 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
+ *
  */
 
 /* Init server for SSL
@@ -53,7 +50,12 @@ char *ssl_start_tls (char *server)
 
 int PBIN (void)
 {
-  return getchar ();
+  int ret;
+  do {
+    clearerr (stdin);
+    ret = getchar ();
+  } while ((ret == EOF) && !feof (stdin) && ferror (stdin) &&(errno == EINTR));
+  return ret;
 }
 
 
@@ -65,7 +67,12 @@ int PBIN (void)
 
 char *PSIN (char *s,int n)
 {
-  return fgets (s,n,stdin);
+  char *ret;
+  do {
+    clearerr (stdin);
+    ret = fgets (s,n,stdin);
+  } while (!ret && !feof (stdin) && ferror (stdin) && (errno == EINTR));
+  return ret;
 }