diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-10-08 07:05:58 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-10-08 07:05:58 +0300 |
| commit | a5e631171bdcdb12f508528f391d3916014e23e8 (patch) | |
| tree | 79cc6bb9d4d0c1425ac53d12496ebcba96c5ec21 /source/blender/blenkernel | |
| parent | e47177e301d104a8b7110e4490bf587c86835bad (diff) | |
BLI_path api, minor changes to CWD handling
- BLI_current_working_dir's return value must be checked, since it may fail.
- BLI_current_working_dir now behaves like getcwd, where a too-small target will return failure.
- avoid buffer overrun with BLI_path_cwd, by taking a maxlen arg.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/appdir.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c index ee6710e1130..639a502fb83 100644 --- a/source/blender/blenkernel/intern/appdir.c +++ b/source/blender/blenkernel/intern/appdir.c @@ -548,15 +548,7 @@ static void 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_current_working_dir(wdir, sizeof(wdir)); /* backup cwd to restore after */ - - // not needed but avoids annoying /./ in name - if (name[1] == SEP) - BLI_join_dirfile(fullname, maxlen, wdir, name + 2); - else - BLI_join_dirfile(fullname, maxlen, wdir, name); - + BLI_path_cwd(fullname, maxlen); #ifdef _WIN32 BLI_path_program_extensions_add_win32(fullname, maxlen); #endif |