Archives/lnav
2
0
Fork 0
mirror of https://github.com/tstack/lnav synced 2024-11-08 01:10:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #769 from sureshsundriyal/freebsd

Browse Source 
[freebsd] Remove basename from log_msg.cc and update the FreeBSD image in the VagrantFile.
This commit is contained in:
Tim Stack 2020-09-21 07:10:16 -07:00 committed by GitHub
commit d58ce0cc90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
release/vagrant-static/Vagrantfile vendored
View File

@ -22,11 +22,12 @@ Vagrant.configure(2) do |config|
freebsd.vm.network "private_network", :type => 'dhcp'
freebsd.vm.provision "shell", path:"pkg.sh"
freebsd.vm.provision "shell", path:"provision.sh"
freebsd.vm.box = "freebsd/FreeBSD-11.2-RELEASE"
freebsd.vm.box_version = "2018.06.22"
freebsd.vm.box = "freebsd/FreeBSD-12.1-RELEASE"
freebsd.vm.box_version = "2019.11.01"
freebsd.vm.synced_folder ".", "/vagrant", type: "nfs"
freebsd.ssh.shell = "sh"
freebsd.vm.base_mac = "080027D14C66"
freebsd.vm.boot_timeout = 1200
end
config.vm.define :musl do |musl|

3
src/base/lnav_log.cc
View File

@ -41,7 +41,6 @@
#include <string.h>
#include <unistd.h>
#include <signal.h>
#include <libgen.h>
#include <pthread.h>
#include <sys/resource.h>
@ -274,7 +273,7 @@ void log_msg(lnav_log_level_t level, const char *src_file, int line_number,
localtm.tm_sec,
(int)(curr_time.tv_usec / 1000),
LEVEL_NAMES[to_underlying(level)],
basename((char *)src_file),
src_file,
line_number);
rc = vsnprintf(&line[prefix_size], MAX_LOG_LINE_SIZE - prefix_size,
fmt, args);