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

Code cleanup: file operations merged into single header, some function names

Browse Source 
made less cryptic and changed to indicate if they work on files or directories.
This commit is contained in:
Brecht Van Lommel
2011-10-22 15:35:49 +00:00
parent c1de5cc838
commit e417e011d5
39 changed files with 137 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/blenlib/intern/path_util.c
View File

@@ -46,8 +46,6 @@
#include "BLI_fileops.h"
#include "BLI_path_util.h"
#include "BLI_string.h"
#include "BLI_storage.h"
#include "BLI_storage_types.h"
#include "BLI_utildefines.h"
#include "BKE_utildefines.h"
@@ -740,7 +738,7 @@ int BLI_path_cwd(char *path)
if (wasrelative==1) {
char cwd[FILE_MAXDIR + FILE_MAXFILE]= "";
BLI_getwdN(cwd, sizeof(cwd)); /* incase the full path to the blend isnt used */
BLI_current_working_dir(cwd, sizeof(cwd)); /* incase the full path to the blend isnt used */
if (cwd[0] == '\0') {
printf( "Could not get the current working directory - $PWD for an unknown reason.");
@@ -986,7 +984,7 @@ static int get_path_system(char *targetpath, const char *folder_name, const char
}
/* try CWD/release/folder_name */
if(BLI_getwdN(cwd, sizeof(cwd))) {
if(BLI_current_working_dir(cwd, sizeof(cwd))) {
if(test_path(targetpath, cwd, "release", relfolder)) {
return 1;
}
@@ -1117,7 +1115,7 @@ char *BLI_get_folder_create(int folder_id, const char *subfolder)
if (!path) {
path = BLI_get_user_folder_notest(folder_id, subfolder);
if (path) BLI_recurdir_fileops(path);
if (path) BLI_dir_create_recursive(path);
}
return path;
@@ -1250,7 +1248,7 @@ void BLI_make_existing_file(const char *name)
/* test exist */
if (BLI_exists(di) == 0) {
BLI_recurdir_fileops(di);
BLI_dir_create_recursive(di);
}
}
@@ -1732,7 +1730,7 @@ static void bli_where_am_i(char *fullname, const size_t maxlen, const char *name
BLI_strncpy(fullname, name, maxlen);
if (name[0] == '.') {
char wdir[FILE_MAX]= "";
BLI_getwdN(wdir, sizeof(wdir)); /* backup cwd to restore after */
BLI_current_working_dir(wdir, sizeof(wdir)); /* backup cwd to restore after */
// not needed but avoids annoying /./ in name
if(name[1]==SEP)