|
|
|
@ -649,10 +649,9 @@ file_collection::expand_filename(
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
auto filename_key = loo.loo_filename.empty() ? path : loo.loo_filename;
|
|
|
|
|
auto glob_flags = lnav::filesystem::is_glob(path) ? 0 : GLOB_NOCHECK;
|
|
|
|
|
if (glob(path.c_str(), glob_flags, nullptr, gl.inout()) == 0) {
|
|
|
|
|
int lpc;
|
|
|
|
|
|
|
|
|
|
auto glob_flags = lnav::filesystem::is_glob(path) ? GLOB_NOCHECK : 0;
|
|
|
|
|
auto glob_rc = glob(path.c_str(), glob_flags, nullptr, gl.inout());
|
|
|
|
|
if (glob_rc == 0) {
|
|
|
|
|
if (gl->gl_pathc == 1 /*&& gl.gl_matchc == 0*/) {
|
|
|
|
|
/* It's a pattern that doesn't match any files
|
|
|
|
|
* yet, allow it through since we'll load it in
|
|
|
|
@ -696,7 +695,7 @@ file_collection::expand_filename(
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
std::lock_guard<std::mutex> lg(REALPATH_CACHE_MUTEX);
|
|
|
|
|
for (lpc = 0; lpc < (int) gl->gl_pathc; lpc++) {
|
|
|
|
|
for (size_t lpc = 0; lpc < gl->gl_pathc; lpc++) {
|
|
|
|
|
auto path_str = std::string(gl->gl_pathv[lpc]);
|
|
|
|
|
auto iter = REALPATH_CACHE.find(path_str);
|
|
|
|
|
|
|
|
|
@ -768,6 +767,8 @@ file_collection::expand_filename(
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else if (glob_rc != GLOB_NOMATCH) {
|
|
|
|
|
log_error("glob(%s) failed -- %s", path.c_str(), strerror(errno));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|