echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cm{Unset,Set}Command: use std::string to determine the env variable name

Browse Source
This commit is contained in:
Matthias Maennich 2017-10-05 13:12:00 +02:00 committed by Brad King
parent cb8f26f199
commit 5731f6d5b1
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmSetCommand.cxx
View File

@ -2,8 +2,6 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmSetCommand.h"
#include <string.h>
#include "cmAlgorithms.h"
#include "cmMakefile.h"
#include "cmState.h"
@ -22,19 +20,15 @@ bool cmSetCommand::InitialPass(std::vector<std::string> const& args,
}
// watch for ENV signatures
const char* variable = args[0].c_str(); // VAR is always first
if (cmHasLiteralPrefix(variable, "ENV{") && strlen(variable) > 5) {
auto const& variable = args[0]; // VAR is always first
if (cmHasLiteralPrefix(variable, "ENV{") && variable.size() > 5) {
// what is the variable name
char* varName = new char[strlen(variable)];
strncpy(varName, variable + 4, strlen(variable) - 5);
varName[strlen(variable) - 5] = '\0';
std::string putEnvArg = varName;
putEnvArg += "=";
auto const& varName = variable.substr(4, variable.size() - 5);
std::string putEnvArg = varName + "=";
// what is the current value if any
std::string currValue;
const bool currValueSet = cmSystemTools::GetEnv(varName, currValue);
delete[] varName;
// will it be set to something, then set it
if (args.size() > 1 && !args[1].empty()) {

13
Source/cmUnsetCommand.cxx
View File

@ -2,8 +2,6 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmUnsetCommand.h"
#include <string.h>
#include "cmAlgorithms.h"
#include "cmMakefile.h"
#include "cmSystemTools.h"
@ -19,19 +17,16 @@ bool cmUnsetCommand::InitialPass(std::vector<std::string> const& args,
return false;
}
const char* variable = args[0].c_str();
auto const& variable = args[0];
// unset(ENV{VAR})
if (cmHasLiteralPrefix(variable, "ENV{") && strlen(variable) > 5) {
if (cmHasLiteralPrefix(variable, "ENV{") && variable.size() > 5) {
// what is the variable name
char* envVarName = new char[strlen(variable)];
strncpy(envVarName, variable + 4, strlen(variable) - 5);
envVarName[strlen(variable) - 5] = '\0';
auto const& envVarName = variable.substr(4, variable.size() - 5);
#ifdef CMAKE_BUILD_WITH_CMAKE
cmSystemTools::UnsetEnv(envVarName);
cmSystemTools::UnsetEnv(envVarName.c_str());
#endif
delete[] envVarName;
return true;
}
// unset(VAR)