diff options
Diffstat (limited to 'usr/src/cmd')
| -rw-r--r-- | usr/src/cmd/ptools/pflags/pflags.c | 2 | ||||
| -rw-r--r-- | usr/src/cmd/truss/print.c | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/usr/src/cmd/ptools/pflags/pflags.c b/usr/src/cmd/ptools/pflags/pflags.c index 4ae6f3c679..8054a80d3c 100644 --- a/usr/src/cmd/ptools/pflags/pflags.c +++ b/usr/src/cmd/ptools/pflags/pflags.c @@ -344,7 +344,7 @@ lwplook(look_arg_t *arg, const lwpstatus_t *psp, const lwpsinfo_t *pip) (void) strftime(t, sizeof (t), "%F:%H.%M.%S", localtime(&time)); (void) printf("\tspymaster = pid %d, \"%s\" at %s\n", - ps.pr_pid, ps.pr_psargs, t); + (int)ps.pr_pid, ps.pr_psargs, t); } if (rflag) { diff --git a/usr/src/cmd/truss/print.c b/usr/src/cmd/truss/print.c index a8c923fae2..9fbbefbe62 100644 --- a/usr/src/cmd/truss/print.c +++ b/usr/src/cmd/truss/print.c @@ -27,6 +27,8 @@ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ +/* Copyright (c) 2013, OmniTI Computer Consulting, Inc. All rights reserved. */ + #define _SYSCALL32 /* make 32-bit compat headers visible */ #include <stdio.h> @@ -1690,11 +1692,17 @@ void prt_skt(private_t *pri, int raw, long val) { const char *s; + long type = val & SOCK_TYPE_MASK; - if ((ulong_t)val <= MAX_SOCKTYPES && (s = socktype_codes[val]) != NULL) + if ((ulong_t)type <= MAX_SOCKTYPES && + (s = socktype_codes[type]) != NULL) { outstring(pri, s); - else + if ((val & SOCK_CLOEXEC) != 0) { + outstring(pri, "|SOCK_CLOEXEC"); + } + } else { prt_dec(pri, 0, val); + } } |