mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-05 17:36:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

shada: Use os_mkdir_recurse to create directory for ShaDa file

Browse Source
This commit is contained in:
ZyX
2015-07-12 14:11:41 +03:00
parent 0018b4f579
commit 09cbec6476
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/nvim/shada.c
View File

@@ -83,6 +83,8 @@ KHASH_SET_INIT_STR(strset)
(convert_setup(vcp, (char_u *)from, (char_u *)to)) (convert_setup(vcp, (char_u *)from, (char_u *)to))
#define os_getperm(f) \ #define os_getperm(f) \
(os_getperm((char_u *) f)) (os_getperm((char_u *) f))
#define os_isdir(f) (os_isdir((char_u *) f))
#define path_tail_with_sep(f) ((char *) path_tail_with_sep((char_u *)f))
// From http://www.boost.org/doc/libs/1_43_0/boost/detail/endian.hpp + some // From http://www.boost.org/doc/libs/1_43_0/boost/detail/endian.hpp + some
// additional checks done after examining `{compiler} -dM -E - < /dev/null` // additional checks done after examining `{compiler} -dM -E - < /dev/null`
@@ -2095,7 +2097,24 @@ shada_write_file_open:
} }
} }
if (nomerge) { if (nomerge) {
shada_write_file_nomerge: shada_write_file_nomerge: {}
char *const tail = path_tail_with_sep(fname);
if (tail != fname) {
const char tail_save = *tail;
*tail = NUL;
if (!os_isdir(fname)) {
int ret;
char *failed_dir;
if ((ret = os_mkdir_recurse(fname, 0700, &failed_dir)) != 0) {
EMSG3("Failed to create directory %s for writing ShaDa file: %s",
failed_dir, strerror(-ret));
xfree(fname);
xfree(failed_dir);
return FAIL;
}
}
*tail = tail_save;
}
fd = (intptr_t) open_file(fname, O_CREAT|O_WRONLY|O_TRUNC, fd = (intptr_t) open_file(fname, O_CREAT|O_WRONLY|O_TRUNC,
0600); 0600);
} }