diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-03-08 12:58:09 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-03-08 12:58:09 +0000 |
| commit | ab5c28c720db708bc348bdd2d22dfda8f16ea0f9 (patch) | |
| tree | 7f2493ed646db49d6c47215efc91f64d8169d92f /usr/src/cmd/ksh/builtins/alias.c | |
| parent | 4e60424f28371f62aa78ec19751822a218d10eb5 (diff) | |
| parent | 8f5edf1f887948e6be5982cbe7f196909927af91 (diff) | |
| download | illumos-joyent-ab5c28c720db708bc348bdd2d22dfda8f16ea0f9.tar.gz | |
[illumos-gate merge]
commit 8f5edf1f887948e6be5982cbe7f196909927af91
10417 recursive chown should not traverse any symbolic links by default
commit 0fa1b3cc784fb6db7999ec330ee54256171c1143
10500 Refactor dmu_recv into its own file
commit 051a710dcbf091c85ceb0f5d86bd684a64639477
10504 zfs-test deadlist_lock leaves behind orphan destructive dtrace probe
commit cbf54fed071131ba3446db06df29807d639650ab
10125 smatch fixes for cmd-inet
Conflicts:
usr/src/pkg/manifests/system-test-utiltest.mf
usr/src/test/util-tests/tests/Makefile
usr/src/uts/common/fs/zfs/dmu_send.c
usr/src/uts/common/fs/zfs/dmu_recv.c
Diffstat (limited to 'usr/src/cmd/ksh/builtins/alias.c')
| -rw-r--r-- | usr/src/cmd/ksh/builtins/alias.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr/src/cmd/ksh/builtins/alias.c b/usr/src/cmd/ksh/builtins/alias.c index a17e2dabd1..88edbc1e9b 100644 --- a/usr/src/cmd/ksh/builtins/alias.c +++ b/usr/src/cmd/ksh/builtins/alias.c @@ -68,9 +68,7 @@ bfastpathrec fastpath_builtins[] = /* This list must be alphabetically sorted for |strcmp()| usage */ { "basename", b_basename }, { "cat", b_cat }, - { "chgrp", b_chgrp }, { "chmod", b_chmod }, - { "chown", b_chown }, #ifdef ENABLE_PERFORMANCE_PARADOXON { "cksum", b_cksum }, #endif /* ENABLE_PERFORMANCE_PARADOXON */ @@ -98,7 +96,7 @@ bfastpathrec fastpath_builtins[] = { "mkfifo", b_mkfifo }, { "mktemp", b_mktemp }, { "mv", b_mv }, - { "paste", b_paste }, + { "paste", b_paste }, { "pathchk", b_pathchk }, { "pids", b_pids }, { "readlink", b_readlink }, @@ -119,7 +117,7 @@ bfastpathrec fastpath_builtins[] = { "uniq", b_uniq }, { "wc", b_wc }, { "xgrep", b_xgrep }, - { NULL, (int (*)(int, char **, void *))NULL } + { NULL, (int (*)(int, char **, void *))NULL } }; static inline |