fix regression

Author: ckrause

CHANGELOG.md

@@ -2,6 +2,8 @@ To install or update LODA, please follow the [installation instructions](https:/
 
 ## [Unreleased]
 
+# v22.6.6
+
 ### Bugfixes
 
 * Fix basic validation for updated programs

src/api_client.cpp

@@ -24,7 +24,9 @@ ApiClient::ApiClient()
   } else {
     Log::get().info("Using configured API server: " + server);
   }
-  ensureTrailingSlash(server);
+  if (server.back() != '/') {
+    server += '/';
+  }
   base_url = server + "miner/v1/";
 }
 

src/boinc.cpp

@@ -16,7 +16,7 @@ void Boinc::run() {
     Log::get().error("PROJECT_DIR environment variable not set", true);
   }
   std::string slot_dir(project_env);
-  ensureTrailingSlash(slot_dir);
+  ensureTrailingFileSep(slot_dir);
 
   // read slot init data
   auto init_data = readXML(slot_dir + "init_data.xml");
@@ -27,7 +27,7 @@ void Boinc::run() {
     Log::get().error("Invalid project data: " + slot_dir + "init_data.xml",
                      true);
   }
-  ensureTrailingSlash(project_dir);
+  ensureTrailingFileSep(project_dir);
 
   // log debugging info
   Log::get().info("Platform: " + Version::PLATFORM +

src/file.cpp

@@ -129,7 +129,7 @@ void fixWindowsEnv() {
   if (p) {
     program_files = std::string(p);
   }
-  ensureTrailingSlash(program_files);
+  ensureTrailingFileSep(program_files);
   bool update = false;
   if (path.find("Git\\cmd") == std::string::npos) {
     if (!path.empty()) {
@@ -188,7 +188,7 @@ void makeExecutable(const std::string &path) {
 #endif
 }
 
-void ensureTrailingSlash(std::string &dir) {
+void ensureTrailingFileSep(std::string &dir) {
   if (dir.back() != FILE_SEP) {
     dir += FILE_SEP;
   }
@@ -327,7 +327,7 @@ size_t getMemUsage() {
 
 FolderLock::FolderLock(std::string folder) {
   // obtain lock
-  ensureTrailingSlash(folder);
+  ensureTrailingFileSep(folder);
   ensureDir(folder);
   lockfile = folder + "lock";
   fd = 0;

src/include/file.hpp

@@ -32,7 +32,7 @@ void git(const std::string &folder, const std::string &args);
 
 void makeExecutable(const std::string &path);
 
-void ensureTrailingSlash(std::string &dir);
+void ensureTrailingFileSep(std::string &dir);
 
 std::string getHomeDir();
 

src/setup.cpp

@@ -69,7 +69,7 @@ std::string Setup::getLodaHomeNoCheck() {
   } else {
     result = getHomeDir() + FILE_SEP + "loda" + FILE_SEP;
   }
-  ensureTrailingSlash(result);
+  ensureTrailingFileSep(result);
   return result;
 }
 
@@ -82,7 +82,7 @@ const std::string& Setup::getLodaHome() {
 
 void Setup::setLodaHome(const std::string& home) {
   LODA_HOME = home;
-  ensureTrailingSlash(LODA_HOME);
+  ensureTrailingFileSep(LODA_HOME);
   checkDir(LODA_HOME);
   Log::get().info("Using LODA home directory \"" + LODA_HOME + "\"");
 }
@@ -126,7 +126,7 @@ void Setup::setMinersConfig(const std::string& loda_config) {
 const std::string& Setup::getOeisHome() {
   if (OEIS_HOME.empty()) {
     OEIS_HOME = getLodaHome() + "oeis" + FILE_SEP;
-    ensureTrailingSlash(OEIS_HOME);
+    ensureTrailingFileSep(OEIS_HOME);
     ensureDir(OEIS_HOME);
   }
   return OEIS_HOME;
@@ -142,7 +142,7 @@ const std::string& Setup::getProgramsHome() {
 void Setup::setProgramsHome(const std::string& home) {
   PROGRAMS_HOME = home;
   checkDir(PROGRAMS_HOME);
-  ensureTrailingSlash(PROGRAMS_HOME);
+  ensureTrailingFileSep(PROGRAMS_HOME);
   checkDir(PROGRAMS_HOME);
 }
 
@@ -399,7 +399,7 @@ void Setup::checkLodaHome() {
   if (!line.empty()) {
     LODA_HOME = line;
   }
-  ensureTrailingSlash(LODA_HOME);
+  ensureTrailingFileSep(LODA_HOME);
   ensureDir(LODA_HOME);
 }
 

src/stats.cpp

@@ -16,7 +16,7 @@ Stats::Stats()
       num_ops_per_type(Operation::Types.size(), 0) {}
 
 void Stats::load(std::string path) {
-  ensureTrailingSlash(path);
+  ensureTrailingFileSep(path);
   Log::get().debug("Loading program stats from " + path);
 
   const std::string sep(",");
@@ -213,7 +213,7 @@ void Stats::load(std::string path) {
 }
 
 void Stats::save(std::string path) {
-  ensureTrailingSlash(path);
+  ensureTrailingFileSep(path);
   Log::get().debug("Saving program stats to " + path);
 
   const std::string sep(",");
@@ -307,7 +307,7 @@ void Stats::save(std::string path) {
 }
 
 std::string Stats::getMainStatsFile(std::string path) const {
-  ensureTrailingSlash(path);
+  ensureTrailingFileSep(path);
   path += "constant_counts.csv";
   return path;
 }

src/test.cpp

@@ -904,7 +904,7 @@ void Test::stats() {
 
   // save & reload stats
   std::string dir = getTmpDir() + "stats2";
-  ensureTrailingSlash(dir);
+  ensureTrailingFileSep(dir);
   ensureDir(dir);
   s.save(dir);
   t.load(dir);