mawei/dragonpilot
1
0
Fork 0
mirror of https://github.com/dragonpilot/dragonpilot.git synced 2026-06-24 23:42:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 190a845505.
This commit is contained in:
Adeeb Shihadeh
2021-06-17 15:02:48 -07:00
parent f01ebc5680
commit 7dec206437
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/common/util.cc
+13 -11
View File
@@ -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) {