revert 46626, which crashes blender during startup with fileno

There is a better way to fix this by zlib upgrade, which has its own open function for windows paths

1 files changed, 18 insertions, 16 deletions

diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c
index 958de59c4b3..e6d06484e74 100644
--- a/source/blender/blenlib/intern/fileops.c
+++ b/source/blender/blenlib/intern/fileops.c
@@ -211,30 +211,32 @@ FILE *BLI_fopen(const char *filename, const char *mode)
 
 void *BLI_gzopen(const char *filename, const char *mode)
 {
-	FILE *file;
-	gzFile gzfile = NULL;
-	wchar_t short_name_16[256];
+	gzFile gzfile;
 
-	if (!filename || !mode) 
+	if (!filename || !mode) {
 		return 0;
+	}
+	else {
+		wchar_t short_name_16[256];
+		char short_name[256];
+		int i = 0;
 
-	/* xxx Creates file before transcribing the path */
-	if (mode[0] == 'w')
-		fclose(ufopen(filename, "a"));
+		/* xxx Creates file before transcribing the path */
+		if (mode[0] == 'w')
+			fclose(ufopen(filename, "a"));
 
-	UTF16_ENCODE(filename);
-	UTF16_ENCODE(mode);
+		UTF16_ENCODE(filename);
 
-	GetShortPathNameW(filename_16, short_name_16, 256);
+		GetShortPathNameW(filename_16, short_name_16, 256);
 
-	if ((file = _wfopen(short_name_16, mode_16))) {
-		if (!(gzfile = gzdopen(fileno(file), mode))) {
-			fclose(file);
+		for (i = 0; i < 256; i++) {
+			short_name[i] = (char)short_name_16[i];
 		}
-	}
 
-	UTF16_UN_ENCODE(mode);
-	UTF16_UN_ENCODE(filename);
+		gzfile = gzopen(short_name, mode);
+
+		UTF16_UN_ENCODE(filename);
+	}
 
 	return gzfile;
 }