.

gcontini

2020-10-18 2c0d6d02d1c077f7fbf9f688c37571f99b674e70

 src/library/locate/EnvironmentVarLocation.cpp

@@ -7,9 +7,9 @@

#include <licensecc_properties.h>

#include "../base/FileUtils.hpp"
#include "../base/StringUtils.h"
#include "../base/string_utils.h"
#include "EnvironmentVarLocation.hpp"
#include "../base/file_utils.hpp"

namespace license {
namespace locate {
@@ -22,14 +22,14 @@
const vector<string> EnvironmentVarLocation::license_locations(EventRegistry &eventRegistry) {
   vector<string> licenseFileFoundWithEnvVariable;

   const string varName(LICENSE_LOCATION_ENV_VAR);
   const string varName(LCC_LICENSE_LOCATION_ENV_VAR);
   if (varName.length() > 0) {
      // var name is defined in header files.
      char *env_var_value = getenv(LICENSE_LOCATION_ENV_VAR);
      char *env_var_value = getenv(LCC_LICENSE_LOCATION_ENV_VAR);
      if (env_var_value != nullptr && env_var_value[0] != '\0') {
         const vector<string> declared_positions = license::split_string(string(env_var_value), ';');
         licenseFileFoundWithEnvVariable =
            license::filter_existing_files(declared_positions, eventRegistry, LICENSE_LOCATION_ENV_VAR);
            license::filter_existing_files(declared_positions, eventRegistry, LCC_LICENSE_LOCATION_ENV_VAR);
      } else {
         eventRegistry.addEvent(ENVIRONMENT_VARIABLE_NOT_DEFINED);
      }