Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 21:03:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

support test -k to test the sticky bit

Browse source 
Fixes #733
This commit is contained in:
Kurtis Rader 2017-03-14 21:43:15 -07:00
parent 6123d3cb50
commit 6fd8dc44fb
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc_src/test.txt
View file

@ -30,6 +30,8 @@ This test is mostly POSIX-compatible.
- `-G FILE` returns true if `FILE` exists and has the same group ID as the current user. - `-G FILE` returns true if `FILE` exists and has the same group ID as the current user.
- `-k FILE` returns true if `FILE` has the sticky bit set. If the OS does not support the concept it returns false. See https://en.wikipedia.org/wiki/Sticky_bit.
- `-L FILE` returns true if `FILE` is a symbolic link. - `-L FILE` returns true if `FILE` is a symbolic link.
- `-O FILE` returns true if `FILE` exists and is owned by the current user. - `-O FILE` returns true if `FILE` exists and is owned by the current user.

9
src/builtin_test.cpp
View file

@ -42,6 +42,7 @@ enum token_t {
test_filetype_G, // "-G", for check effective group id test_filetype_G, // "-G", for check effective group id
test_filetype_g, // "-g", for set-group-id test_filetype_g, // "-g", for set-group-id
test_filetype_h, // "-h", for symbolic links test_filetype_h, // "-h", for symbolic links
test_filetype_k, // "-k", for sticky bit
test_filetype_L, // "-L", same as -h test_filetype_L, // "-L", same as -h
test_filetype_O, // "-O", for check effective user id test_filetype_O, // "-O", for check effective user id
test_filetype_p, // "-p", for FIFO test_filetype_p, // "-p", for FIFO
@ -96,6 +97,7 @@ static const struct token_info_t {
{test_filetype_G, L"-G", UNARY_PRIMARY}, {test_filetype_G, L"-G", UNARY_PRIMARY},
{test_filetype_g, L"-g", UNARY_PRIMARY}, {test_filetype_g, L"-g", UNARY_PRIMARY},
{test_filetype_h, L"-h", UNARY_PRIMARY}, {test_filetype_h, L"-h", UNARY_PRIMARY},
{test_filetype_k, L"-k", UNARY_PRIMARY},
{test_filetype_L, L"-L", UNARY_PRIMARY}, {test_filetype_L, L"-L", UNARY_PRIMARY},
{test_filetype_O, L"-O", UNARY_PRIMARY}, {test_filetype_O, L"-O", UNARY_PRIMARY},
{test_filetype_p, L"-p", UNARY_PRIMARY}, {test_filetype_p, L"-p", UNARY_PRIMARY},
@ -684,6 +686,13 @@ static bool unary_primary_evaluate(test_expressions::token_t token, const wcstri
case test_filetype_L: { // "-L", same as -h case test_filetype_L: { // "-L", same as -h
return !lwstat(arg, &buf) && S_ISLNK(buf.st_mode); return !lwstat(arg, &buf) && S_ISLNK(buf.st_mode);
} }
case test_filetype_k: { // "-k", for sticky bit
#ifdef S_ISVTX
return !lwstat(arg, &buf) && buf.st_mode & S_ISVTX;
#else
return false;
#endif
}
case test_filetype_O: { // "-O", for check effective user id case test_filetype_O: { // "-O", for check effective user id
return !wstat(arg, &buf) && geteuid() == buf.st_uid; return !wstat(arg, &buf) && geteuid() == buf.st_uid;
} }