From aa378acdf51daf235c7e721cfa646d115d8708f0 Mon Sep 17 00:00:00 2001 From: Stefan Hoffmann Date: Fri, 8 Aug 2014 16:25:33 +0200 Subject: fileinfo: implement os_fileinfo_size this replaces os_get_file_size and file_info.stat.st_size --- src/nvim/os/fs.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'src/nvim/os') diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c index aca7005064..9347afb9bc 100644 --- a/src/nvim/os/fs.c +++ b/src/nvim/os/fs.c @@ -258,20 +258,6 @@ int os_file_is_writable(const char *name) return 0; } -/// Get the size of a file in bytes. -/// -/// @param[out] size pointer to an off_t to put the size into. -/// @return `true` for success, `false` for failure. -bool os_get_file_size(const char *name, off_t *size) -{ - uv_stat_t statbuf; - if (os_stat(name, &statbuf)) { - *size = statbuf.st_size; - return true; - } - return false; -} - /// Rename a file or directory. /// /// @return `OK` for success, `FAIL` for failure. @@ -408,6 +394,15 @@ uint64_t os_file_info_get_inode(const FileInfo *file_info) return file_info->stat.st_ino; } +/// Get the size of a file from a `FileInfo`. +/// +/// @return filesize in bytes. +off_t os_fileinfo_size(const FileInfo *file_info) + FUNC_ATTR_NONNULL_ALL +{ + return file_info->stat.st_size; +} + /// Get the `FileID` for a given path /// /// @param path Path to the file. -- cgit From e85fe0957d40080f43cbfcbe9eb8864475325b09 Mon Sep 17 00:00:00 2001 From: Stefan Hoffmann Date: Fri, 8 Aug 2014 16:53:03 +0200 Subject: fileinfo: implement os_fileinfo_hardlinks --- src/nvim/os/fs.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/nvim/os') diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c index 9347afb9bc..70a53edb1c 100644 --- a/src/nvim/os/fs.c +++ b/src/nvim/os/fs.c @@ -403,6 +403,15 @@ off_t os_fileinfo_size(const FileInfo *file_info) return file_info->stat.st_size; } +/// Get the number of hardlinks from a `FileInfo`. +/// +/// @return number of hardlinks. +uint64_t os_fileinfo_hardlinks(const FileInfo *file_info) + FUNC_ATTR_NONNULL_ALL +{ + return file_info->stat.st_nlink; +} + /// Get the `FileID` for a given path /// /// @param path Path to the file. -- cgit From 9ee1c3604c0cc8a3ec1bac32fb33e9c0d0887155 Mon Sep 17 00:00:00 2001 From: Stefan Hoffmann Date: Sat, 9 Aug 2014 14:59:52 +0200 Subject: fileinfo: implement os_fileinfo_blocksize --- src/nvim/os/fs.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/nvim/os') diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c index 70a53edb1c..71e8a55c0e 100644 --- a/src/nvim/os/fs.c +++ b/src/nvim/os/fs.c @@ -412,6 +412,15 @@ uint64_t os_fileinfo_hardlinks(const FileInfo *file_info) return file_info->stat.st_nlink; } +/// Get the blocksize from a `FileInfo`. +/// +/// @return blocksize in bytes. +uint64_t os_fileinfo_blocksize(const FileInfo *file_info) + FUNC_ATTR_NONNULL_ALL +{ + return file_info->stat.st_blksize; +} + /// Get the `FileID` for a given path /// /// @param path Path to the file. -- cgit From 5d074a0aa6b307a11ee572db6bf48ca17c3a8a23 Mon Sep 17 00:00:00 2001 From: Stefan Hoffmann Date: Wed, 27 Aug 2014 19:14:44 +0200 Subject: fileinfo: rename os_get_file_info{,_link,_fd} --- src/nvim/os/fs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/nvim/os') diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c index 71e8a55c0e..217d0a78ac 100644 --- a/src/nvim/os/fs.c +++ b/src/nvim/os/fs.c @@ -331,7 +331,7 @@ int os_remove(const char *path) /// @param path Path to the file. /// @param[out] file_info Pointer to a FileInfo to put the information in. /// @return `true` on success, `false` for failure. -bool os_get_file_info(const char *path, FileInfo *file_info) +bool os_fileinfo(const char *path, FileInfo *file_info) { return os_stat(path, &(file_info->stat)); } @@ -341,7 +341,7 @@ bool os_get_file_info(const char *path, FileInfo *file_info) /// @param path Path to the file. /// @param[out] file_info Pointer to a FileInfo to put the information in. /// @return `true` on success, `false` for failure. -bool os_get_file_info_link(const char *path, FileInfo *file_info) +bool os_fileinfo_link(const char *path, FileInfo *file_info) { uv_fs_t request; int result = uv_fs_lstat(uv_default_loop(), &request, path, NULL); @@ -355,7 +355,7 @@ bool os_get_file_info_link(const char *path, FileInfo *file_info) /// @param file_descriptor File descriptor of the file. /// @param[out] file_info Pointer to a FileInfo to put the information in. /// @return `true` on success, `false` for failure. -bool os_get_file_info_fd(int file_descriptor, FileInfo *file_info) +bool os_fileinfo_fd(int file_descriptor, FileInfo *file_info) { uv_fs_t request; int result = uv_fs_fstat(uv_default_loop(), &request, file_descriptor, NULL); -- cgit From edcc1a97327c68c7ae1353281784c47e026d6674 Mon Sep 17 00:00:00 2001 From: Stefan Hoffmann Date: Wed, 27 Aug 2014 19:53:31 +0200 Subject: fileinfo: rename os_file_info_id_equal --- src/nvim/os/fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/os') diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c index 217d0a78ac..908106db54 100644 --- a/src/nvim/os/fs.c +++ b/src/nvim/os/fs.c @@ -367,7 +367,7 @@ bool os_fileinfo_fd(int file_descriptor, FileInfo *file_info) /// Compare the inodes of two FileInfos /// /// @return `true` if the two FileInfos represent the same file. -bool os_file_info_id_equal(const FileInfo *file_info_1, +bool os_fileinfo_id_equal(const FileInfo *file_info_1, const FileInfo *file_info_2) { return file_info_1->stat.st_ino == file_info_2->stat.st_ino -- cgit From 6e3dce144a849166a02a3633f005d8d61d1eb19d Mon Sep 17 00:00:00 2001 From: Stefan Hoffmann Date: Wed, 27 Aug 2014 19:56:49 +0200 Subject: fileinfo: rename os_file_info_get_id --- src/nvim/os/fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/os') diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c index 908106db54..45c08d23c1 100644 --- a/src/nvim/os/fs.c +++ b/src/nvim/os/fs.c @@ -378,7 +378,7 @@ bool os_fileinfo_id_equal(const FileInfo *file_info_1, /// /// @param file_info Pointer to the `FileInfo` /// @param[out] file_id Pointer to a `FileID` -void os_file_info_get_id(const FileInfo *file_info, FileID *file_id) +void os_fileinfo_id(const FileInfo *file_info, FileID *file_id) { file_id->inode = file_info->stat.st_ino; file_id->device_id = file_info->stat.st_dev; -- cgit From 8a66f4f2453be3385c65d298609c282eeab08af8 Mon Sep 17 00:00:00 2001 From: Stefan Hoffmann Date: Wed, 27 Aug 2014 20:04:03 +0200 Subject: fileinfo: rename os_file_info_get_inode --- src/nvim/os/fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/os') diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c index 45c08d23c1..63ea0ed963 100644 --- a/src/nvim/os/fs.c +++ b/src/nvim/os/fs.c @@ -389,7 +389,7 @@ void os_fileinfo_id(const FileInfo *file_info, FileID *file_id) /// @deprecated Use `FileID` instead, this function is only needed in memline.c /// @param file_info Pointer to the `FileInfo` /// @return the inode number -uint64_t os_file_info_get_inode(const FileInfo *file_info) +uint64_t os_fileinfo_inode(const FileInfo *file_info) { return file_info->stat.st_ino; } -- cgit From 4e43095ab20d2b03b206f1b019570873af35c68c Mon Sep 17 00:00:00 2001 From: Stefan Hoffmann Date: Wed, 27 Aug 2014 20:09:39 +0200 Subject: fileid: rename os_get_file_id --- src/nvim/os/fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/os') diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c index 63ea0ed963..2e51551b7a 100644 --- a/src/nvim/os/fs.c +++ b/src/nvim/os/fs.c @@ -426,7 +426,7 @@ uint64_t os_fileinfo_blocksize(const FileInfo *file_info) /// @param path Path to the file. /// @param[out] file_info Pointer to a `FileID` to fill in. /// @return `true` on sucess, `false` for failure. -bool os_get_file_id(const char *path, FileID *file_id) +bool os_fileid(const char *path, FileID *file_id) { uv_stat_t statbuf; if (os_stat(path, &statbuf)) { -- cgit From 3cf7a17a4452cc8ae42104459992a8e73963084e Mon Sep 17 00:00:00 2001 From: Stefan Hoffmann Date: Wed, 27 Aug 2014 20:12:11 +0200 Subject: fileid: rename os_file_id_equal --- src/nvim/os/fs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/nvim/os') diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c index 2e51551b7a..c5dc7c8ece 100644 --- a/src/nvim/os/fs.c +++ b/src/nvim/os/fs.c @@ -442,7 +442,7 @@ bool os_fileid(const char *path, FileID *file_id) /// @param file_id_1 Pointer to first `FileID` /// @param file_id_2 Pointer to second `FileID` /// @return `true` if the two `FileID`s represent te same file. -bool os_file_id_equal(const FileID *file_id_1, const FileID *file_id_2) +bool os_fileid_equal(const FileID *file_id_1, const FileID *file_id_2) { return file_id_1->inode == file_id_2->inode && file_id_1->device_id == file_id_2->device_id; @@ -453,7 +453,7 @@ bool os_file_id_equal(const FileID *file_id_1, const FileID *file_id_2) /// @param file_id Pointer to a `FileID` /// @param file_info Pointer to a `FileInfo` /// @return `true` if the `FileID` and the `FileInfo` represent te same file. -bool os_file_id_equal_file_info(const FileID *file_id, +bool os_fileid_equal_file_info(const FileID *file_id, const FileInfo *file_info) { return file_id->inode == file_info->stat.st_ino -- cgit From 10813ce38c6588664e1decc8ba35424923cfb2e4 Mon Sep 17 00:00:00 2001 From: Stefan Hoffmann Date: Wed, 27 Aug 2014 20:14:39 +0200 Subject: fileid: rename os_file_id_equal_file_info --- src/nvim/os/fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/os') diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c index c5dc7c8ece..df6491d57d 100644 --- a/src/nvim/os/fs.c +++ b/src/nvim/os/fs.c @@ -453,7 +453,7 @@ bool os_fileid_equal(const FileID *file_id_1, const FileID *file_id_2) /// @param file_id Pointer to a `FileID` /// @param file_info Pointer to a `FileInfo` /// @return `true` if the `FileID` and the `FileInfo` represent te same file. -bool os_fileid_equal_file_info(const FileID *file_id, +bool os_fileid_equal_fileinfo(const FileID *file_id, const FileInfo *file_info) { return file_id->inode == file_info->stat.st_ino -- cgit From 7ac191ab1085875319e139b044ec1f98498b87ce Mon Sep 17 00:00:00 2001 From: Stefan Hoffmann Date: Wed, 27 Aug 2014 22:36:38 +0200 Subject: fileinfo: change returntype of os_fileinfo_size off_t -> uint64_t --- src/nvim/os/fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/os') diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c index df6491d57d..bb4e897887 100644 --- a/src/nvim/os/fs.c +++ b/src/nvim/os/fs.c @@ -397,7 +397,7 @@ uint64_t os_fileinfo_inode(const FileInfo *file_info) /// Get the size of a file from a `FileInfo`. /// /// @return filesize in bytes. -off_t os_fileinfo_size(const FileInfo *file_info) +uint64_t os_fileinfo_size(const FileInfo *file_info) FUNC_ATTR_NONNULL_ALL { return file_info->stat.st_size; -- cgit