diff options
author | jhb <jhb@FreeBSD.org> | 2016-10-06 21:17:18 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2016-10-06 21:17:18 +0000 |
commit | c6641bbcbc36abf157bfc90d6fdd86fbfd9d3382 (patch) | |
tree | a4f92a68accde27ff97464b613b06a4e4d01bceb /usr.bin | |
parent | ae1958d197960436ece49a118519c2722ec64aaf (diff) | |
download | FreeBSD-src-c6641bbcbc36abf157bfc90d6fdd86fbfd9d3382.zip FreeBSD-src-c6641bbcbc36abf157bfc90d6fdd86fbfd9d3382.tar.gz |
MFC 302859: Include command line arguments in core dump process info.
Fill in pr_psargs in the NT_PRSINFO ELF core dump note with command
line arguments.
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/gcore/elfcore.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/usr.bin/gcore/elfcore.c b/usr.bin/gcore/elfcore.c index 24b2a2b..3d87d29 100644 --- a/usr.bin/gcore/elfcore.c +++ b/usr.bin/gcore/elfcore.c @@ -542,6 +542,7 @@ readmap(pid_t pid) static void * elf_note_prpsinfo(void *arg, size_t *sizep) { + char *cp, *end; pid_t pid; elfcore_prpsinfo_t *psinfo; struct kinfo_proc kip; @@ -565,7 +566,20 @@ elf_note_prpsinfo(void *arg, size_t *sizep) if (kip.ki_pid != pid) err(1, "kern.proc.pid.%u", pid); strlcpy(psinfo->pr_fname, kip.ki_comm, sizeof(psinfo->pr_fname)); - strlcpy(psinfo->pr_psargs, psinfo->pr_fname, sizeof(psinfo->pr_psargs)); + name[2] = KERN_PROC_ARGS; + len = sizeof(psinfo->pr_psargs) - 1; + if (sysctl(name, 4, psinfo->pr_psargs, &len, NULL, 0) == 0 && len > 0) { + cp = psinfo->pr_psargs; + end = cp + len - 1; + for (;;) { + cp = memchr(cp, '\0', end - cp); + if (cp == NULL) + break; + *cp = ' '; + } + } else + strlcpy(psinfo->pr_psargs, kip.ki_comm, + sizeof(psinfo->pr_psargs)); *sizep = sizeof(*psinfo); return (psinfo); |