mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-07 03:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12710 from jamessan/fileinfo-garbage-0.4

Browse Source
This commit is contained in:
James McCoy
2020-08-02 23:23:44 -04:00
committed by GitHub
parent 82283a3d10 052337ddfc
commit 0547b4cdad
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/nvim/os/fs.c
View File

@@ -743,7 +743,9 @@ static int os_stat(const char *name, uv_stat_t *statbuf)
} }
uv_fs_t request; uv_fs_t request;
int result = uv_fs_stat(&fs_loop, &request, name, NULL); int result = uv_fs_stat(&fs_loop, &request, name, NULL);
*statbuf = request.statbuf; if (result == kLibuvSuccess) {
*statbuf = request.statbuf;
}
uv_fs_req_cleanup(&request); uv_fs_req_cleanup(&request);
return result; return result;
} }
@@ -1009,6 +1011,7 @@ int os_remove(const char *path)
bool os_fileinfo(const char *path, FileInfo *file_info) bool os_fileinfo(const char *path, FileInfo *file_info)
FUNC_ATTR_NONNULL_ARG(2) FUNC_ATTR_NONNULL_ARG(2)
{ {
memset(file_info, 0, sizeof(*file_info));
return os_stat(path, &(file_info->stat)) == kLibuvSuccess; return os_stat(path, &(file_info->stat)) == kLibuvSuccess;
} }
@@ -1020,14 +1023,17 @@ bool os_fileinfo(const char *path, FileInfo *file_info)
bool os_fileinfo_link(const char *path, FileInfo *file_info) bool os_fileinfo_link(const char *path, FileInfo *file_info)
FUNC_ATTR_NONNULL_ARG(2) FUNC_ATTR_NONNULL_ARG(2)
{ {
memset(file_info, 0, sizeof(*file_info));
if (path == NULL) { if (path == NULL) {
return false; return false;
} }
uv_fs_t request; uv_fs_t request;
int result = uv_fs_lstat(&fs_loop, &request, path, NULL); bool ok = uv_fs_lstat(&fs_loop, &request, path, NULL) == kLibuvSuccess;
file_info->stat = request.statbuf; if (ok) {
file_info->stat = request.statbuf;
}
uv_fs_req_cleanup(&request); uv_fs_req_cleanup(&request);
return (result == kLibuvSuccess); return ok;
} }
/// Get the file information for a given file descriptor /// Get the file information for a given file descriptor
@@ -1039,10 +1045,16 @@ bool os_fileinfo_fd(int file_descriptor, FileInfo *file_info)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
{ {
uv_fs_t request; uv_fs_t request;
int result = uv_fs_fstat(&fs_loop, &request, file_descriptor, NULL); memset(file_info, 0, sizeof(*file_info));
file_info->stat = request.statbuf; bool ok = uv_fs_fstat(&fs_loop,
&request,
file_descriptor,
NULL) == kLibuvSuccess;
if (ok) {
file_info->stat = request.statbuf;
}
uv_fs_req_cleanup(&request); uv_fs_req_cleanup(&request);
return (result == kLibuvSuccess); return ok;
} }
/// Compare the inodes of two FileInfos /// Compare the inodes of two FileInfos