griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rearrange includes, and more fill_paths code.

Browse Source
This commit is contained in:
Guillermo S. Romero
2009-10-20 02:20:00 +00:00
parent b8141658a8
commit 9e6d1c6cfa
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/blenlib/intern/BLI_bfile.c
View File

@@ -27,12 +27,12 @@
#include <string.h>
#include <stdlib.h>
#ifndef WIN32
#include <unistd.h>
#include <unistd.h>
#include <sys/param.h>
#else
#include <io.h>
#include "BLI_winstuff.h"
#include <io.h>
#include "BLI_winstuff.h"
#endif
#include <sys/param.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
@@ -465,13 +465,16 @@ char* find_in_pathlist(char* filename, char* pathlist) {
*/
void fill_paths(BFILE *bfile, const char *path) {
char* source_path = NULL;
char* temp_path = NULL;
int bflags = bfile->uflags;
if(bflags & BFILE_NORMAL || bflags & BFILE_RAW) {
// bfile->fpath is path with // replaced
}
if(bflags & BFILE_TEMP) {
// bfile->fpath is tempdir+path
temp_path = MEM_mallocN(MAXPATHLEN, "bfile-fpath-1");
snprintf(temp_path, MAXPATHLEN, "%s/%s", getenv("BLENDER_TEMP"), path);
bfile->fpath = temp_path;
}
if(bflags & BFILE_CONFIG) {
// bfile->fpath is userdir+version+path
@@ -482,7 +485,9 @@ void fill_paths(BFILE *bfile, const char *path) {
if(bfile->classf & BCF_WRITE && !(bflags & BFILE_RAW)) {
/* Generate temp path */
// bfile->tpath is fpath+randstring
temp_path = MEM_mallocN(MAXPATHLEN, "bfile-fpath-2");
snprintf(temp_path, MAXPATHLEN, "%s.XXXXXX", path);
bfile->tpath = mkdtemp(temp_path);
if(!(bfile->classf & BCF_DISCARD)) {
/* Copy data to tpath */
if(source_path) {