Fix relative path support in config

Author: McSinyx

examples/engagement1/if-condition/repair.conf

@@ -1,10 +1,10 @@
-revision_file=/root/project/MSV/examples/engagement1/if-condition/revision.log
-src_dir=/root/project/MSV/examples/engagement1/if-condition/src
-test_dir=/root/project/MSV/examples/engagement1/if-condition/tests
-build_cmd=/root/project/MSV/tools/simple-build.py
-test_cmd=/root/project/MSV/tools/simple-test.py
-ddtest_cmd=/root/project/MSV/tools/DD.py
-tools_dir=/root/project/MSV/tools
+revision_file=revision.log
+src_dir=src
+test_dir=tests
+build_cmd=../../../tools/simple-build.py
+test_cmd=../../../tools/simple-test.py
+ddtest_cmd=../../../tools/DD.py
+tools_dir=../../../tools
 localizer=profile
 bugged_file=test.c
 fixed_out_file=fixed_

examples/engagement1/off-by-one/repair.conf

@@ -1,10 +1,10 @@
-revision_file=/root/project/MSV/examples/engagement1/off-by-one/revision.log
-src_dir=/root/project/MSV/examples/engagement1/off-by-one/src
-test_dir=/root/project/MSV/examples/engagement1/off-by-one/tests
-build_cmd=/root/project/MSV/tools/simple-build.py
-test_cmd=/root/project/MSV/tools/simple-test.py
-ddtest_cmd=/root/project/MSV/tools/DD.py
-tools_dir=/root/project/MSV/tools
+revision_file=revision.log
+src_dir=src
+test_dir=tests
+build_cmd=../../../tools/simple-build.py
+test_cmd=../../../tools/simple-test.py
+ddtest_cmd=../../../tools/DD.py
+tools_dir=../../../tools
 localizer=profile
 bugged_file=prog.c
 fixed_out_file=fixed_

src/BenchProgram.cpp

