riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up `exec` code according to review. 

Co-Authored-By: Miodrag Milanović <mmicko@gmail.com>
This commit is contained in:
Alberto Gonzalez 2020-03-16 16:42:04 +00:00
parent a09b260c01
commit cbc5664d37
No known key found for this signature in database
GPG Key ID: 8395A8BA109708B2
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
passes/cmds/exec.cc
View File

@ -20,7 +20,16 @@
#include "kernel/register.h" #include "kernel/register.h"
#include "kernel/log.h" #include "kernel/log.h"
#include <cstdio> #include <cstdio>
#if defined(_WIN32)
# define WIFEXITED(x) 1
# define WIFSIGNALED(x) 0
# define WIFSTOPPED(x) 0
# define WEXITSTATUS(x) ((x) & 0xff)
# define WTERMSIG(x) SIGTERM
#else
# include <sys/wait.h> # include <sys/wait.h>
#endif
USING_YOSYS_NAMESPACE USING_YOSYS_NAMESPACE
PRIVATE_NAMESPACE_BEGIN PRIVATE_NAMESPACE_BEGIN
@ -63,7 +72,7 @@ struct ExecPass : public Pass {
void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE
{ {
std::string cmd = ""; std::string cmd = "";
char buf[4096] = {}; char buf[1024] = {};
std::string linebuf = ""; std::string linebuf = "";
bool flag_cmd = false; bool flag_cmd = false;
bool flag_quiet = false; bool flag_quiet = false;
@ -139,7 +148,11 @@ struct ExecPass : public Pass {
fflush(stdout); fflush(stdout);
bool keep_reading = true; bool keep_reading = true;
auto *f = popen(cmd.c_str(), "r"); int status = 0;
int retval = 0;
#ifndef EMSCRIPTEN
FILE *f = popen(cmd.c_str(), "r");
if (f == nullptr) if (f == nullptr)
log_cmd_error("errno %d after popen() returned NULL.\n", errno); log_cmd_error("errno %d after popen() returned NULL.\n", errno);
while (keep_reading) { while (keep_reading) {
@ -162,8 +175,8 @@ struct ExecPass : public Pass {
pos = linebuf.find('\n'); pos = linebuf.find('\n');
} }
} }
int status = pclose(f); status = pclose(f);
int retval = -1; #endif
if(WIFEXITED(status)) { if(WIFEXITED(status)) {
retval = WEXITSTATUS(status); retval = WEXITSTATUS(status);