From 64a55ae0ba1d09ccda458eb895d849e7d38cab81 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 11 Jan 2023 01:12:48 +0000 Subject: %p => PID expansion for dump_path + dump_csv This makes it possible to dump per-PID files for processes which fork. `%p' matches what the Linux sys.kernel.core_pattern sysctl understands. --- mwrap_core.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'mwrap_core.h') diff --git a/mwrap_core.h b/mwrap_core.h index fff0538..86e4498 100644 --- a/mwrap_core.h +++ b/mwrap_core.h @@ -895,12 +895,27 @@ __attribute__ ((destructor)) static void mwrap_dtor(void) if (dump_path) { char *end = strchr(dump_path, ','); char buf[PATH_MAX]; + AUTO_FREE char *pid_path = NULL; if (end) { mwrap_assert((end - dump_path) < (intptr_t)sizeof(buf)); end = mempcpy(buf, dump_path, end - dump_path); *end = 0; dump_path = buf; } + + /* %p => PID expansion (Linux core_pattern uses %p, too) */ + if ((s = strchr(dump_path, '%')) && s[1] == 'p' && + /* don't allow injecting extra formats: */ + !strchr(s + 2, '%')) { + s[1] = 'd'; /* s/%p/%d/ to make asprintf happy */ + int n = asprintf(&pid_path, dump_path, (int)getpid()); + if (n < 0) + fprintf(stderr, + "asprintf failed: %m, dumping to %s\n", + dump_path); + else + dump_path = pid_path; + } dump_fd = open(dump_path, O_CLOEXEC|O_WRONLY|O_APPEND|O_CREAT, 0666); if (dump_fd < 0) { -- cgit v1.2.3-24-ge0c7