ec/ecp_nistz256.c: harmonize with latest indent script.

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

diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c
index 3f458a0c7cb3817faddd34c1efe4ca9928652d13..01df9702d6f76f8c91dda87112a2a12ff319a226 100644 (file)
--- a/crypto/bio/bss_file.c
+++ b/crypto/bio/bss_file.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-/*
+/*-
  * 03-Dec-1997 rdenny@dc3.com  Fix bug preventing use of stdin/stdout
  *             with binary data (e.g. asn1parse -inform DER < xxx) under
  *             Windows
@@ -95,13 +95,13 @@
 
 #if !defined(OPENSSL_NO_STDIO)
 
-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);
+static int file_write(BIO *h, const char *buf, int num);
+static int file_read(BIO *h, char *buf, int size);
+static int file_puts(BIO *h, const char *str);
+static int file_gets(BIO *h, char *str, int size);
+static long file_ctrl(BIO *h, int cmd, long arg1, void *arg2);
+static int file_new(BIO *h);
+static int file_free(BIO *data);
 static BIO_METHOD methods_filep=
        {
        BIO_TYPE_FILE,
@@ -118,28 +118,56 @@ static BIO_METHOD methods_filep=
 
 BIO *BIO_new_file(const char *filename, const char *mode)
        {
-       BIO *ret;
-       FILE *file;
+       BIO  *ret;
+       FILE *file=NULL;
 
-       file=fopen(filename,mode);      
 #if defined(_WIN32) && defined(CP_UTF8)
-       if (file==NULL && errno==ENOENT) /* see if filename is UTF-8 encoded */
+       int sz, len_0 = (int)strlen(filename)+1;
+       DWORD flags;
+
+       /*
+        * Basically there are three cases to cover: a) filename is
+        * pure ASCII string; b) actual UTF-8 encoded string and
+        * c) locale-ized string, i.e. one containing 8-bit
+        * characters that are meaningful in current system locale.
+        * If filename is pure ASCII or real UTF-8 encoded string,
+        * MultiByteToWideChar succeeds and _wfopen works. If
+        * filename is locale-ized string, chances are that
+        * MultiByteToWideChar fails reporting
+        * ERROR_NO_UNICODE_TRANSLATION, in which case we fall
+        * back to fopen...
+        */
+       if ((sz=MultiByteToWideChar(CP_UTF8,(flags=MB_ERR_INVALID_CHARS),
+                                       filename,len_0,NULL,0))>0 ||
+           (GetLastError()==ERROR_INVALID_FLAGS &&
+            (sz=MultiByteToWideChar(CP_UTF8,(flags=0),
+                                       filename,len_0,NULL,0))>0)
+          )
                {
-               int sz,len_0 = (int)strlen(filename)+1;
-               if ((sz=MultiByteToWideChar(CP_UTF8,0,filename,len_0,
-                                           NULL,0))>0)
+               WCHAR  wmode[8];
+               WCHAR *wfilename = _alloca(sz*sizeof(WCHAR));
+
+               if (MultiByteToWideChar(CP_UTF8,flags,
+                                       filename,len_0,wfilename,sz) &&
+                   MultiByteToWideChar(CP_UTF8,0,mode,strlen(mode)+1,
+                                       wmode,sizeof(wmode)/sizeof(wmode[0])) &&
+                   (file=_wfopen(wfilename,wmode))==NULL &&
+                   (errno==ENOENT || errno==EBADF)
+                  )
                        {
-                       WCHAR wmode[8];
-                       WCHAR *wfilename = _alloca(sz*sizeof(WCHAR));
-
-                       if (MultiByteToWideChar(CP_UTF8,0,filename,len_0,
-                                               wfilename,sz) &&
-                           MultiByteToWideChar(CP_UTF8,0,mode,strlen(mode)+1,
-                                               wmode,sizeof(wmode)/sizeof(wmode[0]))
-                          )
-                               file = _wfopen(wfilename,wmode);
+                       /*
+                        * UTF-8 decode succeeded, but no file, filename
+                        * could still have been locale-ized...
+                        */
+                       file = fopen(filename,mode);
                        }
                }
+       else if (GetLastError()==ERROR_NO_UNICODE_TRANSLATION)
+               {
+               file = fopen(filename,mode);
+               }
+#else
+       file=fopen(filename,mode);      
 #endif
        if (file == NULL)
                {
@@ -179,7 +207,7 @@ BIO_METHOD *BIO_s_file(void)
        return(&methods_filep);
        }
 
-static int MS_CALLBACK file_new(BIO *bi)
+static int file_new(BIO *bi)
        {
        bi->init=0;
        bi->num=0;
@@ -188,7 +216,7 @@ static int MS_CALLBACK file_new(BIO *bi)
        return(1);
        }
 
-static int MS_CALLBACK file_free(BIO *a)
+static int file_free(BIO *a)
        {
        if (a == NULL) return(0);
        if (a->shutdown)
@@ -207,7 +235,7 @@ static int MS_CALLBACK file_free(BIO *a)
        return(1);
        }
        
-static int MS_CALLBACK file_read(BIO *b, char *out, int outl)
+static int file_read(BIO *b, char *out, int outl)
        {
        int ret=0;
 
@@ -227,7 +255,7 @@ static int MS_CALLBACK file_read(BIO *b, char *out, int outl)
        return(ret);
        }
 
-static int MS_CALLBACK file_write(BIO *b, const char *in, int inl)
+static int file_write(BIO *b, const char *in, int inl)
        {
        int ret=0;
 
@@ -247,7 +275,7 @@ static int MS_CALLBACK file_write(BIO *b, const char *in, int inl)
        return(ret);
        }
 
-static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
+static long file_ctrl(BIO *b, int cmd, long num, void *ptr)
        {
        long ret=1;
        FILE *fp=(FILE *)b->ptr;
@@ -417,7 +445,7 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
        return(ret);
        }
 
-static int MS_CALLBACK file_gets(BIO *bp, char *buf, int size)
+static int file_gets(BIO *bp, char *buf, int size)
        {
        int ret=0;
 
@@ -438,7 +466,7 @@ static int MS_CALLBACK file_gets(BIO *bp, char *buf, int size)
        return(ret);
        }
 
-static int MS_CALLBACK file_puts(BIO *bp, const char *str)
+static int file_puts(BIO *bp, const char *str)
        {
        int n,ret;