aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/path.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/nvim/path.c')
-rw-r--r--src/nvim/path.c52
1 files changed, 26 insertions, 26 deletions
diff --git a/src/nvim/path.c b/src/nvim/path.c
index c7212c7ade..4de18c7530 100644
--- a/src/nvim/path.c
+++ b/src/nvim/path.c
@@ -8,6 +8,7 @@
#include "auto/config.h"
#include "nvim/ascii_defs.h"
+#include "nvim/buffer_defs.h"
#include "nvim/charset.h"
#include "nvim/cmdexpand.h"
#include "nvim/eval.h"
@@ -15,23 +16,25 @@
#include "nvim/ex_docmd.h"
#include "nvim/file_search.h"
#include "nvim/fileio.h"
-#include "nvim/func_attr.h"
#include "nvim/garray.h"
-#include "nvim/garray_defs.h"
-#include "nvim/gettext.h"
+#include "nvim/gettext_defs.h"
#include "nvim/globals.h"
#include "nvim/macros_defs.h"
#include "nvim/mbyte.h"
#include "nvim/memory.h"
#include "nvim/message.h"
#include "nvim/option.h"
+#include "nvim/option_defs.h"
#include "nvim/option_vars.h"
#include "nvim/os/fs.h"
+#include "nvim/os/fs_defs.h"
#include "nvim/os/input.h"
#include "nvim/os/os.h"
+#include "nvim/os/os_defs.h"
#include "nvim/os/shell.h"
#include "nvim/path.h"
#include "nvim/regexp.h"
+#include "nvim/regexp_defs.h"
#include "nvim/strings.h"
#include "nvim/vim_defs.h"
#include "nvim/window.h"
@@ -153,7 +156,7 @@ char *path_tail_with_sep(char *fname)
///
/// @return The position of the last path separator + 1.
const char *invocation_path_tail(const char *invocation, size_t *len)
- FUNC_ATTR_NONNULL_RET FUNC_ATTR_NONNULL_ARG(1)
+ FUNC_ATTR_NONNULL_RET FUNC_ATTR_NONNULL_ARG(1)
{
const char *tail = get_past_head(invocation);
const char *p = tail;
@@ -238,9 +241,9 @@ char *get_past_head(const char *path)
return (char *)retval;
}
-/// Return true if 'c' is a path separator.
+/// @return true if 'c' is a path separator.
/// Note that for MS-Windows this includes the colon.
-int vim_ispathsep(int c)
+bool vim_ispathsep(int c)
{
#ifdef UNIX
return c == '/'; // Unix has ':' inside file names
@@ -254,7 +257,7 @@ int vim_ispathsep(int c)
}
// Like vim_ispathsep(c), but exclude the colon for MS-Windows.
-int vim_ispathsep_nocolon(int c)
+bool vim_ispathsep_nocolon(int c)
{
return vim_ispathsep(c)
#ifdef BACKSLASH_IN_FILENAME
@@ -263,8 +266,8 @@ int vim_ispathsep_nocolon(int c)
;
}
-/// return true if 'c' is a path list separator.
-int vim_ispathlistsep(int c)
+/// @return true if 'c' is a path list separator.
+bool vim_ispathlistsep(int c)
{
#ifdef UNIX
return c == ':';
@@ -652,7 +655,7 @@ static size_t do_path_expand(garray_T *gap, const char *path, size_t wildoff, in
&& (vim_strchr("*?[{~$", (uint8_t)(*path_end)) != NULL
|| (!p_fic && (flags & EW_ICASE) && mb_isalpha(utf_ptr2char(path_end))))
#endif
- ) { // NOLINT(whitespace/parens)
+ ) {
e = p;
}
len = (size_t)(utfc_ptr2len(path_end));
@@ -718,7 +721,7 @@ static size_t do_path_expand(garray_T *gap, const char *path, size_t wildoff, in
&& *path_end == '/') {
STRCPY(s, path_end + 1);
stardepth++;
- (void)do_path_expand(gap, buf, (size_t)(s - buf), flags, true);
+ do_path_expand(gap, buf, (size_t)(s - buf), flags, true);
stardepth--;
}
*s = NUL;
@@ -747,7 +750,7 @@ static size_t do_path_expand(garray_T *gap, const char *path, size_t wildoff, in
STRCPY(buf + len, "/**"); // NOLINT
STRCPY(buf + len + 3, path_end);
stardepth++;
- (void)do_path_expand(gap, buf, len + 1, flags, true);
+ do_path_expand(gap, buf, len + 1, flags, true);
stardepth--;
}
@@ -755,7 +758,7 @@ static size_t do_path_expand(garray_T *gap, const char *path, size_t wildoff, in
if (path_has_exp_wildcard(path_end)) { // handle more wildcards
// need to expand another component of the path
// remove backslashes for the remaining components only
- (void)do_path_expand(gap, buf, len + 1, flags, false);
+ do_path_expand(gap, buf, len + 1, flags, false);
} else {
FileInfo file_info;
@@ -908,7 +911,7 @@ static char *get_path_cutoff(char *fname, garray_T *gap)
#ifdef MSWIN
|| (vim_ispathsep(fname[j]) && vim_ispathsep(path_part[i][j]))
#endif
- ) // NOLINT(whitespace/parens)
+ )
&& fname[j] != NUL && path_part[i][j] != NUL) {
j++;
}
@@ -972,20 +975,17 @@ static void uniquefy_paths(garray_T *gap, char *pattern)
for (int i = 0; i < gap->ga_len && !got_int; i++) {
char *path = fnames[i];
- int is_in_curdir;
const char *dir_end = gettail_dir(path);
- char *pathsep_p;
- char *path_cutoff;
len = strlen(path);
- is_in_curdir = path_fnamencmp(curdir, path, (size_t)(dir_end - path)) == 0
- && curdir[dir_end - path] == NUL;
+ bool is_in_curdir = path_fnamencmp(curdir, path, (size_t)(dir_end - path)) == 0
+ && curdir[dir_end - path] == NUL;
if (is_in_curdir) {
in_curdir[i] = xstrdup(path);
}
// Shorten the filename while maintaining its uniqueness
- path_cutoff = get_path_cutoff(path, &path_ga);
+ char *path_cutoff = get_path_cutoff(path, &path_ga);
// Don't assume all files can be reached without path when search
// pattern starts with **/, so only remove path_cutoff
@@ -1000,7 +1000,7 @@ static void uniquefy_paths(garray_T *gap, char *pattern)
} else {
// Here all files can be reached without path, so get shortest
// unique path. We start at the end of the path. */
- pathsep_p = path + len - 1;
+ char *pathsep_p = path + len - 1;
while (find_previous_pathsep(path, &pathsep_p)) {
if (vim_regexec(&regmatch, pathsep_p + 1, 0)
&& is_unique(pathsep_p + 1, gap, i)
@@ -1355,7 +1355,7 @@ void FreeWild(int count, char **files)
}
/// @return true if we can expand this backtick thing here.
-static int vim_backtick(char *p)
+static bool vim_backtick(char *p)
{
return *p == '`' && *(p + 1) != NUL && *(p + strlen(p) - 1) == '`';
}
@@ -1668,7 +1668,7 @@ static char *eval_includeexpr(const char *const ptr, const size_t len)
current_sctx = curbuf->b_p_script_ctx[BV_INEX].script_ctx;
char *res = eval_to_string_safe(curbuf->b_p_inex,
- was_set_insecurely(curwin, "includeexpr", OPT_LOCAL));
+ was_set_insecurely(curwin, kOptIncludeexpr, OPT_LOCAL));
set_vim_var_string(VV_FNAME, NULL, 0);
current_sctx = save_sctx;
@@ -1969,7 +1969,7 @@ bool same_directory(char *f1, char *f2)
return false;
}
- (void)vim_FullName(f1, ffname, MAXPATHL, false);
+ vim_FullName(f1, ffname, MAXPATHL, false);
t1 = path_tail_with_sep(ffname);
t2 = path_tail_with_sep(f2);
return t1 - ffname == t2 - f2
@@ -2239,7 +2239,7 @@ int expand_wildcards(int num_pat, char **pat, int *num_files, char ***files, int
}
/// @return true if "fname" matches with an entry in 'suffixes'.
-int match_suffix(char *fname)
+bool match_suffix(char *fname)
{
#define MAXSUFLEN 30 // maximum length of a file suffix
char suf_buf[MAXSUFLEN];
@@ -2394,7 +2394,7 @@ static int path_to_absolute(const char *fname, char *buf, size_t len, int force)
/// Check if file `fname` is a full (absolute) path.
///
/// @return `true` if "fname" is absolute.
-int path_is_absolute(const char *fname)
+bool path_is_absolute(const char *fname)
{
#ifdef MSWIN
if (*fname == NUL) {
generated by cgit (git 2.34.1) at 2025-04-28 13:56:08 +0000