Robot
/
lnav
mirror of https://github.com/tstack/lnav.git
2
0
Fork 0
Code Issues Releases Wiki Activity

[file_collection] handle dirs with colons 

Fixes #863
This commit is contained in:
Timothy Stack 2021-06-08 10:57:11 -07:00
parent ace63947df
commit a760a4240f
3 changed files with 45 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/file_collection.cc
View File

@ -378,30 +378,7 @@ void file_collection::expand_filename(lnav::futures::future_queue<file_collectio
return;
}
auto rp_opt = humanize::network::path::from_str(path);
if (rp_opt && access(path.c_str(), R_OK) == -1) {
auto iter = this->fc_other_files.find(path);
auto rp = *rp_opt;
if (iter != this->fc_other_files.end()) {
return;
}
file_collection retval;
isc::to<tailer::looper &, services::remote_tailer_t>()
.send([=](auto &tlooper) {
tlooper.add_remote(rp, loo);
});
retval.fc_other_files[path] = file_format_t::FF_REMOTE;
{
this->fc_progress->writeAccess()->
sp_tailers[fmt::format("{}", rp.home())].tp_message =
"Initializing...";
}
fq.push_back(lnav::futures::make_ready_future(retval));
} else if (glob(path.c_str(), GLOB_NOCHECK, nullptr, gl.inout()) == 0) {
if (glob(path.c_str(), GLOB_NOCHECK, nullptr, gl.inout()) == 0) {
int lpc;
if (gl->gl_pathc == 1 /*&& gl.gl_matchc == 0*/) {
@ -409,7 +386,33 @@ void file_collection::expand_filename(lnav::futures::future_queue<file_collectio
* yet, allow it through since we'll load it in
* dynamically.
*/
if (access(path.c_str(), F_OK) == -1) {
if (access(gl->gl_pathv[0], F_OK) == -1) {
auto rp_opt = humanize::network::path::from_str(path);
if (rp_opt) {
auto iter = this->fc_other_files.find(path);
auto rp = *rp_opt;
if (iter != this->fc_other_files.end()) {
return;
}
file_collection retval;
isc::to<tailer::looper &, services::remote_tailer_t>()
.send([=](auto &tlooper) {
tlooper.add_remote(rp, loo);
});
retval.fc_other_files[path] = file_format_t::FF_REMOTE;
{
this->fc_progress->writeAccess()->
sp_tailers[fmt::format("{}", rp.home())].tp_message =
"Initializing...";
}
fq.push_back(lnav::futures::make_ready_future(retval));
return;
}
required = false;
}
}

2
test/Makefile.am
View File

@ -429,7 +429,7 @@ DISTCLEANFILES = \
all-local: remote/ssh_host_dsa_key remote/ssh_host_rsa_key remote/id_rsa
distclean-local:
$(RM_V)rm -rf remote remote-tmp
$(RM_V)rm -rf remote remote-tmp not:a:remote:dir
$(RM_V)rm -rf sessions
$(RM_V)rm -rf tmp
$(RM_V)rm -rf rotmp

16
test/test_remote.sh
View File

@ -16,6 +16,22 @@ check_output "a file with colons cannot be read?" <<EOF
Hello, World!
EOF
mkdir not:a:remote:dir
echo "Hello, World!" > not:a:remote:dir/file
run_test ${lnav_test} -d /tmp/lnav.err -n \
not:a:remote:dir
check_output "a file in a dir with colons cannot be read?" <<EOF
Hello, World!
EOF
run_test ${lnav_test} -d /tmp/lnav.err -n \
not:a:remote:dir/f*
check_output "a wildcard in a dir with colons cannot be read?" <<EOF
Hello, World!
EOF
export HOME=${PWD}/remote