[Emacs-diffs] /srv/bzr/emacs/trunk r101647: (emacs_gnutls_read): Don't infloop while reading.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 101647
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Mon 2010-09-27 17:03:58 +0200
message:
  (emacs_gnutls_read): Don't infloop while reading.
modified:
  src/ChangeLog
  src/gnutls.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-09-27 14:35:22 +0000
+++ b/src/ChangeLog     2010-09-27 15:03:58 +0000
@@ -1,6 +1,7 @@
 2010-09-27  Lars Magne Ingebrigtsen  <address@hidden>
 
        * gnutls.c (gnutls_log_function): Added more debugging.
+       (emacs_gnutls_read): Don't infloop while reading.
 
 2010-09-27  Kenichi Handa  <address@hidden>
 

=== modified file 'src/gnutls.c'
--- a/src/gnutls.c      2010-09-27 14:35:22 +0000
+++ b/src/gnutls.c      2010-09-27 15:03:58 +0000
@@ -67,12 +67,11 @@
 {
   register int rtnval;
 
-  do {
-    rtnval = gnutls_read (state, buf, nbyte);
-  } while (rtnval == GNUTLS_E_INTERRUPTED || rtnval == GNUTLS_E_AGAIN);
-  fsync (STDOUT_FILENO);
-
-  return (rtnval);
+  rtnval = gnutls_read (state, buf, nbyte);
+  if (rtnval >= 0)
+    return rtnval;
+  else
+    return -1;
 }
 
 /* convert an integer error to a Lisp_Object; it will be either a
@@ -268,8 +267,8 @@
 
   state = XPROCESS (proc)->gnutls_state;
 
-  gnutls_global_set_log_level(4);
-  gnutls_global_set_log_function(gnutls_log_function);
+  //gnutls_global_set_log_level(4);
+  //gnutls_global_set_log_function(gnutls_log_function);
   
   /* always initialize globals.  */
   global_init = gnutls_emacs_global_init ();