[svn] Update copyright notices.

[wget] / src / rbuf.c

diff --git a/src/rbuf.c b/src/rbuf.c
index b8fefb138e97f4c14261340d78b011d3b4abf4c2..b04c2aeefecc7a48e76bb0ed3453a87b2dfc877a 100644 (file)
--- a/src/rbuf.c
+++ b/src/rbuf.c
@@ -1,18 +1,20 @@
 /* Buffering read.
    Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
+This file is part of GNU Wget.
+
+GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
+GNU Wget is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
+along with Wget; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* This is a simple implementation of buffering IO-read functions.  */
@@ -25,10 +27,23 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "rbuf.h"
 #include "connect.h"
 
+#ifdef HAVE_SSL
+#include <openssl/bio.h>
+#include <openssl/crypto.h>
+#include <openssl/x509.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include <openssl/pem.h>
+#endif /* HAVE_SSL */
+
 void
 rbuf_initialize (struct rbuf *rbuf, int fd)
 {
   rbuf->fd = fd;
+#ifdef HAVE_SSL
+/* pointing ssl to NULL results in an unchanged behaviour */
+  rbuf->ssl = NULL;
+#endif /* HAVE_SSL */
   rbuf->buffer_pos = rbuf->buffer;
   rbuf->buffer_left = 0;
 }
@@ -45,6 +60,17 @@ rbuf_uninitialize (struct rbuf *rbuf)
   rbuf->fd = -1;
 }
 
+int
+rbuf_read_bufferful (struct rbuf *rbuf)
+{
+#ifdef HAVE_SSL
+  if (rbuf->ssl)
+    return ssl_iread (rbuf->ssl, rbuf->buffer, sizeof (rbuf->buffer));
+  else
+#endif
+    return iread (rbuf->fd, rbuf->buffer, sizeof (rbuf->buffer));
+}
+
 /* Currently unused -- see RBUF_READCHAR.  */
 #if 0
 /* Function version of RBUF_READCHAR.  */
@@ -64,7 +90,15 @@ rbuf_peek (struct rbuf *rbuf, char *store)
       int res;
       rbuf->buffer_pos = rbuf->buffer;
       rbuf->buffer_left = 0;
-      res = iread (rbuf->fd, rbuf->buffer, sizeof (rbuf->buffer));
+#ifdef HAVE_SSL
+               if (rbuf->ssl != NULL) {
+               res = ssl_iread (rbuf->ssl, rbuf->buffer, sizeof (rbuf->buffer));
+               } else {
+#endif /* HAVE_SSL */
+               res = iread (rbuf->fd, rbuf->buffer, sizeof (rbuf->buffer));
+#ifdef HAVE_SSL
+      }
+#endif /* HAVE_SSL */
       if (res <= 0)
        return res;
       rbuf->buffer_left = res;