archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

revert 46626, which crashes blender during startup with fileno

Browse Source 
There is a better way to fix this by zlib upgrade, which has its own open function for windows paths
This commit is contained in:
Sv. Lockal
2012-05-14 15:50:35 +00:00
parent 24fb2bad55
commit 1a729d51d0
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
source/blender/blenlib/intern/fileops.c
View File

@@ -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;
/* xxx Creates file before transcribing the path */
if (mode[0] == 'w')
fclose(ufopen(filename, "a"));
UTF16_ENCODE(filename);
UTF16_ENCODE(mode);
GetShortPathNameW(filename_16, short_name_16, 256);
if ((file = _wfopen(short_name_16, mode_16))) {
if (!(gzfile = gzdopen(fileno(file), mode))) {
fclose(file);
}
}
else {
wchar_t short_name_16[256];
char short_name[256];
int i = 0;
UTF16_UN_ENCODE(mode);
UTF16_UN_ENCODE(filename);
/* xxx Creates file before transcribing the path */
if (mode[0] == 'w')
fclose(ufopen(filename, "a"));
UTF16_ENCODE(filename);
GetShortPathNameW(filename_16, short_name_16, 256);
for (i = 0; i < 256; i++) {
short_name[i] = (char)short_name_16[i];
}
gzfile = gzopen(short_name, mode);
UTF16_UN_ENCODE(filename);
}
return gzfile;
}