aboutsummaryrefslogtreecommitdiff
path: root/openssl/crypto/bio/bss_file.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-06-16 16:17:11 +0000
committermarha <marha@users.sourceforge.net>2010-06-16 16:17:11 +0000
commitfef0b61e18b9c7475e4d6e67ddfc55db46573f4e (patch)
treed4c68ba5b80ca0748fb23f1c344e859efd79503f /openssl/crypto/bio/bss_file.c
parent243edb24f5179d93c849ea326fb489d3f846db71 (diff)
downloadvcxsrv-fef0b61e18b9c7475e4d6e67ddfc55db46573f4e.tar.gz
vcxsrv-fef0b61e18b9c7475e4d6e67ddfc55db46573f4e.tar.bz2
vcxsrv-fef0b61e18b9c7475e4d6e67ddfc55db46573f4e.zip
Switched to openssl-1.0.0a
Diffstat (limited to 'openssl/crypto/bio/bss_file.c')
-rw-r--r--openssl/crypto/bio/bss_file.c43
1 files changed, 40 insertions, 3 deletions
diff --git a/openssl/crypto/bio/bss_file.c b/openssl/crypto/bio/bss_file.c
index ba4f8e994..8bfa0bcd9 100644
--- a/openssl/crypto/bio/bss_file.c
+++ b/openssl/crypto/bio/bss_file.c
@@ -118,10 +118,47 @@ static BIO_METHOD methods_filep=
BIO *BIO_new_file(const char *filename, const char *mode)
{
- BIO *ret;
- FILE *file;
+ BIO *ret;
+ FILE *file=NULL;
+
+#if defined(_WIN32) && defined(CP_UTF8)
+ int sz, len_0 = (int)strlen(filename)+1;
+
+ /*
+ * 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,MB_ERR_INVALID_CHARS,
+ filename,len_0,NULL,0))>0)
+ {
+ WCHAR wmode[8];
+ WCHAR *wfilename = _alloca(sz*sizeof(WCHAR));
- if ((file=fopen(filename,mode)) == NULL)
+ if (MultiByteToWideChar(CP_UTF8,MB_ERR_INVALID_CHARS,
+ 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
+ ) /* 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)
{
SYSerr(SYS_F_FOPEN,get_last_sys_error());
ERR_add_error_data(5,"fopen('",filename,"','",mode,"')");