Make emacs_gnutls_read() return the expected on errors.

Also interface cleanups.

2 files changed, 14 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3b3f20fb737..b147ab2d01f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-09  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnutls.c (syms_of_gnutls): All the bootprops are keywords.
+        (emacs_gnutls_write): Remove the debuggin fsync() call.
+        (emacs_gnutls_read): Return -1 if we got an error from
+        gnutls_read().  This allows us to actually read lots of data from
+        the GnuTLS stream.
+
 2010-10-09  Chong Yidong  <cyd@stupidchicken.com>
 
         * xterm.c (x_draw_relief_rect): Clear corner pixels.
diff --git a/src/gnutls.c b/src/gnutls.c
index 0913e1a3d2f..da5b10d3190 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -98,7 +98,6 @@ emacs_gnutls_write (int fildes, struct Lisp_Process *proc, char *buf,
       nbyte -= rtnval;
       bytes_written += rtnval;
     }
-  fsync (STDOUT_FILENO);
 
   return (bytes_written);
 }
@@ -120,7 +119,7 @@ emacs_gnutls_read (int fildes, struct Lisp_Process *proc, char *buf,
   if (rtnval >= 0)
     return rtnval;
   else
-    return 0;
+    return -1;
 }
 
 /* convert an integer error to a Lisp_Object; it will be either a
@@ -578,19 +577,19 @@ syms_of_gnutls (void)
   Qgnutls_x509pki = intern_c_string ("gnutls-x509pki");
   staticpro (&Qgnutls_x509pki);
 
-  Qgnutls_bootprop_priority = intern_c_string ("priority");
+  Qgnutls_bootprop_priority = intern_c_string (":priority");
   staticpro (&Qgnutls_bootprop_priority);
 
-  Qgnutls_bootprop_trustfiles = intern_c_string ("trustfiles");
+  Qgnutls_bootprop_trustfiles = intern_c_string (":trustfiles");
   staticpro (&Qgnutls_bootprop_trustfiles);
 
-  Qgnutls_bootprop_keyfiles = intern_c_string ("keyfiles");
+  Qgnutls_bootprop_keyfiles = intern_c_string (":keyfiles");
   staticpro (&Qgnutls_bootprop_keyfiles);
 
-  Qgnutls_bootprop_callbacks = intern_c_string ("callbacks");
+  Qgnutls_bootprop_callbacks = intern_c_string (":callbacks");
   staticpro (&Qgnutls_bootprop_callbacks);
 
-  Qgnutls_bootprop_loglevel = intern_c_string ("loglevel");
+  Qgnutls_bootprop_loglevel = intern_c_string (":loglevel");
   staticpro (&Qgnutls_bootprop_loglevel);
 
   Qgnutls_e_interrupted = intern_c_string ("gnutls-e-interrupted");