diff options
author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-05 12:38:17 +0000 |
---|---|---|
committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-05 12:38:17 +0000 |
commit | 0efa232c593d8fe393b56fb1ff4dda751660b3b3 (patch) | |
tree | b037fe733cd026b5cefb5b27d7f3f6cbc8f4c3ac /usr/src/cmd/truss/codes.c | |
parent | 86b01acdc561eb9c47f9d9e8c33b2d15e064aed7 (diff) | |
parent | 7484d76e78bc19298de9589214be103d65cf3989 (diff) | |
download | illumos-joyent-0efa232c593d8fe393b56fb1ff4dda751660b3b3.tar.gz |
[illumos-gate merge]
commit 7484d76e78bc19298de9589214be103d65cf3989
12263 libc: NULL pointer errors (sparc)
commit b36afad7ffe84071c2c6831936cc1c524bd1ca90
12216 Clean up libc-tests smatch
commit 69c811ab73b7ce531454837ae68c4343e8724e0b
9965 Want support for O_DIRECTORY
commit 2fe8bc68ec8e8e8e05997b3ac2f081bfdded45ab
12275 check_rtime(1onbld): BUNDEF_OBJ and BUNUSED_OBJ
commit 5fe3b0929d8a195dbfa4196d72a3f9b15b745171
12084 idm_conn_event_handler mishandles CA_DROP action
Conflicts:
usr/src/test/os-tests/tests/Makefile
Diffstat (limited to 'usr/src/cmd/truss/codes.c')
-rw-r--r-- | usr/src/cmd/truss/codes.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr/src/cmd/truss/codes.c b/usr/src/cmd/truss/codes.c index de04009d59..88c67ea994 100644 --- a/usr/src/cmd/truss/codes.c +++ b/usr/src/cmd/truss/codes.c @@ -1962,7 +1962,7 @@ pathconfname(int code) #define ALL_O_FLAGS \ (O_NDELAY|O_APPEND|O_SYNC|O_DSYNC|O_NONBLOCK|O_CREAT|O_TRUNC\ |O_EXCL|O_NOCTTY|O_LARGEFILE|O_RSYNC|O_XATTR|O_NOFOLLOW|O_NOLINKS\ - |O_CLOEXEC|FXATTRDIROPEN) + |O_CLOEXEC|O_DIRECTORY|FXATTRDIROPEN) const char * openarg(private_t *pri, int arg) @@ -2022,6 +2022,8 @@ openarg(private_t *pri, int arg) (void) strlcat(str, "|O_NOLINKS", sizeof (pri->code_buf)); if (arg & O_CLOEXEC) (void) strlcat(str, "|O_CLOEXEC", sizeof (pri->code_buf)); + if (arg & O_DIRECTORY) + (void) strlcat(str, "|O_DIRECTORY", sizeof (pri->code_buf)); if (arg & FXATTRDIROPEN) (void) strlcat(str, "|FXATTRDIROPEN", sizeof (pri->code_buf)); |