mass change: update copyright years.

[wget] / src / gnutls.c

diff --git a/src/gnutls.c b/src/gnutls.c
index 440b1aed2de7c429d6b0f36cda97804378d4efa3..9e5c733b4c90c536ac46e4b6e3dfe0d5180220f0 100644 (file)
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -1,5 +1,5 @@
 /* SSL support via GnuTLS library.
-   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
    Foundation, Inc.
 
 This file is part of GNU Wget.
@@ -32,9 +32,7 @@ as that of the covered work.  */
 
 #include <assert.h>
 #include <errno.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #include <string.h>
 #include <stdio.h>
 #include <dirent.h>
@@ -104,7 +102,8 @@ ssl_init ()
   return true;
 }
 
-struct wgnutls_transport_context {
+struct wgnutls_transport_context
+{
   gnutls_session session;       /* GnuTLS session handle */
   int last_error;               /* last error returned by read/write/... */
 
@@ -144,6 +143,7 @@ wgnutls_read (int fd, char *buf, int bufsize, void *arg)
 
   if (ret < 0)
     ctx->last_error = ret;
+
   return ret;
 }
 
@@ -190,7 +190,12 @@ wgnutls_peek (int fd, char *buf, int bufsize, void *arg)
       while (ret == GNUTLS_E_INTERRUPTED);
 
       if (ret < 0)
-        return ret;
+        {
+          if (offset)
+            ret = 0;
+          else
+            return ret;
+        }
 
       if (ret > 0)
         {
@@ -223,7 +228,8 @@ wgnutls_close (int fd, void *arg)
 /* gnutls_transport is the singleton that describes the SSL transport
    methods provided by this file.  */
 
-static struct transport_implementation wgnutls_transport = {
+static struct transport_implementation wgnutls_transport =
+{
   wgnutls_read, wgnutls_write, wgnutls_poll,
   wgnutls_peek, wgnutls_errstr, wgnutls_close
 };