1 files changed, 35 insertions, 56 deletions

diff --git a/src/lib/libcrypto/bio/bss_file.c b/src/lib/libcrypto/bio/bss_file.c
index 1484cf849e..8b3ff278d9 100644
--- a/src/lib/libcrypto/bio/bss_file.c
+++ b/src/lib/libcrypto/bio/bss_file.c
@@ -68,29 +68,18 @@
 #include <stdio.h>
 #include <errno.h>
 #include "cryptlib.h"
-#include "bio.h"
-#include "err.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
 
-#if !defined(NO_STDIO)
+#if !defined(OPENSSL_NO_STDIO)
 
-#ifndef NOPROTO
-static int MS_CALLBACK file_write(BIO *h,char *buf,int num);
-static int MS_CALLBACK file_read(BIO *h,char *buf,int size);
-static int MS_CALLBACK file_puts(BIO *h,char *str);
-static int MS_CALLBACK file_gets(BIO *h,char *str,int size);
-static long MS_CALLBACK file_ctrl(BIO *h,int cmd,long arg1,char *arg2);
+static int MS_CALLBACK file_write(BIO *h, const char *buf, int num);
+static int MS_CALLBACK file_read(BIO *h, char *buf, int size);
+static int MS_CALLBACK file_puts(BIO *h, const char *str);
+static int MS_CALLBACK file_gets(BIO *h, char *str, int size);
+static long MS_CALLBACK file_ctrl(BIO *h, int cmd, long arg1, void *arg2);
 static int MS_CALLBACK file_new(BIO *h);
 static int MS_CALLBACK file_free(BIO *data);
-#else
-static int MS_CALLBACK file_write();
-static int MS_CALLBACK file_read();
-static int MS_CALLBACK file_puts();
-static int MS_CALLBACK file_gets();
-static long MS_CALLBACK file_ctrl();
-static int MS_CALLBACK file_new();
-static int MS_CALLBACK file_free();
-#endif
-
 static BIO_METHOD methods_filep=
         {
         BIO_TYPE_FILE,
@@ -102,11 +91,10 @@ static BIO_METHOD methods_filep=
         file_ctrl,
         file_new,
         file_free,
+        NULL,
         };
 
-BIO *BIO_new_file(filename,mode)
-char *filename;
-char *mode;
+BIO *BIO_new_file(const char *filename, const char *mode)
         {
         BIO *ret;
         FILE *file;
@@ -115,7 +103,10 @@ char *mode;
                 {
                 SYSerr(SYS_F_FOPEN,get_last_sys_error());
                 ERR_add_error_data(5,"fopen('",filename,"','",mode,"')");
-                BIOerr(BIO_F_BIO_NEW_FILE,ERR_R_SYS_LIB);
+                if (errno == ENOENT)
+                        BIOerr(BIO_F_BIO_NEW_FILE,BIO_R_NO_SUCH_FILE);
+                else
+                        BIOerr(BIO_F_BIO_NEW_FILE,ERR_R_SYS_LIB);
                 return(NULL);
                 }
         if ((ret=BIO_new(BIO_s_file_internal())) == NULL)
@@ -125,9 +116,7 @@ char *mode;
         return(ret);
         }
 
-BIO *BIO_new_fp(stream,close_flag)
-FILE *stream;
-int close_flag;
+BIO *BIO_new_fp(FILE *stream, int close_flag)
         {
         BIO *ret;
 
@@ -138,13 +127,12 @@ int close_flag;
         return(ret);
         }
 
-BIO_METHOD *BIO_s_file()
+BIO_METHOD *BIO_s_file(void)
         {
         return(&methods_filep);
         }
 
-static int MS_CALLBACK file_new(bi)
-BIO *bi;
+static int MS_CALLBACK file_new(BIO *bi)
         {
         bi->init=0;
         bi->num=0;
@@ -152,8 +140,7 @@ BIO *bi;
         return(1);
         }
 
