OS/2 does binary by default, apparently.

[openssl.git] / crypto / bio / bss_file.c

diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c
index 3ed5dab90427c79349f105688f6af34d02390b50..a66600c1a34c2ff0812b124da214570080d4cfd9 100644 (file)
--- a/crypto/bio/bss_file.c
+++ b/crypto/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,9 +91,10 @@ static BIO_METHOD methods_filep=
        file_ctrl,
        file_new,
        file_free,
+       NULL,
        };
 
-BIO *BIO_new_file(char *filename, char *mode)
+BIO *BIO_new_file(const char *filename, const char *mode)
        {
        BIO *ret;
        FILE *file;
@@ -113,7 +103,10 @@ BIO *BIO_new_file(char *filename, 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)
@@ -169,11 +162,17 @@ static int MS_CALLBACK file_read(BIO *b, char *out, int outl)
        if (b->init && (out != NULL))
                {
                ret=fread(out,1,(int)outl,(FILE *)b->ptr);
+               if(ret == 0 && ferror((FILE *)b->ptr))
+                       {
+                       SYSerr(SYS_F_FREAD,get_last_sys_error());
+                       BIOerr(BIO_F_FILE_READ,ERR_R_SYS_LIB);
+                       ret=-1;
+                       }
                }
        return(ret);
        }
 
-static int MS_CALLBACK file_write(BIO *b, char *in, int inl)
+static int MS_CALLBACK file_write(BIO *b, const char *in, int inl)
        {
        int ret=0;
 
@@ -182,14 +181,14 @@ static int MS_CALLBACK file_write(BIO *b, char *in, 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(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;
@@ -211,15 +210,20 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, char *ptr)
                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:
@@ -243,7 +247,7 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, char *ptr)
                        ret=0;
                        break;
                        }
-#if defined(MSDOS) || defined(WINDOWS)
+#if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_OS2)
                if (!(num & BIO_FP_TEXT))
                        strcat(p,"b");
                else
@@ -304,7 +308,7 @@ static int MS_CALLBACK file_gets(BIO *bp, char *buf, int size)
        return(ret);
        }
 
-static int MS_CALLBACK file_puts(BIO *bp, char *str)
+static int MS_CALLBACK file_puts(BIO *bp, const char *str)
        {
        int n,ret;
 
@@ -313,7 +317,7 @@ static int MS_CALLBACK file_puts(BIO *bp, char *str)
        return(ret);
        }
 
-#endif /* NO_STDIO */
+#endif /* OPENSSL_NO_STDIO */
 
 #endif /* HEADER_BSS_FILE_C */