Skip to content

Use run instead of popen to run ar [blocks: #3867] #3702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 21, 2019
Merged

Use run instead of popen to run ar [blocks: #3867] #3702

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 29 additions & 49 deletions src/goto-cc/compile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@ Date: June 2006
#include <util/config.h>
#include <util/file_util.h>
#include <util/get_base_name.h>
#include <util/run.h>
#include <util/suffix.h>
#include <util/symbol_table_builder.h>
#include <util/tempdir.h>
#include <util/tempfile.h>
#include <util/unicode.h>
#include <util/version.h>

Expand All @@ -47,21 +49,6 @@ Date: June 2006
"size=\"30,40\";"\
"ratio=compress;"

#ifdef _WIN32
#include <util/pragma_push.def>
#ifdef _MSC_VER
#pragma warning(disable:4668)
// using #if/#elif on undefined macro
#pragma warning(disable : 5039)
// pointer or reference to potentially throwing function passed to extern C
#endif
#include <direct.h>
#include <windows.h>
#define popen _popen
#define pclose _pclose
#include <util/pragma_pop.def>
#endif

/// reads and source and object files, compiles and links them into goto program
/// objects.
/// \return true on error, false otherwise
Expand Down Expand Up @@ -221,9 +208,6 @@ bool compilet::add_files_from_archive(
const std::string &file_name,
bool thin_archive)
{
std::stringstream cmd;
FILE *stream;

std::string tstr = working_directory;

if(!thin_archive)
Expand All @@ -234,44 +218,40 @@ bool compilet::add_files_from_archive(
set_current_path(tmp_dirs.back());

// unpack now
cmd << "ar x " << concat_dir_file(working_directory, file_name);

stream=popen(cmd.str().c_str(), "r");
pclose(stream);

cmd.clear();
cmd.str("");
int ret =
run("ar", {"ar", "x", concat_dir_file(working_directory, file_name)});
if(ret != 0)
{
error() << "Failed to extract archive " << file_name << eom;
return true;
}
}

// add the files from "ar t"
cmd << "ar t " << concat_dir_file(working_directory, file_name);

stream = popen(cmd.str().c_str(), "r");

if(stream != nullptr)
temporary_filet tmp_file_out("", "");
int ret = run(
"ar",
{"ar", "t", concat_dir_file(working_directory, file_name)},
"",
tmp_file_out(),
"");
if(ret != 0)
{
std::string line;
int ch; // fgetc returns an int, not char
while((ch = fgetc(stream)) != EOF)
{
if(ch != '\n')
{
line += static_cast<char>(ch);
}
else
{
std::string t = concat_dir_file(tstr, line);
error() << "Failed to list archive " << file_name << eom;
return true;
}

if(is_goto_binary(t))
object_files.push_back(t);
else
debug() << "Object file is not a goto binary: " << line << eom;
std::ifstream in(tmp_file_out());
std::string line;

line = "";
}
}
while(!in.fail() && std::getline(in, line))
{
std::string t = concat_dir_file(tstr, line);

pclose(stream);
if(is_goto_binary(t))
object_files.push_back(t);
else
debug() << "Object file is not a goto binary: " << line << eom;
}

if(!thin_archive)
Expand Down