@@ -164,9 +164,13 @@ ConfigFile* BenchProgram::getCurrentConfig() {
 
 void BenchProgram::createSrcClone(const std::string &subDir) {
     assert( src_dirs.count(subDir) == 0);
-    std::string copy = "cp -rf ";
+    // The path name of the original src_directory from the config file
+    // This must be present in the file system ortherwise, we will hit errors!
+    const std::string ori_src_dir = getFullPath(config.getStr("src_dir"),
+                                                this->work_dir);
+    const std::string copy = "cp -Tfr ";
     std::string cmd=copy;
-    cmd += ori_src_dir + " " + work_dir + "/" + subDir;
+    cmd += ori_src_dir + " " + this->work_dir + "/" + subDir;
     execute_cmd_until_succ(cmd);
 
     cmd=copy;
@@ -243,7 +247,6 @@ void BenchProgram::Init(const std::string &workDirPath, bool no_clean_up,bool in
     test_cnt = 0;
     this->cache = NULL;
     this->no_clean_up = no_clean_up;
-    this->ori_src_dir = config.getStr("src_dir");
     this->wrap_ld = false;
     if (config.hasValue("wrap_ld"))
         this->wrap_ld = (config.getStr("wrap_ld") == "yes");
@@ -282,7 +285,7 @@ void BenchProgram::Init(const std::string &workDirPath, bool no_clean_up,bool in
         // We create an initial clone of the basic src direcotry
         src_dirs.clear();
         createSrcClone("src");
-        this->src_dir = getFullPath(this->work_dir + "/src");
+        this->src_dir = getFullPath("src", this->work_dir);
 
         std::string ori_test_dir = config.getStr("test_dir");
         if (ori_test_dir != "") {
@@ -294,7 +297,7 @@ void BenchProgram::Init(const std::string &workDirPath, bool no_clean_up,bool in
     }
     else {
         this->work_dir = getFullPath(workDirPath);
-        this->src_dir = getFullPath(work_dir + "/src");
+        this->src_dir = getFullPath("src", this->work_dir);
         src_dirs.clear();
         // src_dirs.insert(std::make_pair("src", true));
 
@@ -346,17 +349,18 @@ void BenchProgram::Init(const std::string &workDirPath, bool no_clean_up,bool in
     if (dep_dir != ""){
         dep_dir = getFullPath(dep_dir);
     }
-    this->test_dir = getFullPath(work_dir+"/tests");
+    this->test_dir = getFullPath("tests", this->work_dir);
     this->build_log_file = work_dir + "/build.log";
     // Clean up builg log for every execution
     std::string cmd = std::string("rm -rf ") + build_log_file;
     int ret = system(cmd.c_str());
     assert( ret == 0);
-    this->build_cmd = getFullPath(config.getStr("build_cmd"));
-    this->test_cmd = getFullPath(config.getStr("test_cmd"));
-    this->ddtest_cmd=getFullPath(config.getStr("tools_dir"))+"/DD.py";
-    this->prophet_src=getFullPath(config.getStr("tools_dir"))+"/../src";
-    this->afl_cmd=getFullPath(config.getStr("tools_dir"))+"/run-afl.py";
+    this->build_cmd = getFullPath(config.getStr("build_cmd"), this->work_dir);
+    this->test_cmd = getFullPath(config.getStr("test_cmd"), this->work_dir);
+    this->ddtest_cmd = getFullPath(config.getStr("tools_dir")+"/DD.py",
+                                   this->work_dir);
+    this->prophet_src = getFullPath(config.getStr("tools_dir")+"/../src",
+                                    this->work_dir);
     this->localization_filename = work_dir + "/" + LOCALIZATION_RESULT;
     this->conditionNum=false;
 
@@ -382,7 +386,8 @@ void BenchProgram::Init(const std::string &workDirPath, bool no_clean_up,bool in
         sin >> case_timeout;
     }
 
-    std::string revision_file = config.getStr("revision_file");
+    std::string revision_file = getFullPath(config.getStr("revision_file"),
+                                            this->work_dir);
     parseRevisionLog(revision_file, negative_cases, positive_cases);
 }
 
@@ -483,7 +488,7 @@ bool incrementalBuild(time_t timeout_limit, const std::string &src_dir, const st
 
 bool BenchProgram::buildFull(const std::string &subDir, time_t timeout_limit, bool force_reconf,std::vector<long long> compile_macro,std::vector<std::string> files,std::vector<long long> writer_macro) {
     assert(src_dirs.count(subDir) != 0);
-    std::string src_dir = getFullPath(work_dir + "/" + subDir);
+    std::string src_dir = getFullPath(subDir, this->work_dir);
 
     for (int i=0;i<files.size();i++){
         std::string code;
@@ -1089,7 +1094,7 @@ std::vector<long long> BenchProgram::buildWithRepairedCode(const std::string &wr
             outlog_printf(2,"Search %s!\n",it->first.c_str());
 
             ExecutionTimer timer;
-            std::string src_dir = getFullPath(work_dir + "/src");
+            std::string src_dir = getFullPath("src", this->work_dir);
             removeMacros(fileCodeMap,src_dir);
             std::string cmd;
             cmd=ddtest_cmd+" -l "+build_log_file+" -s "+src_dir;
@@ -1188,7 +1193,7 @@ std::vector<long long> BenchProgram::buildWithRepairedCode(const std::string &wr
                 outlog_printf(2,"Search %s!\n",it->first.c_str());
 
                 ExecutionTimer timer;
-                std::string src_dir = getFullPath(work_dir + "/src");
+                std::string src_dir = getFullPath("src", this->work_dir);
                 removeMacros(fileCodeMap,src_dir);
                 std::string cmd;
                 cmd=ddtest_cmd+" -l "+build_log_file+" -s "+src_dir+" -d "+BuildSubDir.getValue();
@@ -1314,9 +1319,9 @@ BenchProgram::TestCaseSetTy BenchProgram::testSet(const std::string &subDir,
     //     cmd+=" -s "+std::to_string(switchId)+"-"+std::to_string(caseNum);
 
     if (!pass_basic_src_dir)
-        cmd = cmd + " " + getFullPath(work_dir + "/" + subDir) + " " + test_dir + " " + work_dir + " ";
+        cmd = cmd + " " + getFullPath(subDir, this->work_dir) + " " + test_dir + " " + work_dir + " ";
     else
-        cmd = cmd + " -p " + getFullPath(work_dir + "/" + subDir) + " " + src_dir + " " + test_dir + " " + work_dir + " ";
+        cmd = cmd + " -p " + getFullPath(subDir, this->work_dir) + " " + src_dir + " " + test_dir + " " + work_dir + " ";
     std::ostringstream sout;
     sout << cmd;
     for (TestCaseSetTy::const_iterator it = case_set.begin(); it != case_set.end(); it ++)
@@ -1573,4 +1578,4 @@ std::unique_ptr<clang::ASTUnit> BenchProgram::buildClangASTUnit(const std::strin
     std::string cmd = "rm -rf " + work_dir + "/profile";
     int ret = system(cmd.c_str());
     assert( ret == 0);
-}*/
+}*/

src/BenchProgram.h

@@ -506,9 +506,6 @@ class BenchProgram {
     ConfigFile config;
     // The name of the work directory, all paths in this class are absolute paths
     std::string work_dir;
-    // The path name of the original src_directory from the config file
-    // This must be present in the file system ortherwise, we will hit errors!
-    std::string ori_src_dir;
     // The basic src directory path
     std::string src_dir;
     // The set of created src_directories, including the basic source directory,

src/Main.cpp

@@ -205,11 +205,14 @@ int main(int argc, char* argv[]) {
             FP->resetZero(FeatureVector::MAX_FEATURE);
         }
         else {
-            std::ifstream fin(ParameterFile.getValue(), std::ifstream::in);
-            if (fin.is_open()) {
-                fin >> *FP;
-                fin.close();
+            const auto& path = ParameterFile.getValue();
+            std::ifstream fin {path, std::ifstream::in};
+            if (!fin.good()) {
+                outlog_printf(0, "%s: %s\n", strerror(errno), path.c_str());
+                exit(1);
             }
+            fin >> *FP;
+            fin.close();
         }
         learning = true;
     }

src/ProfilerAction.cpp

@@ -27,6 +27,7 @@
 #include <clang/Frontend/FrontendPluginRegistry.h>
 #include <clang/Lex/Lexer.h>
 #include <llvm/Support/raw_ostream.h>
+#include <libexplain/realpath.h>
 #include <sstream>
 #include <fstream>
 #include <assert.h>
@@ -40,11 +41,7 @@ namespace {
 
 std::string getFullPath(const std::string &path) {
     char tmp[PATH_MAX];
-    char * ret = realpath(path.c_str(), tmp);
-    if (ret != 0)
-        return std::string(tmp);
-    else
-        return std::string("unkown_src_file");
+    return std::string(explain_realpath_or_die(path.c_str(), tmp));
 }
 
 typedef std::map<std::string, std::vector<std::string> > RewriteTextMapTy;

src/Utils.cpp

@@ -27,6 +27,7 @@
 #include <sys/stat.h>
 #include <clang/AST/RecursiveASTVisitor.h>
 #include <clang/AST/ASTContext.h>
+#include <libexplain/realpath.h>
 #include <fstream>
 #include <sstream>
 #include <iostream>
@@ -172,13 +173,13 @@ bool is_header(const std::string &str) {
 //    return !((str[str.size() - 2] == '.') && (str[str.size() - 1] == 'c'));
 }
 
-std::string getFullPath(const std::string &path) {
-    // printf("Path: %s\n",path.c_str());
+std::string getFullPath(const std::string &path, const std::string &pwd) {
     if (path[0]=='/') return path;
     char tmp[PATH_MAX];
-    char * ret = realpath(path.c_str(), tmp);
-    if( tmp != 0 ) printf(std::string("fail to get full path of "+path+"\n").c_str());
-    return std::string(tmp);
+    std::string relpath = path;
+    if (!pwd.empty())
+        relpath = pwd + "/" + path;
+    return std::string(explain_realpath_or_die(relpath.c_str(), tmp));
 }
 
 int execute_with_timeout(const std::string &cmd, unsigned long timeout) {

src/Utils.h

@@ -51,7 +51,7 @@ bool exist_directory(const std::string &dir);
 
 bool is_header(const std::string &str);
 
-std::string getFullPath(const std::string &path);
+std::string getFullPath(const std::string &path, const std::string &pwd = "");
 
 std::set<std::string> splitStringWithWhite(const std::string &str);