diff options
Diffstat (limited to 'lib/libproc')
| -rw-r--r-- | lib/libproc/Makefile | 3 | ||||
| -rw-r--r-- | lib/libproc/Makefile.inc | 1 | ||||
| -rw-r--r-- | lib/libproc/libproc.h | 2 | ||||
| -rw-r--r-- | lib/libproc/proc_bkpt.c | 2 | ||||
| -rw-r--r-- | lib/libproc/proc_create.c | 1 | ||||
| -rw-r--r-- | lib/libproc/proc_regs.c | 2 | ||||
| -rw-r--r-- | lib/libproc/proc_rtld.c | 1 | ||||
| -rw-r--r-- | lib/libproc/proc_sym.c | 1 | ||||
| -rw-r--r-- | lib/libproc/proc_util.c | 8 | ||||
| -rw-r--r-- | lib/libproc/tests/Makefile | 1 | ||||
| -rw-r--r-- | lib/libproc/tests/proc_test.c | 1 |
11 files changed, 7 insertions, 16 deletions
diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile index 67c4e642ea00..785007188255 100644 --- a/lib/libproc/Makefile +++ b/lib/libproc/Makefile @@ -1,4 +1,3 @@ - .include <src.opts.mk> LIB= proc @@ -24,7 +23,7 @@ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h -CFLAGS+= -DHAVE_ISSETUGID -DHAVE_BOOLEAN +CFLAGS+= -DHAVE_ISSETUGID -DHAVE_BOOLEAN -DHAVE_STRLCAT -DHAVE_STRLCPY CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libctf/common \ -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common \ -I${SRCTOP}/sys/cddl/compat/opensolaris diff --git a/lib/libproc/Makefile.inc b/lib/libproc/Makefile.inc index d3b5cbd3a79b..01b5f23410c8 100644 --- a/lib/libproc/Makefile.inc +++ b/lib/libproc/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/lib/libproc/libproc.h b/lib/libproc/libproc.h index 38a4faff94d5..a77bdbb35b59 100644 --- a/lib/libproc/libproc.h +++ b/lib/libproc/libproc.h @@ -105,8 +105,6 @@ typedef enum { REG_RVAL2 } proc_reg_t; -#define SIG2STR_MAX 8 - typedef struct lwpstatus { int pr_why; #define PR_REQUESTED 1 /* not implemented */ diff --git a/lib/libproc/proc_bkpt.c b/lib/libproc/proc_bkpt.c index 25ff3a86291d..8649da178bb9 100644 --- a/lib/libproc/proc_bkpt.c +++ b/lib/libproc/proc_bkpt.c @@ -2,7 +2,6 @@ * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2010 The FreeBSD Foundation - * All rights reserved. * * This software was developed by Rui Paulo under sponsorship from the * FreeBSD Foundation. @@ -29,7 +28,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/types.h> #include <sys/ptrace.h> #include <sys/wait.h> diff --git a/lib/libproc/proc_create.c b/lib/libproc/proc_create.c index 9acee3682e45..0b10b186b8ca 100644 --- a/lib/libproc/proc_create.c +++ b/lib/libproc/proc_create.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/types.h> #include <sys/sysctl.h> #include <sys/user.h> diff --git a/lib/libproc/proc_regs.c b/lib/libproc/proc_regs.c index 492fbf712ef5..8d41233ec108 100644 --- a/lib/libproc/proc_regs.c +++ b/lib/libproc/proc_regs.c @@ -2,7 +2,6 @@ * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2010 The FreeBSD Foundation - * All rights reserved. * * This software was developed by Rui Paulo under sponsorship from the * FreeBSD Foundation. @@ -29,7 +28,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/types.h> #include <sys/ptrace.h> diff --git a/lib/libproc/proc_rtld.c b/lib/libproc/proc_rtld.c index db17c2b02b95..1d6fc732933a 100644 --- a/lib/libproc/proc_rtld.c +++ b/lib/libproc/proc_rtld.c @@ -2,7 +2,6 @@ * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2010 The FreeBSD Foundation - * All rights reserved. * * This software was developed by Rui Paulo under sponsorship from the * FreeBSD Foundation. diff --git a/lib/libproc/proc_sym.c b/lib/libproc/proc_sym.c index 1bb34bdaac67..be932b12a24f 100644 --- a/lib/libproc/proc_sym.c +++ b/lib/libproc/proc_sym.c @@ -31,7 +31,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/types.h> #ifndef NO_CTF #include <sys/ctf.h> diff --git a/lib/libproc/proc_util.c b/lib/libproc/proc_util.c index 9af627422ef8..a062b9a1f461 100644 --- a/lib/libproc/proc_util.c +++ b/lib/libproc/proc_util.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/types.h> #include <sys/ptrace.h> #include <sys/wait.h> @@ -38,6 +37,7 @@ #include <err.h> #include <errno.h> #include <signal.h> +#include <stdio.h> #include <string.h> #include <unistd.h> @@ -181,8 +181,12 @@ proc_getwstat(struct proc_handle *phdl) char * proc_signame(int sig, char *name, size_t namesz) { + char buf[SIG2STR_MAX]; - strlcpy(name, strsignal(sig), namesz); + if (sig2str(sig, buf) == 0) + (void)snprintf(name, namesz, "SIG%s", buf); + else + (void)snprintf(name, namesz, "SIG#%d", sig); return (name); } diff --git a/lib/libproc/tests/Makefile b/lib/libproc/tests/Makefile index 8e1d7c4d91c7..9467cc634884 100644 --- a/lib/libproc/tests/Makefile +++ b/lib/libproc/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_C+= proc_test PROGS= target_prog diff --git a/lib/libproc/tests/proc_test.c b/lib/libproc/tests/proc_test.c index ba1535940b81..e7fc90f29905 100644 --- a/lib/libproc/tests/proc_test.c +++ b/lib/libproc/tests/proc_test.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/types.h> #include <sys/wait.h> |