-static int MS_CALLBACK file_free(a)
-BIO *a;
+static int MS_CALLBACK file_free(BIO *a)
         {
         if (a == NULL) return(0);
         if (a->shutdown)
@@ -168,10 +155,7 @@ BIO *a;
         return(1);
         }
         
-static int MS_CALLBACK file_read(b,out,outl)
-BIO *b;
-char *out;
-int outl;
+static int MS_CALLBACK file_read(BIO *b, char *out, int outl)
         {
         int ret=0;
 
@@ -182,10 +166,7 @@ int outl;
         return(ret);
         }
 
-static int MS_CALLBACK file_write(b,in,inl)
-BIO *b;
-char *in;
-int inl;
+static int MS_CALLBACK file_write(BIO *b, const char *in, int inl)
         {
         int ret=0;
 
@@ -194,18 +175,14 @@ int inl;
                 if (fwrite(in,(int)inl,1,(FILE *)b->ptr))
                         ret=inl;
                 /* ret=fwrite(in,1,(int)inl,(FILE *)b->ptr); */
-                /* acording to Tim Hudson <tjh@cryptsoft.com>, the commented
+                /* according to Tim Hudson <tjh@cryptsoft.com>, the commented
                  * out version above can cause 'inl' write calls under
                  * some stupid stdio implementations (VMS) */
                 }
         return(ret);
         }
 
-static long MS_CALLBACK file_ctrl(b,cmd,num,ptr)
-BIO *b;
-int cmd;
-long num;
-char *ptr;
+static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
         {
         long ret=1;
         FILE *fp=(FILE *)b->ptr;
@@ -214,26 +191,33 @@ char *ptr;
 
         switch (cmd)
                 {
+        case BIO_C_FILE_SEEK:
         case BIO_CTRL_RESET:
                 ret=(long)fseek(fp,num,0);
                 break;
         case BIO_CTRL_EOF:
                 ret=(long)feof(fp);
                 break;
+        case BIO_C_FILE_TELL:
         case BIO_CTRL_INFO:
                 ret=ftell(fp);
                 break;
         case BIO_C_SET_FILE_PTR:
                 file_free(b);
-                b->shutdown=(int)num;
+                b->shutdown=(int)num&BIO_CLOSE;
                 b->ptr=(char *)ptr;
                 b->init=1;
-#if defined(MSDOS) || defined(WINDOWS)
+#if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS)
                 /* Set correct text/binary mode */
                 if (num & BIO_FP_TEXT)
                         _setmode(fileno((FILE *)ptr),_O_TEXT);
                 else
                         _setmode(fileno((FILE *)ptr),_O_BINARY);
+#elif defined(OPENSSL_SYS_OS2)
+                if (num & BIO_FP_TEXT)
+                        setmode(fileno((FILE *)ptr), O_TEXT);
+                else
+                        setmode(fileno((FILE *)ptr), O_BINARY);
 #endif
                 break;
         case BIO_C_SET_FILENAME:
@@ -257,7 +241,7 @@ char *ptr;
                         ret=0;
                         break;
                         }
-#if defined(MSDOS) || defined(WINDOWS)
+#if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS)
                 if (!(num & BIO_FP_TEXT))
                         strcat(p,"b");
                 else
@@ -307,10 +291,7 @@ char *ptr;
         return(ret);
         }
 
-static int MS_CALLBACK file_gets(bp,buf,size)
-BIO *bp;
-char *buf;
-int size;
+static int MS_CALLBACK file_gets(BIO *bp, char *buf, int size)
         {
         int ret=0;
 
@@ -321,9 +302,7 @@ int size;
         return(ret);
         }
 
-static int MS_CALLBACK file_puts(bp,str)
-BIO *bp;
-char *str;
+static int MS_CALLBACK file_puts(BIO *bp, const char *str)
         {
         int n,ret;
 
@@ -332,7 +311,7 @@ char *str;
         return(ret);
         }
 
-#endif /* NO_STDIO */
+#endif /* OPENSSL_NO_STDIO */
 
 #endif /* HEADER_BSS_FILE_C */