path_util_storage.path
Public
Actions

Authored By

	Lawrence D'Oliveiro (ldo)
	Nov 13 2013, 4:42 PM

Size

51 KB

Subscribers

None

path_util_storage.path
View Options

	commit d3db4e2362f8b405734bea3e5d3a7faccb9ea13d
	Author: Lawrence D'Oliveiro <ldo@geek-central.gen.nz>
	Date: Sat Feb 16 04:42:31 2013 +0000

	More comments
	More use of bool type, necessitating adding inclusion of BLI_utildefines.h, or moving it up in the inclusion order if it was already included, in various places
	storage.c: make some variables only used in bli_builddir local to that
	storage.c: BLI_file_descriptor_size should allow 0 as a valid file descriptor
	path_util.c: make pointers to non-reentrant storage returned from folder routines const, necessitating making variables holding these returned pointers const elsewhere as well
	path_util.c: BLI_string_to_utf8 closes iconv context in case of conversion error
	blf_lang.c: fill_locales routine now has its own "languages" local variable to construct paths (was stealing internal storage belonging to BLI_get_folder before)

	diff --git a/source/blender/blenfont/intern/blf_dir.c b/source/blender/blenfont/intern/blf_dir.c
	index b6a98fa..116a55c 100644
	--- a/source/blender/blenfont/intern/blf_dir.c
	+++ b/source/blender/blenfont/intern/blf_dir.c
	@@ -41,6 +41,7 @@

	#include "DNA_vec_types.h"

	+#include "BLI_utildefines.h"
	#include "BLI_fileops.h"
	#include "BLI_listbase.h"
	#include "BLI_path_util.h"
	diff --git a/source/blender/blenfont/intern/blf_lang.c b/source/blender/blenfont/intern/blf_lang.c
	index 73294f1..d1c037b 100644
	--- a/source/blender/blenfont/intern/blf_lang.c
	+++ b/source/blender/blenfont/intern/blf_lang.c
	@@ -78,15 +78,16 @@ static void free_locales(void)

	static void fill_locales(void)
	{
	- char *languages_path = BLI_get_folder(BLENDER_DATAFILES, "locale");
	+ const char * const languages_path = BLI_get_folder(BLENDER_DATAFILES, "locale");
	+ char languages[FILE_MAX];
	LinkNode lines = NULL, line;
	char *str;
	int idx = 0;

	free_locales();

	- BLI_join_dirfile(languages_path, FILE_MAX, languages_path, "languages");
	- line = lines = BLI_file_read_as_lines(languages_path);
	+ BLI_join_dirfile(languages, FILE_MAX, languages_path, "languages");
	+ line = lines = BLI_file_read_as_lines(languages);

	/* This whole "parsing" code is a bit weak, in that it expects strictly formated input file...
	* Should not be a problem, though, as this file is script-generated! */
	@@ -185,7 +186,7 @@ EnumPropertyItem *BLF_RNA_lang_enum_properties(void)
	void BLF_lang_init(void)
	{
	#ifdef WITH_INTERNATIONAL
	- char *messagepath = BLI_get_folder(BLENDER_DATAFILES, "locale");
	+ const char * const messagepath = BLI_get_folder(BLENDER_DATAFILES, "locale");

	if (messagepath) {
	bl_locale_init(messagepath, TEXT_DOMAIN_NAME);
	diff --git a/source/blender/blenfont/intern/blf_translation.c b/source/blender/blenfont/intern/blf_translation.c
	index b5b72b6..750f310 100644
	--- a/source/blender/blenfont/intern/blf_translation.c
	+++ b/source/blender/blenfont/intern/blf_translation.c
	@@ -56,7 +56,7 @@ unsigned char BLF_get_unifont(int unifont_size_r)
	{
	#ifdef WITH_INTERNATIONAL
	if (unifont_ttf == NULL) {
	- char *fontpath = BLI_get_folder(BLENDER_DATAFILES, "fonts");
	+ const char * const fontpath = BLI_get_folder(BLENDER_DATAFILES, "fonts");
	if (fontpath) {
	char unifont_path[1024];

	diff --git a/source/blender/blenkernel/intern/customdata_file.c b/source/blender/blenkernel/intern/customdata_file.c
	index 7844987..dfaa557 100644
	--- a/source/blender/blenkernel/intern/customdata_file.c
	+++ b/source/blender/blenkernel/intern/customdata_file.c
	@@ -29,9 +29,9 @@

	#include "MEM_guardedalloc.h"

	+#include "BLI_utildefines.h"
	#include "BLI_fileops.h"
	#include "BLI_string.h"
	-#include "BLI_utildefines.h"
	#include "BLI_endian_switch.h"

	#include "BKE_customdata_file.h"
	diff --git a/source/blender/blenlib/BLI_fileops.h b/source/blender/blenlib/BLI_fileops.h
	index c278370..b65be65 100644
	--- a/source/blender/blenlib/BLI_fileops.h
	+++ b/source/blender/blenlib/BLI_fileops.h
	@@ -61,8 +61,8 @@ int BLI_stat(const char path, struct stat buffer);

	struct direntry;

	-int BLI_is_dir(const char *path);
	-int BLI_is_file(const char *path);
	+bool BLI_is_dir(const char *path);
	+bool BLI_is_file(const char *path);
	void BLI_dir_create_recursive(const char *dir);
	double BLI_dir_free_space(const char *dir);
	char BLI_current_working_dir(char dir, const size_t maxlen);
	@@ -85,7 +85,7 @@ size_t BLI_file_descriptor_size(int file);
	size_t BLI_file_size(const char *file);

	/* compare if one was last modified before the other */
	-int BLI_file_older(const char file1, const char file2);
	+bool BLI_file_older(const char file1, const char file2);

	/* read ascii file as lines, empty list if reading fails */
	struct LinkNode BLI_file_read_as_lines(const char file);
	diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h
	index 6d870c3..0a6b7df 100644
	--- a/source/blender/blenlib/BLI_path_util.h
	+++ b/source/blender/blenlib/BLI_path_util.h
	@@ -40,10 +40,10 @@ struct direntry;

	const char *BLI_getDefaultDocumentFolder(void);

	-char BLI_get_folder(int folder_id, const char subfolder);
	-char BLI_get_folder_create(int folder_id, const char subfolder);
	-char BLI_get_user_folder_notest(int folder_id, const char subfolder);
	-char *BLI_get_folder_version(int id, int ver, int do_check);
	+const char BLI_get_folder(int folder_id, const char subfolder);
	+const char BLI_get_folder_create(int folder_id, const char subfolder);
	+const char BLI_get_user_folder_notest(int folder_id, const char subfolder);
	+const char *BLI_get_folder_version(int id, int ver, bool do_check);

	/* folder_id */

	@@ -109,8 +109,8 @@ void BLI_getlastdir(const char dir, char last, size_t maxlen);
	bool BLI_testextensie(const char str, const char ext);
	bool BLI_testextensie_array(const char str, const char *ext_array);
	bool BLI_testextensie_glob(const char str, const char ext_fnmatch);
	-int BLI_replace_extension(char path, size_t maxlen, const char ext);
	-int BLI_ensure_extension(char path, size_t maxlen, const char ext);
	+bool BLI_replace_extension(char path, size_t maxlen, const char ext);
	+bool BLI_ensure_extension(char path, size_t maxlen, const char ext);
	void BLI_uniquename(struct ListBase list, void vlink, const char * defname, char delim, short name_offs, short len);
	bool BLI_uniquename_cb(bool (unique_check)(void arg, const char * name), void arg, const char defname, char delim, char *name, short name_len);
	void BLI_newname(char *name, int add);
	@@ -154,13 +154,14 @@ bool BLI_has_parent(char *path);
	* \retval Returns true if the path was relative (started with "//").
	*/
	bool BLI_path_abs(char path, const char basepath);
	-int BLI_path_frame(char *path, int frame, int digits);
	-int BLI_path_frame_range(char *path, int sta, int end, int digits);
	-int BLI_path_cwd(char *path);
	+bool BLI_path_frame(char *path, int frame, int digits);
	+bool BLI_path_frame_range(char *path, int sta, int end, int digits);
	+bool BLI_path_cwd(char *path);
	void BLI_path_rel(char file, const char relfile);

	bool BLI_path_is_rel(const char *path);

	+/* path string comparisons: case-insensitive for Windows, case-sensitive otherwise */
	#ifdef WIN32
	# define BLI_path_cmp BLI_strcasecmp
	# define BLI_path_ncmp BLI_strncasecmp
	diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h
	index 95ad786..11728e3 100644
	--- a/source/blender/blenlib/BLI_utildefines.h
	+++ b/source/blender/blenlib/BLI_utildefines.h
	@@ -167,7 +167,7 @@ typedef bool _BLI_Bool;
	(b) = (tval); \
	} (void)0

	-
	+/* ELEMx(a, ...) -- does the first arg equal any of the others */
	#define ELEM(a, b, c) ((a) == (b) \|\| (a) == (c))
	#define ELEM3(a, b, c, d) (ELEM(a, b, c) \|\| (a) == (d) )
	#define ELEM4(a, b, c, d, e) (ELEM(a, b, c) \|\| ELEM(a, d, e) )
	diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
	index ac35f51..81e01fc 100644
	--- a/source/blender/blenlib/intern/path_util.c
	+++ b/source/blender/blenlib/intern/path_util.c
	@@ -79,8 +79,8 @@
	/* local */
	#define UNIQUE_NAME_MAX 128

	-static char bprogname[FILE_MAX]; /* path to program executable */
	-static char bprogdir[FILE_MAX]; /* path in which executable is located */
	+static char bprogname[FILE_MAX]; /* full path to program executable */
	+static char bprogdir[FILE_MAX]; /* full path to directory in which executable is located */
	static char btempdir[FILE_MAX]; /* temporary directory */

	static int add_win32_extension(char *name);
	@@ -459,6 +459,8 @@ a path relative to the .blend file. */
	}

	void BLI_path_rel(char file, const char relfile)
	+/* replaces *file with a relative version (prefixed by "//") such that BLI_path_abs, given
	+ the same relfile, will convert it back to its original value. /
	{
	const char *lslash;
	char temp[FILE_MAX];
	@@ -511,6 +513,7 @@ void BLI_path_rel(char file, const char relfile)
	if (lslash) {
	/* find the prefix of the filename that is equal for both filenames.
	* This is replaced by the two slashes at the beginning */
	+ /* FIXME: why not just use BLI_path_ncmp? */
	char *p = temp;
	char *q = file;

	@@ -654,7 +657,9 @@ component, appending one digits long if not. */
	}
	}

	-int BLI_path_frame(char *path, int frame, int digits)
	+bool BLI_path_frame(char *path, int frame, int digits)
	+/* replaces "#" character sequence in last slash-separated component of *path
	+with frame as decimal integer, with leading zeroes as necessary, to make digits digits. */
	{
	int ch_sta, ch_end;

	@@ -665,12 +670,15 @@ int BLI_path_frame(char *path, int frame, int digits)
	char tmp[FILE_MAX];
	sprintf(tmp, "%.s%.d%s", ch_sta, path, ch_end - ch_sta, frame, path + ch_end);
	strcpy(path, tmp);
	- return 1;
	+ return true;
	}
	- return 0;
	+ return false;
	}

	-int BLI_path_frame_range(char *path, int sta, int end, int digits)
	+bool BLI_path_frame_range(char *path, int sta, int end, int digits)
	+/* replaces "#" character sequence in last slash-separated component of *path
	+with sta and end as decimal integers, with leading zeroes as necessary, to make digits
	+digits each, with a hyphen in-between. */
	{
	int ch_sta, ch_end;

	@@ -683,9 +691,9 @@ int BLI_path_frame_range(char *path, int sta, int end, int digits)
	"%.s%.d-%.*d%s",
	ch_sta, path, ch_end - ch_sta, sta, ch_end - ch_sta, end, path + ch_end);
	BLI_strncpy(path, tmp, FILE_MAX);
	- return 1;
	+ return true;
	}
	- return 0;
	+ return false;
	}

	bool BLI_path_abs(char path, const char basepath)
	@@ -789,20 +797,22 @@ Returns true iff "//" prefix expansion was done. */
	* Should only be done with command line paths.
	* this is NOT something blenders internal paths support like the // prefix
	*/
	-int BLI_path_cwd(char *path)
	+bool BLI_path_cwd(char *path)
	+/* expands path relative to the current working directory, if it was relative.
	+Returns true iff such expansion was done. */
	{
	- int wasrelative = 1;
	- int filelen = strlen(path);
	+ bool wasrelative = true;
	+ const int filelen = strlen(path);

	#ifdef WIN32
	if (filelen >= 3 && path[1] == ':' && (path[2] == '\\' \|\| path[2] == '/'))
	- wasrelative = 0;
	+ wasrelative = false;
	#else
	if (filelen >= 2 && path[0] == '/')
	- wasrelative = 0;
	+ wasrelative = false;
	#endif

	- if (wasrelative == 1) {
	+ if (wasrelative) {
	char cwd[FILE_MAX] = "";
	BLI_current_working_dir(cwd, sizeof(cwd)); /* in case the full path to the blend isn't used */

	@@ -830,6 +840,7 @@ int BLI_path_cwd(char *path)

	/* 'di's filename component is moved into 'fi', di is made a dir path */
	void BLI_splitdirstring(char di, char fi)
	+/* FIXME: duplicates functionality of BLI_split_dirfile. */
	{
	char lslash = (char )BLI_last_slash(di);

	@@ -844,6 +855,7 @@ void BLI_splitdirstring(char di, char fi)
	}

	void BLI_getlastdir(const char dir, char last, const size_t maxlen)
	+/* copies into last the part of dir following the second-last slash. */
	{
	const char *s = dir;
	const char *lslash = NULL;
	@@ -869,7 +881,7 @@ void BLI_getlastdir(const char dir, char last, const size_t maxlen)
	const char *BLI_getDefaultDocumentFolder(void)
	{
	#ifndef WIN32
	- const char *xdg_documents_dir = getenv("XDG_DOCUMENTS_DIR");
	+ const char * const xdg_documents_dir = getenv("XDG_DOCUMENTS_DIR");

	if (xdg_documents_dir)
	return xdg_documents_dir;
	@@ -906,13 +918,16 @@ const char *BLI_getDefaultDocumentFolder(void)
	// #define PATH_DEBUG

	static char *blender_version_decimal(const int ver)
	+/* returns a formatted representation of the specified version number. Non-reentrant! */
	{
	static char version_str[5];
	sprintf(version_str, "%d.%02d", ver / 100, ver % 100);
	return version_str;
	}

	-static int test_path(char targetpath, const char path_base, const char path_sep, const char folder_name)
	+static bool test_path(char targetpath, const char path_base, const char path_sep, const char folder_name)
	+/* concatenates path_base, (optional) path_sep and (optional) folder_name into targetpath,
	+returning true iff result points to a directory. */
	{
	char tmppath[FILE_MAX];

	@@ -924,44 +939,57 @@ static int test_path(char targetpath, const char path_base, const char *path_s
	BLI_make_file_string("/", targetpath, tmppath, folder_name);
	else
	BLI_strncpy(targetpath, tmppath, sizeof(tmppath));
	+ /* FIXME: why is "//" on front of tmppath expanded to "/" (by BLI_join_dirfile)
	+ if folder_name is specified but not otherwise? */

	if (BLI_is_dir(targetpath)) {
	#ifdef PATH_DEBUG
	printf("\t%s found: %s\n", __func__, targetpath);
	#endif
	- return 1;
	+ return true;
	}
	else {
	#ifdef PATH_DEBUG
	printf("\t%s missing: %s\n", __func__, targetpath);
	#endif
	//targetpath[0] = '\0';
	- return 0;
	+ return false;
	}
	}

	-static int test_env_path(char path, const char envvar)
	+static bool test_env_path(char path, const char envvar)
	+/* puts the value of the specified environment variable into *path if it exists
	+and points at a directory. Returns true iff this was done. */
	{
	const char *env = envvar ? getenv(envvar) : NULL;
	- if (!env) return 0;
	+ if (!env) return false;

	if (BLI_is_dir(env)) {
	BLI_strncpy(path, env, FILE_MAX);
	#ifdef PATH_DEBUG
	printf("\t%s env %s found: %s\n", __func__, envvar, env);
	#endif
	- return 1;
	+ return true;
	}
	else {
	path[0] = '\0';
	#ifdef PATH_DEBUG
	printf("\t%s env %s missing: %s\n", __func__, envvar, env);
	#endif
	- return 0;
	+ return false;
	}
	}

	-static int get_path_local(char targetpath, const char folder_name, const char *subfolder_name, const int ver)
	+static bool get_path_local
	+ (
	+ char targetpath, / where to return path */
	+ const char folder_name, / optional folder name within version-specific directory */
	+ const char subfolder_name, / optional subfolder name within folder_name */
	+ const int ver /* to construct name of version-specific directory within bprogdir */
	+ )
	+ /* constructs in *targetpath the name of a directory relative to a version-specific
	+ subdirectory in the parent directory of the Blender executable, returning true iff
	+ such a directory exists. */
	{
	char relfolder[FILE_MAX];

	@@ -982,22 +1010,30 @@ static int get_path_local(char targetpath, const char folder_name, const char
	}

	/* try EXECUTABLE_DIR/2.5x/folder_name - new default directory for local blender installed files */
	- if (test_path(targetpath, bprogdir, blender_version_decimal(ver), relfolder))
	- return 1;
	-
	- return 0;
	+ return test_path(targetpath, bprogdir, blender_version_decimal(ver), relfolder);
	}

	-static int is_portable_install(void)
	+static bool is_portable_install(void)
	+/* is this an install with user files kept together with the Blender executable and its
	+ installation files. */
	{
	- /* detect portable install by the existance of config folder */
	+ /* detect portable install by the existence of config folder */
	const int ver = BLENDER_VERSION;
	char path[FILE_MAX];

	return get_path_local(path, "config", NULL, ver);
	}

	-static int get_path_user(char targetpath, const char folder_name, const char subfolder_name, const char envvar, const int ver)
	+static bool get_path_user
	+ (
	+ char targetpath, / area to return path */
	+ const char folder_name, / default name of folder within user area */
	+ const char subfolder_name, / optional name of subfolder within folder */
	+ const char envvar, / name of environment variable which, if defined, overrides folder_name */
	+ const int ver /* Blender version, used to construct a subdirectory name */
	+ )
	+ /* returns the path of a folder within the user-files area. Result is true iff
	+ it was able to construct such a path. */
	{
	char user_path[FILE_MAX];
	const char *user_base_path;
	@@ -1014,7 +1050,7 @@ static int get_path_user(char targetpath, const char folder_name, const char *
	}
	else {
	BLI_strncpy(targetpath, user_path, FILE_MAX);
	- return 1;
	+ return true;
	}
	}

	@@ -1023,30 +1059,33 @@ static int get_path_user(char targetpath, const char folder_name, const char *
	BLI_strncpy(user_path, user_base_path, FILE_MAX);

	if (!user_path[0])
	- return 0;
	+ return false;

	#ifdef PATH_DEBUG
	printf("%s: %s\n", __func__, user_path);
	#endif

	if (subfolder_name) {
	- /* try $HOME/folder_name/subfolder_name */
	return test_path(targetpath, user_path, folder_name, subfolder_name);
	}
	else {
	- /* try $HOME/folder_name */
	return test_path(targetpath, user_path, NULL, folder_name);
	}
	}

	-static int get_path_system(char targetpath, const char folder_name, const char subfolder_name, const char envvar, const int ver)
	+static bool get_path_system
	+ (
	+ char targetpath, / area to return path */
	+ const char folder_name, / default name of folder within installation area */
	+ const char subfolder_name, / optional name of subfolder within folder */
	+ const char envvar, / name of environment variable which, if defined, overrides folder_name */
	+ const int ver /* Blender version, used to construct a subdirectory name */
	+ )
	+ /* returns the path of a folder within the Blender installation area. Result is true iff
	+ it was able to construct such a path. */
	{
	char system_path[FILE_MAX];
	const char *system_base_path;
	-
	-
	- /* first allow developer only overrides to the system path
	- * these are only used when running blender from source */
	char cwd[FILE_MAX];
	char relfolder[FILE_MAX];

	@@ -1062,18 +1101,21 @@ static int get_path_system(char targetpath, const char folder_name, const char
	relfolder[0] = '\0';
	}

	+ /* first allow developer only overrides to the system path
	+ * these are only used when running blender from source */
	+
	/* try CWD/release/folder_name */
	if (BLI_current_working_dir(cwd, sizeof(cwd))) {
	if (test_path(targetpath, cwd, "release", relfolder)) {
	- return 1;
	+ return true;
	}
	}

	/* try EXECUTABLE_DIR/release/folder_name */
	if (test_path(targetpath, bprogdir, "release", relfolder))
	- return 1;
	- /* end developer overrides */
	+ return true;

	+ /* end developer overrides */


	system_path[0] = '\0';
	@@ -1084,7 +1126,7 @@ static int get_path_system(char targetpath, const char folder_name, const char
	}
	else {
	BLI_strncpy(targetpath, system_path, FILE_MAX);
	- return 1;
	+ return true;
	}
	}

	@@ -1093,7 +1135,7 @@ static int get_path_system(char targetpath, const char folder_name, const char
	BLI_strncpy(system_path, system_base_path, FILE_MAX);

	if (!system_path[0])
	- return 0;
	+ return false;

	#ifdef PATH_DEBUG
	printf("%s: %s\n", __func__, system_path);
	@@ -1111,7 +1153,7 @@ static int get_path_system(char targetpath, const char folder_name, const char

	/* get a folder out of the 'folder_id' presets for paths */
	/* returns the path if found, NULL string if not */
	-char BLI_get_folder(int folder_id, const char subfolder)
	+const char BLI_get_folder(int folder_id, const char subfolder)
	{
	const int ver = BLENDER_VERSION;
	static char path[FILE_MAX] = "";
	@@ -1158,7 +1200,8 @@ char BLI_get_folder(int folder_id, const char subfolder)
	return path;
	}

	-char BLI_get_user_folder_notest(int folder_id, const char subfolder)
	+const char BLI_get_user_folder_notest(int folder_id, const char subfolder)
	+/* returns the path to a folder in the user area without checking that it actually exists first. */
	{
	const int ver = BLENDER_VERSION;
	static char path[FILE_MAX] = "";
	@@ -1183,9 +1226,10 @@ char BLI_get_user_folder_notest(int folder_id, const char subfolder)
	return path;
	}

	-char BLI_get_folder_create(int folder_id, const char subfolder)
	+const char BLI_get_folder_create(int folder_id, const char subfolder)
	+/* returns the path to a folder in the user area, creating it if it doesn't exist. */
	{
	- char *path;
	+ const char *path;

	/* only for user folders */
	if (!ELEM4(folder_id, BLENDER_USER_DATAFILES, BLENDER_USER_CONFIG, BLENDER_USER_SCRIPTS, BLENDER_USER_AUTOSAVE))
	@@ -1201,10 +1245,12 @@ char BLI_get_folder_create(int folder_id, const char subfolder)
	return path;
	}

	-char *BLI_get_folder_version(const int id, const int ver, const int do_check)
	+const char *BLI_get_folder_version(const int id, const int ver, const bool do_check)
	+/* returns the path of the top-level version-specific local, user or system directory.
	+If do_check, then the result will be NULL if the directory doesn't exist. */
	{
	static char path[FILE_MAX] = "";
	- int ok;
	+ bool ok;
	switch (id) {
	case BLENDER_RESOURCE_PATH_USER:
	ok = get_path_user(path, NULL, NULL, NULL, ver);
	@@ -1217,11 +1263,11 @@ char *BLI_get_folder_version(const int id, const int ver, const int do_check)
	break;
	default:
	path[0] = '\0'; /* in case do_check is false */
	- ok = FALSE;
	+ ok = false;
	BLI_assert(!"incorrect ID");
	}

	- if ((ok == FALSE) && do_check) {
	+ if (!ok && do_check) {
	return NULL;
	}

	@@ -1239,6 +1285,7 @@ char *BLI_get_folder_version(const int id, const int ver, const int do_check)
	#endif

	void BLI_setenv(const char env, const char val)
	+/* sets the specified environment variable to the specified value. */
	{
	/* free windows */
	#if (defined(WIN32) \|\| defined(WIN64)) && defined(FREE_WINDOWS)
	@@ -1265,6 +1312,7 @@ void BLI_setenv(const char env, const char val)
	* Like Unix setenv(env, val, 0);
	*/
	void BLI_setenv_if_new(const char env, const char val)
	+/* not used anywhere. */
	{
	if (getenv(env) == NULL)
	BLI_setenv(env, val);
	@@ -1272,6 +1320,7 @@ void BLI_setenv_if_new(const char env, const char val)


	void BLI_clean(char *path)
	+/* changes to the path separators to the native ones for this OS. */
	{
	#ifdef WIN32
	if (path && BLI_strnlen(path, 3) > 2) {
	@@ -1283,6 +1332,7 @@ void BLI_clean(char *path)
	}

	void BLI_char_switch(char *string, char from, char to)
	+/* replaces occurrences of from with to in string. /
	{
	while (*string != 0) {
	if (string == from) string = to;
	@@ -1291,6 +1341,8 @@ void BLI_char_switch(char *string, char from, char to)
	}

	void BLI_make_exist(char *dir)
	+/* strips off nonexistent subdirectories from the end of *dir, leaving the path of
	+the lowest-level directory that does exist. */
	{
	int a;

	@@ -1298,7 +1350,7 @@ void BLI_make_exist(char *dir)

	a = strlen(dir);

	- while (BLI_is_dir(dir) == 0) {
	+ while (!BLI_is_dir(dir)) {
	a--;
	while (dir[a] != SEP) {
	a--;
	@@ -1319,10 +1371,11 @@ void BLI_make_exist(char *dir)
	}

	void BLI_make_existing_file(const char *name)
	+/* ensures that the parent directory of name exists. /
	{
	char di[FILE_MAX], fi[FILE_MAXFILE];
	-
	BLI_strncpy(di, name, sizeof(di));
	+ /* FIXME: use BLI_split_dir_part instead and get rid of fi. */
	BLI_splitdirstring(di, fi);

	/* test exist */
	@@ -1332,7 +1385,17 @@ void BLI_make_existing_file(const char *name)
	}


	-void BLI_make_file_string(const char relabase, char string, const char dir, const char file)
	+void BLI_make_file_string
	+ (
	+ const char relabase, / optional prefix to substitute for "//" on front of dir /
	+ char string, / area to return result */
	+ const char *dir,
	+ const char *file
	+ )
	+ /* returns in string the concatenation of dir and file (also with relabase on the
	+ front if specified and *dir begins with "//"). Normalizes all occurrences of path
	+ separators, including ensuring there is exactly one between the copies of dir and file,
	+ and between the copies of relabase and dir. */
	{
	int sl;

	@@ -1443,6 +1506,7 @@ bool BLI_testextensie_array(const char str, const char *ext_array)
	/* semicolon separated wildcards, eg:
	* '.zip;.py;.exe' /
	bool BLI_testextensie_glob(const char str, const char ext_fnmatch)
	+/* does str match any of the semicolon-separated glob patterns in fnmatch. */
	{
	const char *ext_step = ext_fnmatch;
	char pattern[16];
	@@ -1470,10 +1534,12 @@ bool BLI_testextensie_glob(const char str, const char ext_fnmatch)
	}


	-int BLI_replace_extension(char path, size_t maxlen, const char ext)
	+bool BLI_replace_extension(char path, size_t maxlen, const char ext)
	+/* removes any existing extension on the end of path and appends ext. Returns false
	+iff there was no room. */
	{
	- size_t path_len = strlen(path);
	- size_t ext_len = strlen(ext);
	+ const size_t path_len = strlen(path);
	+ const size_t ext_len = strlen(ext);
	ssize_t a;

	for (a = path_len - 1; a >= 0; a--) {
	@@ -1487,24 +1553,24 @@ int BLI_replace_extension(char path, size_t maxlen, const char ext)
	}

	if (a + ext_len >= maxlen)
	- return 0;
	+ return false;

	memcpy(path + a, ext, ext_len + 1);
	- return 1;
	+ return true;
	}

	/* strip's trailing '.'s and adds the extension only when needed */
	-int BLI_ensure_extension(char path, size_t maxlen, const char ext)
	+bool BLI_ensure_extension(char path, size_t maxlen, const char ext)
	{
	- size_t path_len = strlen(path);
	- size_t ext_len = strlen(ext);
	+ const size_t path_len = strlen(path);
	+ const size_t ext_len = strlen(ext);
	ssize_t a;

	- /* first check the extension is alread there */
	+ /* first check the extension is already there */
	if ( (ext_len <= path_len) &&
	(strcmp(path + (path_len - ext_len), ext) == 0))
	{
	- return 1;
	+ return true;
	}

	for (a = path_len - 1; a >= 0; a--) {
	@@ -1518,10 +1584,10 @@ int BLI_ensure_extension(char path, size_t maxlen, const char ext)
	a++;

	if (a + ext_len >= maxlen)
	- return 0;
	+ return false;

	memcpy(path + a, ext, ext_len + 1);
	- return 1;
	+ return true;
	}

	/* Converts "/foo/bar.txt" to "/foo/" and "bar.txt"
	@@ -1533,7 +1599,7 @@ int BLI_ensure_extension(char path, size_t maxlen, const char ext)
	void BLI_split_dirfile(const char string, char dir, char *file, const size_t dirlen, const size_t filelen)
	{
	const char *lslash_str = BLI_last_slash(string);
	- size_t lslash = lslash_str ? (size_t)(lslash_str - string) + 1 : 0;
	+ const size_t lslash = lslash_str ? (size_t)(lslash_str - string) + 1 : 0;

	if (dir) {
	if (lslash) {
	@@ -1550,17 +1616,20 @@ void BLI_split_dirfile(const char string, char dir, char *file, const size_t d
	}

	void BLI_split_dir_part(const char string, char dir, const size_t dirlen)
	+/* copies the parent directory part of string into dir, max length dirlen. /
	{
	BLI_split_dirfile(string, dir, NULL, dirlen, 0);
	}

	void BLI_split_file_part(const char string, char file, const size_t filelen)
	+/* copies the leaf filename part of string into file, max length filelen. /
	{
	BLI_split_dirfile(string, NULL, file, 0, filelen);
	}

	-/* simple appending of filename to dir, does not check for valid path! */
	void BLI_join_dirfile(char dst, const size_t maxlen, const char dir, const char *file)
	+/* simple appending of filename to dir, does not check for valid path!
	+Puts result into dst, which may be same area as dir. */
	{
	size_t dirlen = BLI_strnlen(dir, maxlen);

	@@ -1598,6 +1667,8 @@ void BLI_join_dirfile(char dst, const size_t maxlen, const char dir, const cha

	/* like pythons os.path.basename( ) */
	const char BLI_path_basename(const char path)
	+/* returns pointer into *path area immediately after last slash, or start
	+of path if none found. /
	{
	const char *const filename = BLI_last_slash(path);
	return filename ? filename + 1 : path;
	@@ -1638,11 +1709,25 @@ const char BLI_path_basename(const char path)
	* this function returns wrong results!
	* XXX: test on empty base_dir and return an error ?
	*/
	-int BLI_rebase_path(char abs, size_t abs_len, char rel, size_t rel_len, const char base_dir, const char src_dir, const char *dest_dir)
	+int BLI_rebase_path
	+ (
	+ char abs, / optional area to return new full path */
	+ size_t abs_len, /* size of abs area /
	+ char *rel,
	+ /* optional area to return new path relative to parent directory of .blend file
	+ (only meaningful if item is in a subdirectory thereof) */
	+ size_t rel_len, /* size of rel area /
	+ const char base_dir, / path of .blend file */
	+ const char *src_dir,
	+ /* original path of item (any initial "//" will be expanded to
	+ parent directory of .blend file) */
	+ const char dest_dir / new directory into which item will be moved */
	+ )
	+ /* not actually used anywhere! */
	{
	- char path[FILE_MAX];
	- char dir[FILE_MAX];
	- char base[FILE_MAX];
	+ char path[FILE_MAX]; /* original full path of item */
	+ char dir[FILE_MAX]; /* directory part of src_dir */
	+ char base[FILE_MAX]; /* basename part of src_dir */
	char blend_dir[FILE_MAX]; /* directory, where current .blend file resides */
	char dest_path[FILE_MAX];
	char rel_dir[FILE_MAX];
	@@ -1674,21 +1759,23 @@ int BLI_rebase_path(char abs, size_t abs_len, char rel, size_t rel_len, const
	/* if image is "below" current .blend file directory */
	if (!BLI_path_ncmp(path, blend_dir, len)) {

	- /* if image is _in_ current .blend file directory */
	if (BLI_path_cmp(dir, blend_dir) == 0) {
	+ /* image is directly in .blend file parent directory => put directly in dest_dir */
	BLI_join_dirfile(dest_path, sizeof(dest_path), dest_dir, base);
	}
	- /* "below" */
	else {
	+ /* "below" (in subdirectory of .blend file parent directory) => put in same relative directory structure in dest_dir */
	/* rel = image_path_dir - blend_dir */
	BLI_strncpy(rel_dir, dir + len, sizeof(rel_dir));
	-
	+ /* subdirectories relative to blend_dir */
	BLI_join_dirfile(dest_path, sizeof(dest_path), dest_dir, rel_dir);
	+ /* same subdirectories relative to dest_dir */
	BLI_join_dirfile(dest_path, sizeof(dest_path), dest_path, base);
	+ /* keeping original item basename */
	}

	}
	- /* image is out of current directory */
	+ /* image is out of current directory--just put straight in dest_dir */
	else {
	BLI_join_dirfile(dest_path, sizeof(dest_path), dest_dir, base);
	}
	@@ -1698,7 +1785,7 @@ int BLI_rebase_path(char abs, size_t abs_len, char rel, size_t rel_len, const

	if (rel) {
	strncat(rel, rel_dir, rel_len);
	- strncat(rel, base, rel_len);
	+ strncat(rel, base, rel_len); /* FIXME: could overflow rel area! */
	}

	/* return 2 if (src == dest) */
	@@ -1765,6 +1852,9 @@ void BLI_del_slash(char *string)
	}

	static int add_win32_extension(char *name)
	+/* tries appending each of the semicolon-separated extensions in the PATHEXT
	+environment variable (Windows-only) onto *name in turn until such a file is found.
	+Returns success/failure. */
	{
	int retval = 0;
	int type;
	@@ -1981,16 +2071,20 @@ static void BLI_where_is_temp(char fullname, const size_t maxlen, char userdir
	}

	void BLI_init_temporary_dir(char *userdir)
	+/* sets btempdir to userdir if specified and is a valid directory, otherwise
	+chooses a suitable OS-specific temporary directory. */
	{
	BLI_where_is_temp(btempdir, FILE_MAX, userdir);
	}

	const char *BLI_temporary_dir(void)
	+/* returns the path to the temporary directory. */
	{
	return btempdir;
	}

	void BLI_system_temporary_dir(char *dir)
	+/* puts in dir path to OS-specific temporary directory. /
	{
	BLI_where_is_temp(dir, FILE_MAX, NULL);
	}
	@@ -1998,6 +2092,9 @@ void BLI_system_temporary_dir(char *dir)
	#ifdef WITH_ICONV

	void BLI_string_to_utf8(char original, char utf_8, const char *code)
	+/* converts a string encoded in the charset named by *code to UTF-8.
	+Opens a new iconv context each time it is run, which is probably not the
	+most efficient. */
	{
	size_t inbytesleft = strlen(original);
	size_t outbytesleft = 512;
	@@ -2017,6 +2114,7 @@ void BLI_string_to_utf8(char original, char utf_8, const char *code)
	rv = iconv(cd, &original, &inbytesleft, &utf_8, &outbytesleft);
	if (rv == (size_t) -1) {
	printf("iconv Error\n");
	+ iconv_close(cd);
	return;
	}
	*utf_8 = '\0';
	diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c
	index 1358fdd..f87d8c7 100644
	--- a/source/blender/blenlib/intern/storage.c
	+++ b/source/blender/blenlib/intern/storage.c
	@@ -93,13 +93,12 @@

	/* vars: */
	static int totnum, actnum;
	-static struct direntry *files;
	-
	-static struct ListBase dirbase_ = {NULL, NULL};
	-static struct ListBase *dirbase = &dirbase_;
	+static struct direntry files; / array[totnum] */

	/* can return NULL when the size is not big enough */
	char BLI_current_working_dir(char dir, const size_t maxncpy)
	+/* copies the current working directory into *dir (max size maxncpy), and
	+ returns a pointer to same. */
	{
	const char *pwd = getenv("PWD");
	if (pwd) {
	@@ -112,24 +111,30 @@ char BLI_current_working_dir(char dir, const size_t maxncpy)


	static int bli_compare(struct direntry entry1, struct direntry entry2)
	+/* ordering function for sorting lists of files/directories. Returns -1 if
	+entry1 belongs before entry2, 0 if they are equal, 1 if they should be swapped. */
	{
	/* type is equal to stat.st_mode */

	+ /* directories come before non-directories */
	if (S_ISDIR(entry1->type)) {
	- if (S_ISDIR(entry2->type) == 0) return (-1);
	+ if (!S_ISDIR(entry2->type)) return (-1);
	}
	else {
	if (S_ISDIR(entry2->type)) return (1);
	}
	+ /* non-regular files come after regular files */
	if (S_ISREG(entry1->type)) {
	- if (S_ISREG(entry2->type) == 0) return (-1);
	+ if (!S_ISREG(entry2->type)) return (-1);
	}
	else {
	if (S_ISREG(entry2->type)) return (1);
	}
	+ /* arbitrary, but consistent, ordering of different types of non-regular files */
	if ((entry1->type & S_IFMT) < (entry2->type & S_IFMT)) return (-1);
	if ((entry1->type & S_IFMT) > (entry2->type & S_IFMT)) return (1);
	-
	+
	+ /* OK, now we know their S_IFMT fields are the same, go on to a name comparison */
	/* make sure "." and ".." are always first */
	if (strcmp(entry1->relname, ".") == 0) return (-1);
	if (strcmp(entry2->relname, ".") == 0) return (1);
	@@ -141,6 +146,8 @@ static int bli_compare(struct direntry entry1, struct direntry entry2)


	double BLI_dir_free_space(const char *dir)
	+/* returns the number of free bytes on the volume containing the specified pathname. */
	+/* Not actually used anywhere. */
	{
	#ifdef WIN32
	DWORD sectorspc, bytesps, freec, clusters;
	@@ -198,9 +205,11 @@ double BLI_dir_free_space(const char *dir)
	}

	static void bli_builddir(const char dirname, const char relname)
	+/* scans the directory named *dirname and appends entries for its contents to files.
	+ Recorded pathnames will be prefixed by *relname if specified (FIXME: actually this
	+ option is not used anywhere, might as well get rid of it). */
	{
	- struct dirent *fname;
	- struct dirlink *dlink;
	+ struct ListBase dirbase = {NULL, NULL};
	int rellen, newnum = 0;
	char buf[256];
	DIR *dir;
	@@ -212,6 +221,9 @@ static void bli_builddir(const char dirname, const char relname)
	buf[rellen] = '/';
	rellen++;
	}
	+ /* FIXME: any reason why we can't opendir dirname directly, instead of making it
	+ the current directory first? That would simplify calls to this routine (currently
	+ having to save/restore the current directory) a lot. */
	#ifndef WIN32
	if (chdir(dirname) == -1) {
	perror(dirname);
	@@ -227,13 +239,14 @@ static void bli_builddir(const char dirname, const char relname)
	UTF16_UN_ENCODE(dirname);

	#endif
	- if ((dir = (DIR *)opendir("."))) {
	- while ((fname = (struct dirent *) readdir(dir)) != NULL) {
	- dlink = (struct dirlink *)malloc(sizeof(struct dirlink));
	- if (dlink) {
	+ if ((dir = opendir(".")) != NULL) {
	+ const struct dirent *fname;
	+ while ((fname = readdir(dir)) != NULL) {
	+ struct dirlink * const dlink = (struct dirlink *)malloc(sizeof(struct dirlink));
	+ if (dlink != NULL) {
	BLI_strncpy(buf + rellen, fname->d_name, sizeof(buf) - rellen);
	dlink->name = BLI_strdup(buf);
	- BLI_addhead(dirbase, dlink);
	+ BLI_addhead(&dirbase, dlink);
	newnum++;
	}
	}
	@@ -241,7 +254,7 @@ static void bli_builddir(const char dirname, const char relname)
	if (newnum) {

	if (files) {
	- void tmp = realloc(files, (totnum + newnum) sizeof(struct direntry));
	+ void * const tmp = realloc(files, (totnum + newnum) * sizeof(struct direntry));
	if (tmp) {
	files = (struct direntry *)tmp;
	}
	@@ -255,7 +268,7 @@ static void bli_builddir(const char dirname, const char relname)
	files = (struct direntry )malloc(newnum sizeof(struct direntry));

	if (files) {
	- dlink = (struct dirlink *) dirbase->first;
	+ struct dirlink * dlink = (struct dirlink *) dirbase.first;
	while (dlink) {
	memset(&files[actnum], 0, sizeof(struct direntry));
	files[actnum].relname = dlink->name;
	@@ -278,6 +291,8 @@ static void bli_builddir(const char dirname, const char relname)
	#endif
	files[actnum].type = files[actnum].s.st_mode;
	files[actnum].flags = 0;
	+ /* FIXME: this is the only place where totnum and actnum are incremented,
	+ so they will always be equal, might as well get rid of one */
	totnum++;
	actnum++;
	dlink = dlink->next;
	@@ -288,7 +303,7 @@ static void bli_builddir(const char dirname, const char relname)
	exit(1);
	}

	- BLI_freelist(dirbase);
	+ BLI_freelist(&dirbase);
	if (files) qsort(files, actnum, sizeof(struct direntry), (int ()(const void , const void *))bli_compare);
	}
	else {
	@@ -303,11 +318,14 @@ static void bli_builddir(const char dirname, const char relname)
	}

	static void bli_adddirstrings(void)
	+/* fills in the "mode[123]", "size" and "string" fields in the elements of the files
	+array with descriptive details about each item. "string" will have a format similar to "ls -l". */
	{
	char datum[100];
	char buf[512];
	char size[250];
	static const char *types[8] = {"---", "--x", "-w-", "-wx", "r--", "r-x", "rw-", "rwx"};
	+ /* symbolic display, indexed by mode field value */
	int num, mode;
	#ifdef WIN32
	__int64 st_size;
	@@ -375,6 +393,9 @@ static void bli_adddirstrings(void)
	*/
	st_size = file->s.st_size;

	+ /* FIXME: Either change decimal prefixes to binary ones
	+ <http://en.wikipedia.org/wiki/Binary_prefix>, or change
	+ divisor factors from 1024 to 1000. */
	if (st_size > 1024 * 1024 * 1024) {
	BLI_snprintf(file->size, sizeof(file->size), "%.2f GB", ((double)st_size) / (1024 * 1024 * 1024));
	}
	@@ -413,10 +434,13 @@ static void bli_adddirstrings(void)
	file->date, file->time, size, file->relname);

	file->string = BLI_strdup(buf);
	+ /* FIXME: not actually used anywhere, why bother to set it up? */
	}
	}

	unsigned int BLI_dir_contents(const char dirname, struct direntry *filelist)
	+/* scans the contents of the directory named *dirname, and allocates and fills in an
	+array of entries describing them in filelist. The length of the array is the function result. /
	{
	/* reset global variables
	* memory stored in files is free()'d in
	@@ -442,16 +466,19 @@ unsigned int BLI_dir_contents(const char dirname, struct direntry *filelist)


	size_t BLI_file_descriptor_size(int file)
	+/* returns the file size of an opened file descriptor. */
	{
	struct stat buf;

	- if (file <= 0) return (-1);
	+ if (file < 0) return (-1);
	fstat(file, &buf); /* CHANGE */
	return (buf.st_size);
	}

	size_t BLI_file_size(const char *path)
	+/* returns the size of a file. */
	{
	+ /* FIXME: opening and closing the file is inefficient. Why not use stat(2) instead? */
	int size, file = BLI_open(path, O_BINARY \| O_RDONLY, 0);

	if (file == -1)
	@@ -464,6 +491,8 @@ size_t BLI_file_size(const char *path)


	int BLI_exists(const char *name)
	+/* returns the st_mode from statting the specified path name, or 0 if it couldn't be statted
	+(most likely doesn't exist or no access). */
	{
	#if defined(WIN32)
	#ifndef __MINGW32__
	@@ -510,18 +539,21 @@ int BLI_stat(const char path, struct stat buffer)
	#endif

	/* would be better in fileops.c except that it needs stat.h so add here */
	-int BLI_is_dir(const char *file)
	+bool BLI_is_dir(const char *file)
	+/* does the specified path point to a directory. */
	{
	return S_ISDIR(BLI_exists(file));
	}

	-int BLI_is_file(const char *path)
	+bool BLI_is_file(const char *path)
	+/* does the specified path point to a non-directory. */
	{
	- int mode = BLI_exists(path);
	+ const int mode = BLI_exists(path);
	return (mode && !S_ISDIR(mode));
	}

	LinkNode BLI_file_read_as_lines(const char name)
	+/* reads the contents of a text file and returns the lines in a linked list. */
	{
	FILE *fp = BLI_fopen(name, "r");
	LinkNode *lines = NULL;
	@@ -549,6 +581,9 @@ LinkNode BLI_file_read_as_lines(const char name)
	char *line = BLI_strdupn(&buf[last], i - last);

	BLI_linklist_prepend(&lines, line);
	+ /* faster to build singly-linked list in reverse order */
	+ /* alternatively, could process buffer in reverse order so
	+ list ends up right way round to start with */
	last = i + 1;
	}
	}
	@@ -558,17 +593,18 @@ LinkNode BLI_file_read_as_lines(const char name)

	fclose(fp);

	- BLI_linklist_reverse(&lines);
	+ BLI_linklist_reverse(&lines); /* get them the right way round */
	return lines;
	}

	void BLI_file_free_lines(LinkNode *lines)
	+/* frees memory from a previous call to BLI_file_read_as_lines. */
	{
	BLI_linklist_free(lines, (void ()(void ))MEM_freeN);
	}

	/** is file1 older then file2 */
	-int BLI_file_older(const char file1, const char file2)
	+bool BLI_file_older(const char file1, const char file2)
	{
	#ifdef WIN32
	struct _stat st1, st2;
	@@ -576,16 +612,16 @@ int BLI_file_older(const char file1, const char file2)
	UTF16_ENCODE(file1);
	UTF16_ENCODE(file2);

	- if (_wstat(file1_16, &st1)) return 0;
	- if (_wstat(file2_16, &st2)) return 0;
	+ if (_wstat(file1_16, &st1)) return false;
	+ if (_wstat(file2_16, &st2)) return false;

	UTF16_UN_ENCODE(file2);
	UTF16_UN_ENCODE(file1);
	#else
	struct stat st1, st2;

	- if (stat(file1, &st1)) return 0;
	- if (stat(file2, &st2)) return 0;
	+ if (stat(file1, &st1)) return false;
	+ if (stat(file2, &st2)) return false;
	#endif
	return (st1.st_mtime < st2.st_mtime);
	}
	diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
	index dfc80e4..1d68f65 100644
	--- a/source/blender/editors/render/render_preview.c
	+++ b/source/blender/editors/render/render_preview.c
	@@ -110,7 +110,7 @@ ImBuf get_brush_icon(Brush brush)
	static const int flags = IB_rect \| IB_multilayer \| IB_metadata;

	char path[FILE_MAX];
	- char *folder;
	+ const char *folder;

	if (!(brush->icon_imbuf)) {
	if (brush->flag & BRUSH_CUSTOM_ICON) {
	diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c
	index 3c6f635..55d0f49 100644
	--- a/source/blender/editors/space_file/filesel.c
	+++ b/source/blender/editors/space_file/filesel.c
	@@ -583,7 +583,7 @@ void file_change_dir(bContext *C, int checkdir)

	ED_fileselect_clear(C, sfile);

	- if (checkdir && BLI_is_dir(sfile->params->dir) == 0) {
	+ if (checkdir && !BLI_is_dir(sfile->params->dir)) {
	BLI_strncpy(sfile->params->dir, filelist_dir(sfile->files), sizeof(sfile->params->dir));
	/* could return but just refresh the current dir */
	}
	diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c
	index 0a4b922..3d63699 100644
	--- a/source/blender/editors/space_file/space_file.c
	+++ b/source/blender/editors/space_file/space_file.c
	@@ -629,7 +629,7 @@ void ED_spacetype_file(void)

	void ED_file_init(void)
	{
	- char *cfgdir = BLI_get_folder(BLENDER_USER_CONFIG, NULL);
	+ const char * const cfgdir = BLI_get_folder(BLENDER_USER_CONFIG, NULL);

	fsmenu_read_system(fsmenu_get(), TRUE);

	diff --git a/source/blender/imbuf/intern/bmp.c b/source/blender/imbuf/intern/bmp.c
	index 3273366..f19714d 100644
	--- a/source/blender/imbuf/intern/bmp.c
	+++ b/source/blender/imbuf/intern/bmp.c
	@@ -29,6 +29,7 @@
	* \ingroup imbuf
	*/

	+#include "BLI_utildefines.h"
	#include "BLI_fileops.h"

	#include "imbuf.h"
	diff --git a/source/blender/imbuf/intern/iris.c b/source/blender/imbuf/intern/iris.c
	index dec5f6f..c881b8a 100644
	--- a/source/blender/imbuf/intern/iris.c
	+++ b/source/blender/imbuf/intern/iris.c
	@@ -32,6 +32,7 @@

	#include <string.h>

	+#include "BLI_utildefines.h"
	#include "BLI_fileops.h"

	#include "MEM_guardedalloc.h"
	diff --git a/source/blender/imbuf/intern/jpeg.c b/source/blender/imbuf/intern/jpeg.c
	index 6a5b534..05495b9 100644
	--- a/source/blender/imbuf/intern/jpeg.c
	+++ b/source/blender/imbuf/intern/jpeg.c
	@@ -37,6 +37,7 @@

	#include "MEM_guardedalloc.h"

	+#include "BLI_utildefines.h"
	#include "BLI_string.h"
	#include "BLI_fileops.h"

	diff --git a/source/blender/imbuf/intern/png.c b/source/blender/imbuf/intern/png.c
	index cc73f68..440f852 100644
	--- a/source/blender/imbuf/intern/png.c
	+++ b/source/blender/imbuf/intern/png.c
	@@ -33,6 +33,7 @@

	#include "png.h"

	+#include "BLI_utildefines.h"
	#include "BLI_fileops.h"

	#include "BLI_math.h"
	diff --git a/source/blender/imbuf/intern/radiance_hdr.c b/source/blender/imbuf/intern/radiance_hdr.c
	index d09adeb..f4ea4e7 100644
	--- a/source/blender/imbuf/intern/radiance_hdr.c
	+++ b/source/blender/imbuf/intern/radiance_hdr.c
	@@ -43,6 +43,7 @@

	#include "MEM_guardedalloc.h"

	+#include "BLI_utildefines.h"
	#include "BLI_fileops.h"

	#include "imbuf.h"
	diff --git a/source/blender/imbuf/intern/targa.c b/source/blender/imbuf/intern/targa.c
	index eaad77f..156cff2 100644
	--- a/source/blender/imbuf/intern/targa.c
	+++ b/source/blender/imbuf/intern/targa.c
	@@ -34,6 +34,7 @@
	# include <io.h>
	#endif

	+#include "BLI_utildefines.h"
	#include "BLI_fileops.h"

	#include "MEM_guardedalloc.h"
	diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c
	index 71f85af..be04ee7 100644
	--- a/source/blender/python/intern/bpy.c
	+++ b/source/blender/python/intern/bpy.c
	@@ -74,7 +74,7 @@ static PyObject bpy_script_paths(PyObject UNUSED(self))
	{
	PyObject *ret = PyTuple_New(2);
	PyObject *item;
	- char *path;
	+ const char *path;

	path = BLI_get_folder(BLENDER_SYSTEM_SCRIPTS, NULL);
	item = PyUnicode_DecodeFSDefault(path ? path : "");
	@@ -147,7 +147,7 @@ static PyObject bpy_user_resource(PyObject UNUSED(self), PyObject *args, PyObj
	int folder_id;
	static const char *kwlist[] = {"type", "subdir", NULL};

	- char *path;
	+ const char *path;

	if (!PyArg_ParseTupleAndKeywords(args, kw, "s\|s:user_resource", (char **)kwlist, &type, &subdir))
	return NULL;
	@@ -191,7 +191,7 @@ static PyObject bpy_resource_path(PyObject UNUSED(self), PyObject *args, PyObj
	int major = BLENDER_VERSION / 100, minor = BLENDER_VERSION % 100;
	static const char *kwlist[] = {"type", "major", "minor", NULL};
	int folder_id;
	- char *path;
	+ const char *path;

	if (!PyArg_ParseTupleAndKeywords(args, kw, "s\|ii:resource_path", (char **)kwlist, &type, &major, &minor))
	return NULL;
	@@ -245,7 +245,7 @@ void BPy_init_modules(void)
	PyObject *mod;

	/* Needs to be first since this dir is needed for future modules */
	- char *modpath = BLI_get_folder(BLENDER_SYSTEM_SCRIPTS, "modules");
	+ const char * const modpath = BLI_get_folder(BLENDER_SYSTEM_SCRIPTS, "modules");
	if (modpath) {
	// printf("bpy: found module path '%s'.\n", modpath);
	PyObject sys_path = PySys_GetObject("path"); / borrow */
	diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c
	index c779b01..ec926c3 100644
	--- a/source/blender/render/intern/source/render_result.c
	+++ b/source/blender/render/intern/source/render_result.c
	@@ -35,13 +35,13 @@

	#include "MEM_guardedalloc.h"

	+#include "BLI_utildefines.h"
	#include "BLI_fileops.h"
	#include "BLI_listbase.h"
	#include "BLI_path_util.h"
	#include "BLI_rect.h"
	#include "BLI_string.h"
	#include "BLI_threads.h"
	-#include "BLI_utildefines.h"

	#include "BKE_image.h"
	#include "BKE_global.h"
	diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
	index 45cc48c..699bbf5 100644
	--- a/source/blender/windowmanager/intern/wm_files.c
	+++ b/source/blender/windowmanager/intern/wm_files.c
	@@ -502,7 +502,7 @@ int wm_homefile_read(bContext C, ReportList UNUSED(reports), short from_memory

	G.relbase_valid = 0;
	if (!from_memory) {
	- char *cfgdir = BLI_get_folder(BLENDER_USER_CONFIG, NULL);
	+ const char * const cfgdir = BLI_get_folder(BLENDER_USER_CONFIG, NULL);
	if (cfgdir) {
	BLI_make_file_string(G.main->name, startstr, cfgdir, BLENDER_STARTUP_FILE);
	BLI_make_file_string(G.main->name, prefstr, cfgdir, BLENDER_USERPREF_FILE);
	@@ -614,7 +614,7 @@ void wm_read_history(void)
	struct RecentFile *recent;
	char *line;
	int num;
	- char *cfgdir = BLI_get_folder(BLENDER_USER_CONFIG, NULL);
	+ const char * const cfgdir = BLI_get_folder(BLENDER_USER_CONFIG, NULL);

	if (!cfgdir) return;

	@@ -643,7 +643,7 @@ static void write_history(void)
	{
	struct RecentFile recent, next_recent;
	char name[FILE_MAX];
	- char *user_config_dir;
	+ const char *user_config_dir;
	FILE *fp;
	int i;

	diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
	index 901e164..ecf9641 100644
	--- a/source/blender/windowmanager/intern/wm_operators.c
	+++ b/source/blender/windowmanager/intern/wm_operators.c
	@@ -1587,14 +1587,14 @@ static void wm_block_splash_refreshmenu(bContext UNUSED(C), void UNUSED(arg_bl
	static int wm_resource_check_prev(void)
	{

	- char *res = BLI_get_folder_version(BLENDER_RESOURCE_PATH_USER, BLENDER_VERSION, TRUE);
	+ const char *res = BLI_get_folder_version(BLENDER_RESOURCE_PATH_USER, BLENDER_VERSION, true);

	// if (res) printf("USER: %s\n", res);

	#if 0 /* ignore the local folder */
	if (res == NULL) {
	/* with a local dir, copying old files isn't useful since local dir get priority for config */
	- res = BLI_get_folder_version(BLENDER_RESOURCE_PATH_LOCAL, BLENDER_VERSION, TRUE);
	+ res = BLI_get_folder_version(BLENDER_RESOURCE_PATH_LOCAL, BLENDER_VERSION, true);
	}
	#endif

	@@ -1603,7 +1603,7 @@ static int wm_resource_check_prev(void)
	return FALSE;
	}
	else {
	- return (BLI_get_folder_version(BLENDER_RESOURCE_PATH_USER, BLENDER_VERSION - 1, TRUE) != NULL);
	+ return (BLI_get_folder_version(BLENDER_RESOURCE_PATH_USER, BLENDER_VERSION - 1, true) != NULL);
	}
	}

	@@ -2390,7 +2390,7 @@ static int blend_save_check(bContext UNUSED(C), wmOperator op)
	RNA_string_get(op->ptr, "filepath", filepath);
	if (!BLO_has_bfile_extension(filepath)) {
	/* some users would prefer BLI_replace_extension(),
	- * we keep getting knit-picking bug reports about this - campbell */
	+ * we keep getting nit-picking bug reports about this - campbell */
	BLI_ensure_extension(filepath, FILE_MAX, ".blend");
	RNA_string_set(op->ptr, "filepath", filepath);
	return TRUE;
	diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c
	index fd44f4a..1f0c1ce 100644
	--- a/source/blender/windowmanager/intern/wm_playanim.c
	+++ b/source/blender/windowmanager/intern/wm_playanim.c
	@@ -49,12 +49,12 @@

	#include "PIL_time.h"

	+#include "BLI_utildefines.h"
	#include "BLI_fileops.h"
	#include "BLI_listbase.h"
	#include "BLI_path_util.h"
	#include "BLI_rect.h"
	#include "BLI_string.h"
	-#include "BLI_utildefines.h"

	#include "IMB_imbuf_types.h"
	#include "IMB_imbuf.h"
	diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
	index a54d490..2271521 100644
	--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
	+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
	@@ -1888,7 +1888,7 @@ PyObject *initGamePlayerPythonScripting(const STR_String& progname, TPythonSecur
	* somehow it remembers the sys.path - Campbell
	*/
	static bool first_time = true;
	- char *py_path_bundle = BLI_get_folder(BLENDER_SYSTEM_PYTHON, NULL);
	+ const char * const py_path_bundle = BLI_get_folder(BLENDER_SYSTEM_PYTHON, NULL);

	#if 0 // TODO - py3
	STR_String pname = progname;

File Metadata

Mime Type: text/x-diff
Storage Engine: local-disk
Storage Format: Raw Data
Storage Handle: e2/be/a82bcd08db8bdaebe4984f9a0778

path_util_storage.pathPublicActions

path_util_storage.pathView Options

File Metadata

Event Timeline

path_util_storage.path
Public
Actions

path_util_storage.path
View Options