Revert "util.cc: refactor read_file (#21295)"

This reverts commit 32dd5c2454e3f3fca028dacd24bc4758e1134295.

old-commit-hash: 7dec206437
commatwo_master
Adeeb Shihadeh 4 years ago
parent e75dc5718c
commit 2476a66cd9
  1. 24
      selfdrive/common/util.cc

@ -54,24 +54,26 @@ int set_core_affinity(int core) {
namespace util {
std::string read_file(const std::string& fn) {
std::ifstream f(fn, std::ios::binary | std::ios::in | std::ios::ate);
if (f) {
int pos = f.tellg();
std::ifstream ifs(fn, std::ios::binary | std::ios::ate);
if (ifs) {
int pos = ifs.tellg();
if (pos > 0) {
std::string result;
result.resize(pos);
f.seekg(0, std::ios::beg);
if (f.read(result.data(), pos)) {
ifs.seekg(0, std::ios::beg);
ifs.read(result.data(), pos);
if (ifs) {
return result;
}
} else {
// fallback for files created on read, e.g. procfs
std::stringstream buffer;
buffer << f.rdbuf();
return buffer.str();
}
}
return std::string();
ifs.close();
// fallback for files created on read, e.g. procfs
std::ifstream f(fn);
std::stringstream buffer;
buffer << f.rdbuf();
return buffer.str();
}
int read_files_in_dir(const std::string &path, std::map<std::string, std::string> *contents) {

Loading…
Cancel
Save