Mercurial > vim
changeset 28629:5ef46b938c6e v8.2.4838
patch 8.2.4838: checking for absolute path is not trivial
Commit: https://github.com/vim/vim/commit/dca1d40cd0f2af0755519e7028378bd3c8fefd31
Author: LemonBoy <thatlemon@gmail.com>
Date: Thu Apr 28 15:26:33 2022 +0100
patch 8.2.4838: checking for absolute path is not trivial
Problem: Checking for absolute path is not trivial.
Solution: Add isabsolutepath(). (closes https://github.com/vim/vim/issues/10303)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 28 Apr 2022 16:30:03 +0200 |
| parents | 5cb27da6a351 |
| children | 0d78a0715a2a |
| files | runtime/doc/builtin.txt runtime/doc/usr_41.txt src/evalfunc.c src/filepath.c src/proto/filepath.pro src/testdir/test_functions.vim src/version.c |
| diffstat | 7 files changed, 55 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/builtin.txt +++ b/runtime/doc/builtin.txt @@ -295,6 +295,7 @@ inputsecret({prompt} [, {text}]) String insert({object}, {item} [, {idx}]) List insert {item} in {object} [before {idx}] interrupt() none interrupt script execution invert({expr}) Number bitwise invert +isabsolutepath({path}) Number |TRUE| if {path} is an absolute path isdirectory({directory}) Number |TRUE| if {directory} is a directory isinf({expr}) Number determine if {expr} is infinity value (positive or negative) @@ -4672,6 +4673,24 @@ invert({expr}) *invert()* < Can also be used as a |method|: > :let bits = bits->invert() +isabsolutepath({directory}) *isabsolutepath()* + The result is a Number, which is |TRUE| when {path} is an + absolute path. +< On Unix, a path is considered absolute when it starts with '/'. + On MS-Windows, it is considered absolute when it starts with an + optional drive prefix and is followed by a '\' or '/'. UNC paths + are always absolute. + Example: > + echo isabsolutepath('/usr/share/') " 1 + echo isabsolutepath('./foobar') " 0 + echo isabsolutepath('C:\Windows') " 1 + echo isabsolutepath('foobar') " 0 + echo isabsolutepath('\\remote\file') " 1 + + Can also be used as a |method|: > + GetName()->isabsolutepath() + + isdirectory({directory}) *isdirectory()* The result is a Number, which is |TRUE| when a directory with the name {directory} exists. If {directory} doesn't
--- a/runtime/doc/usr_41.txt +++ b/runtime/doc/usr_41.txt @@ -904,6 +904,7 @@ System functions and manipulation of fil getfperm() get the permissions of a file setfperm() set the permissions of a file getftype() get the kind of a file + isabsolutepath() check if a path is absolute isdirectory() check if a directory exists getfsize() get the size of a file getcwd() get the current working directory
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -1969,6 +1969,8 @@ static funcentry_T global_functions[] = ret_void, f_interrupt}, {"invert", 1, 1, FEARG_1, arg1_number, ret_number, f_invert}, + {"isabsolutepath", 1, 1, FEARG_1, arg1_string, + ret_number_bool, f_isabsolutepath}, {"isdirectory", 1, 1, FEARG_1, arg1_string, ret_number_bool, f_isdirectory}, {"isinf", 1, 1, FEARG_1, arg1_float_or_nr,
--- a/src/filepath.c +++ b/src/filepath.c @@ -1417,6 +1417,18 @@ f_isdirectory(typval_T *argvars, typval_ } /* + * "isabsolutepath()" function + */ + void +f_isabsolutepath(typval_T *argvars, typval_T *rettv) +{ + if (in_vim9script() && check_for_string_arg(argvars, 0) == FAIL) + return; + + rettv->vval.v_number = mch_isFullName(tv_get_string_strict(&argvars[0])); +} + +/* * Create the directory in which "dir" is located, and higher levels when * needed. * Return OK or FAIL.
--- a/src/proto/filepath.pro +++ b/src/proto/filepath.pro @@ -22,6 +22,7 @@ void f_glob(typval_T *argvars, typval_T void f_glob2regpat(typval_T *argvars, typval_T *rettv); void f_globpath(typval_T *argvars, typval_T *rettv); void f_isdirectory(typval_T *argvars, typval_T *rettv); +void f_isabsolutepath(typval_T *argvars, typval_T *rettv); void f_mkdir(typval_T *argvars, typval_T *rettv); void f_pathshorten(typval_T *argvars, typval_T *rettv); void f_readdir(typval_T *argvars, typval_T *rettv);
--- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -2887,5 +2887,23 @@ func Test_funcref_to_string() call assert_equal("function('g:Test_funcref_to_string')", string(Fn)) endfunc +" Test for isabsolutepath() +func Test_isabsolutepath() + call assert_false(isabsolutepath('')) + call assert_false(isabsolutepath('.')) + call assert_false(isabsolutepath('../Foo')) + call assert_false(isabsolutepath('Foo/')) + if has('win32') + call assert_true(isabsolutepath('A:\')) + call assert_true(isabsolutepath('A:\Foo')) + call assert_true(isabsolutepath('A:/Foo')) + call assert_false(isabsolutepath('A:Foo')) + call assert_false(isabsolutepath('\Windows')) + call assert_true(isabsolutepath('\\Server2\Share\Test\Foo.txt')) + else + call assert_true(isabsolutepath('/')) + call assert_true(isabsolutepath('/usr/share/')) + endif +endfunc " vim: shiftwidth=2 sts=2 expandtab