Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-02-15 02:33:16 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-02-15 02:40:41 +0300
commit1c883fe6468c9fd3859d24e63590d4011984d52e (patch)
tree1fe62d7d09a854c0d92e44b2c685b04db3ff876a /source/blender/blenlib/intern/path_util.c
parent68a52a7fa9327d48f52deddd8c81cc35f4192fe0 (diff)
Cleanup: make BLI_make_exist local to the file selector
This isn't a general utility, and the name wasn't descriptive.
Diffstat (limited to 'source/blender/blenlib/intern/path_util.c')
-rw-r--r--source/blender/blenlib/intern/path_util.c38
1 files changed, 15 insertions, 23 deletions
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
index dff1f77c1ab..f8e703dbb56 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -729,6 +729,21 @@ bool BLI_parent_dir(char *path)
}
/**
+ * Strips off nonexistent (or non-accessible) subdirectories from the end of *dir,
+ * leaving the path of the lowest-level directory that does exist and we can read.
+ */
+bool BLI_parent_dir_until_exists(char *dir)
+{
+ bool valid_path = true;
+
+ /* Loop as long as cur path is not a dir, and we can get a parent path. */
+ while ((BLI_access(dir, R_OK) != 0) && (valid_path = BLI_parent_dir(dir))) {
+ /* pass */
+ }
+ return (valid_path && dir[0]);
+}
+
+/**
* Looks for a sequence of "#" characters in the last slash-separated component of *path,
* returning the indexes of the first and one past the last character in the sequence in
* *char_start and *char_end respectively. Returns true if such a sequence was found.
@@ -1313,29 +1328,6 @@ const char *BLI_getenv(const char *env)
}
/**
- * Strips off nonexistent (or non-accessible) subdirectories from the end of *dir,
- * leaving the path of the lowest-level directory that does exist and we can read.
- */
-void BLI_make_exist(char *dir)
-{
- bool valid_path = true;
-
- /* Loop as long as cur path is not a dir, and we can get a parent path. */
- while ((BLI_access(dir, R_OK) != 0) && (valid_path = BLI_parent_dir(dir))) {
- /* pass */
- }
-
- /* If we could not find an existing dir, use default root... */
- if (!valid_path || !dir[0]) {
-#ifdef WIN32
- get_default_root(dir);
-#else
- strcpy(dir, "/");
-#endif
- }
-}
-
-/**
* Ensures that the parent directory of *name exists.
*
* \return true on success (i.e. given path now exists on FS), false otherwise.