diff options
| author | Renato Botelho <renato@netgate.com> | 2016-10-12 11:41:26 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-10-12 11:41:26 -0300 |
| commit | cb642130dfc50717bb970a104c44aa7690930a38 (patch) | |
| tree | c67f108534217a209198c6b201949ecc73acaba3 /usr.bin/gcore/elfcore.c | |
| parent | 5dd7ab172435dc99e1abc1f7d73fd5e720050bbc (diff) | |
| parent | cd04fbc5e631c6b3e80a14eb7044c3be35fba2d2 (diff) | |
| download | FreeBSD-src-cb642130dfc50717bb970a104c44aa7690930a38.zip FreeBSD-src-cb642130dfc50717bb970a104c44aa7690930a38.tar.gz | |
Merge remote-tracking branch 'origin/stable/11' into devel-11
Diffstat (limited to 'usr.bin/gcore/elfcore.c')
| -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 98c9024..6493688 100644 --- a/usr.bin/gcore/elfcore.c +++ b/usr.bin/gcore/elfcore.c @@ -548,6 +548,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; @@ -571,7 +572,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); |
