luo980/glog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(cleanup): ensure FLAGS_log_dir ends with '/' (#972)

Browse Source
This commit is contained in:
LingBin 2023-10-12 19:35:52 +08:00 committed by GitHub
parent b58718f37c
commit da9753409b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -16,6 +16,7 @@ Brian Silverman <bsilver16384@gmail.com>
Dmitriy Arbitman <d.arbitman@gmail.com> Dmitriy Arbitman <d.arbitman@gmail.com>
Google Inc. Google Inc.
Guillaume Dumont <dumont.guillaume@gmail.com> Guillaume Dumont <dumont.guillaume@gmail.com>
LingBin <lingbinlb@gmail.com>
Marco Wang <m.aesophor@gmail.com> Marco Wang <m.aesophor@gmail.com>
Michael Tanner <michael@tannertaxpro.com> Michael Tanner <michael@tannertaxpro.com>
MiniLight <MiniLightAR@Gmail.com> MiniLight <MiniLightAR@Gmail.com>

1
CONTRIBUTORS
View File

@ -36,6 +36,7 @@ Håkan L. S. Younes <hyounes@google.com>
Ivan Penkov <ivanpe@google.com> Ivan Penkov <ivanpe@google.com>
Jacob Trimble <modmaker@google.com> Jacob Trimble <modmaker@google.com>
Jim Ray <jimray@google.com> Jim Ray <jimray@google.com>
LingBin <lingbinlb@gmail.com>
Marco Wang <m.aesophor@gmail.com> Marco Wang <m.aesophor@gmail.com>
Michael Darr <mdarr@matician.com> Michael Darr <mdarr@matician.com>
Michael Tanner <michael@tannertaxpro.com> Michael Tanner <michael@tannertaxpro.com>

10
src/logging.cc
View File

@ -35,6 +35,7 @@
#include <cassert> #include <cassert>
#include <cstddef> #include <cstddef>
#include <iomanip> #include <iomanip>
#include <iterator>
#include <string> #include <string>
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
@ -2397,8 +2398,13 @@ const vector<string>& GetLoggingDirectories() {
logging_directories_list = new vector<string>; logging_directories_list = new vector<string>;
if ( !FLAGS_log_dir.empty() ) { if ( !FLAGS_log_dir.empty() ) {
// A dir was specified, we should use it // Ensure the specified path ends with a directory delimiter.
logging_directories_list->push_back(FLAGS_log_dir); if (std::find(std::begin(possible_dir_delim), std::end(possible_dir_delim),
FLAGS_log_dir.back()) == std::end(possible_dir_delim)) {
logging_directories_list->push_back(FLAGS_log_dir + "/");
} else {
logging_directories_list->push_back(FLAGS_log_dir);
}
} else { } else {
GetTempDirectories(logging_directories_list); GetTempDirectories(logging_directories_list);
#ifdef GLOG_OS_WINDOWS #ifdef GLOG_OS_WINDOWS