diff options
author | fabient <fabient@FreeBSD.org> | 2010-08-03 13:46:25 +0000 |
---|---|---|
committer | fabient <fabient@FreeBSD.org> | 2010-08-03 13:46:25 +0000 |
commit | 3327e8714209c4d4c9bb58dd4c03090e6e6eee25 (patch) | |
tree | 3d32dc6bdea086231cf73030612de96d8afa5b37 /usr.sbin/pmcstat/pmcstat_log.c | |
parent | 734aeecfaf9811848828ac86fa014c15a94dcc5d (diff) | |
download | FreeBSD-src-3327e8714209c4d4c9bb58dd4c03090e6e6eee25.zip FreeBSD-src-3327e8714209c4d4c9bb58dd4c03090e6e6eee25.tar.gz |
- Do not use the runtime mask when logfile is specified.
- Revert the fix on rtld path that is not necessary.
MFC after: 1 week
Diffstat (limited to 'usr.sbin/pmcstat/pmcstat_log.c')
-rw-r--r-- | usr.sbin/pmcstat/pmcstat_log.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/pmcstat/pmcstat_log.c b/usr.sbin/pmcstat/pmcstat_log.c index 3303059..d9e6059 100644 --- a/usr.sbin/pmcstat/pmcstat_log.c +++ b/usr.sbin/pmcstat/pmcstat_log.c @@ -609,7 +609,7 @@ pmcstat_image_get_elf_params(struct pmcstat_image *image) GElf_Phdr ph; GElf_Shdr sh; enum pmcstat_image_type image_type; - char buffer[PATH_MAX], rtldpath[PATH_MAX]; + char buffer[PATH_MAX]; assert(image->pi_type == PMCSTAT_IMAGE_UNKNOWN); @@ -689,10 +689,9 @@ pmcstat_image_get_elf_params(struct pmcstat_image *image) buffer, elf_errmsg(-1)); goto done; } - snprintf(rtldpath, sizeof(rtldpath), "%s%s", - args.pa_fsroot, elfbase + ph.p_offset); image->pi_dynlinkerpath = - pmcstat_string_intern(rtldpath); + pmcstat_string_intern(elfbase + + ph.p_offset); break; case PT_LOAD: if (ph.p_offset == 0) |