Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: on Windows use UTF-8 strings instead of system default locale strings #6190

Merged
merged 18 commits into from
Feb 28, 2020
Merged

fix: on Windows use UTF-8 strings instead of system default locale strings #6190

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
64ab084
fix: on Windows use UTF-8 strings instead of system default locale st…
farfella Jan 19, 2020
8fe8326
add SQL_TEXT, code style check, and revert EnvVar args to std::string
farfella Jan 20, 2020
9fef4c6
adding missing updates
farfella Jan 20, 2020
a9cefda
reverting additional files forgotten in prev commit
farfella Jan 20, 2020
2a76576
more missing reverts
farfella Jan 20, 2020
a2be033
bad typo: length miscalculation
farfella Jan 20, 2020
71a1b7d
adding successful conversion check to retry build failure
farfella Jan 20, 2020
f3ad8f0
adjusting code as per review
farfella Jan 26, 2020
0718ee3
removing TODO comment and created ticket
farfella Jan 26, 2020
8e1ae05
check style
farfella Jan 26, 2020
5c67f6e
check style
farfella Jan 26, 2020
dc71c56
Updating utils/system/BUCK to add utils/conversions dependencies
farfella Jan 26, 2020
2b4149e
updates per PR comments and buck build failure
farfella Jan 27, 2020
1835564
Merge pull request #1 from osquery/master
farfella Feb 5, 2020
5b710f0
merging with upstream master
farfella Feb 6, 2020
f60a049
accomodate updated function prototype
farfella Feb 6, 2020
5093357
remove stray copy-paste
farfella Feb 10, 2020
9a5dec8
formatting: remove extra line
farfella Feb 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
more missing reverts
  • Loading branch information
@farfella
farfella committed Jan 20, 2020
commit 2a765768821a40c66c6c87121d3b74ac1f875181
2 changes: 1 addition & 1 deletion osquery/config/tests/test_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace {
namespace fs = boost::filesystem;

fs::path getConfDirPathImpl() {
const char* kEnvVarName = "TEST_CONF_FILES_DIR";
char const* kEnvVarName = "TEST_CONF_FILES_DIR";
auto const value_opt = osquery::getEnvVar(kEnvVarName);
EXPECT_TRUE(static_cast<bool>(value_opt))
<< "Env var " << boost::io::quoted(kEnvVarName) << " was not found, "
Expand Down
4 changes: 2 additions & 2 deletions osquery/tables/system/windows/scheduled_tasks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,11 +198,11 @@ QueryData genScheduledTasks(QueryContext& context) {
enumerateTasksForFolder("\\", results);

// We attempt to derive the location of the tasks folder
auto sysRoot = getEnvVar(L"SystemRoot");
auto sysRoot = getEnvVar("SystemRoot");
if (!sysRoot.is_initialized()) {
return results;
}
auto sysTaskPath = *sysRoot + L"\\System32\\Tasks";
auto sysTaskPath = *sysRoot + "\\System32\\Tasks";

// Then process all tasks in subsequent folders
std::vector<std::string> taskPaths;
Expand Down