riscv
/
OpenFPGA
mirror of https://github.com/lnis-uofu/OpenFPGA.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #57 from LNIS-Projects/dev 

Bug fix in the line parser when dealing with empty inputs for Centos 8 which is strict on this
This commit is contained in:
Laboratory for Nano Integrated Systems (LNIS) 2020-06-25 11:59:27 -06:00 committed by GitHub
parent 2c3eb71d00 b36da17a08
commit 2602f380a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libopenfpga/libopenfpgashell/src/shell.tpp
View File

@ -296,6 +296,11 @@ void Shell<T>::run_script_mode(const char* script_file_name, T& context) {
/* Read line by line */
while (getline(fp, line)) {
/* Skip empty line */
if (true == line.empty()) {
continue;
}
/* If the line that starts with '#', it is commented, we can skip */
if ('#' == line.front()) {
continue;

13
libopenfpga/libopenfpgautil/src/openfpga_digest.cpp
View File

@ -58,6 +58,11 @@ std::string format_dir_path(const std::string& dir_path_to_format) {
char legal_back_slash = '\\';
#endif
/* Return an empty string if the input is empty */
if (true == formatted_dir_path.empty()) {
return formatted_dir_path;
}
/* Replace "\" with "/" */
std::replace(formatted_dir_path.begin(), formatted_dir_path.end(), illegal_back_slash, legal_back_slash);
@ -123,8 +128,8 @@ bool create_dir_path(const std::string& dir_path,
const bool& verbose) {
/* Give up if the path is empty */
if (true == dir_path.empty()) {
VTR_LOG_ERROR("Directory path is empty and nothing will be created.\n");
return false;
VTR_LOG_WARN("Directory path is empty and nothing will be created.\n");
return true;
}
/* Try to create a directory */
@ -170,8 +175,8 @@ static
bool rec_create_dir_path(const std::string& dir_path) {
/* Give up if the path is empty */
if (true == dir_path.empty()) {
VTR_LOG_ERROR("Directory path is empty and nothing will be created.\n");
return false;
VTR_LOG_WARN("Directory path is empty and nothing will be created.\n");
return true;
}
/* Try to find the positions of all the slashes