SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync code with last improvements from OpenBSD

Browse source
This commit is contained in:
purplerain 2023-11-11 01:29:48 +00:00
parent 5903cbe575
commit 62d64fa864
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
841 changed files with 83929 additions and 40755 deletions
Download patch file Download diff file Expand all files Collapse all files

15
usr.bin/kdump/kdump.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: kdump.c,v 1.158 2023/08/21 01:37:56 visa Exp $ */
/* $OpenBSD: kdump.c,v 1.159 2023/11/09 15:43:28 kn Exp $ */
/*-
* Copyright (c) 1988, 1993
@ -88,6 +88,7 @@ int needtid, tail, basecol;
char *tracefile = DEF_TRACEFILE;
struct ktr_header ktr_header;
pid_t pid_opt = -1;
const char *program;
char* utracefilter;
#define eqs(s1, s2) (strcmp((s1), (s2)) == 0)
@ -169,7 +170,7 @@ main(int argc, char *argv[])
screenwidth = 80;
}
while ((ch = getopt(argc, argv, "f:dHlm:np:RTt:u:xX")) != -1)
while ((ch = getopt(argc, argv, "f:dHlm:nP:p:RTt:u:xX")) != -1)
switch (ch) {
case 'f':
tracefile = optarg;
@ -191,6 +192,9 @@ main(int argc, char *argv[])
case 'n':
fancy = 0;
break;
case 'P':
program = optarg;
break;
case 'p':
pid_opt = strtonum(optarg, 1, INT_MAX, &errstr);
if (errstr)
@ -252,6 +256,9 @@ main(int argc, char *argv[])
silent = 0;
if (pid_opt != -1 && pid_opt != ktr_header.ktr_pid)
silent = 1;
if (program != NULL &&
strcmp(ktr_header.ktr_comm, program) != 0)
silent = 1;
if (utracefilter == NULL && silent == 0 &&
trpoints & (1<<ktr_header.ktr_type))
dumpheader(&ktr_header);
@ -1490,8 +1497,8 @@ usage(void)
extern char *__progname;
fprintf(stderr, "usage: %s "
"[-dHlnRTXx] [-f file] [-m maxdata] [-p pid] [-t trstr] "
"[-u label]\n", __progname);
"[-dHlnRTXx] [-f file] [-m maxdata] [-P program] [-p pid] "
"[-t trstr]\n\t[-u label]\n", __progname);
exit(1);
}