diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2013-07-03 06:41:52 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2013-07-03 06:41:52 +0000 |
| commit | 9bd77dca9257817f592b44a5b05329e8bdc6d0f1 (patch) | |
| tree | d8cb9509d7592a65427a26ef34577163a3d370ed | |
| parent | 2d1a21a1927637917b3b10f87def6a5492cf2d09 (diff) | |
Use WAIT_* for the first argument to wait4(), and otherwise treat it (and
the first argument to kill) as signed 32bit ints.
ok millert@ otto@
| -rw-r--r-- | usr.bin/kdump/kdump.c | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index 76dcfeb256d..193c48d71ef 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kdump.c,v 1.81 2013/06/01 09:51:30 miod Exp $ */ +/* $OpenBSD: kdump.c,v 1.82 2013/07/03 06:41:51 guenther Exp $ */ /*- * Copyright (c) 1988, 1993 @@ -47,6 +47,7 @@ #include <sys/vmmeter.h> #include <sys/stat.h> #include <sys/tty.h> +#include <sys/wait.h> #include <netinet/in.h> #include <arpa/inet.h> #define _KERNEL @@ -162,6 +163,8 @@ static void setemul(const char *); static void usage(void); static void atfd(int); static void polltimeout(int); +static void pgid(int); +static void wait4pid(int); int main(int argc, char *argv[]) @@ -627,7 +630,7 @@ ktrsyscall(struct ktr_syscall *ktr) break; } case SYS_kill: - pn(NULL); + pn(pgid); pn(signame); break; case SYS_lseek: @@ -792,7 +795,7 @@ ktrsyscall(struct ktr_syscall *ktr) plln(); break; case SYS_wait4: - pn(NULL); + pn(wait4pid); pn(NULL); pn(wait4optname); break; @@ -1655,3 +1658,20 @@ polltimeout(int timeout) else (void)printf("%#x", timeout); } + +static void +pgid(int pid) +{ + (void)printf("%d", pid); +} + +static void +wait4pid(int pid) +{ + if (pid == WAIT_ANY) + (void)printf("WAIT_ANY"); + else if (pid == WAIT_MYPGRP) + (void)printf("WAIT_MYPGRP"); + else + pgid(pid); +} |