diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2017-12-04T12·18+0100 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2017-12-04T12·19+0100 |
commit | f1efb97075d301c05f5fe974b9234f2920e83c27 (patch) | |
tree | ff4962c1f6a47c422b35790d0c437a63d9cbc652 /src/nix | |
parent | cd74a55afc31638940d5b6a011afc3a4ebedec9d (diff) |
Fix #1635.
Diffstat (limited to 'src/nix')
-rw-r--r-- | src/nix/search.cc | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/src/nix/search.cc b/src/nix/search.cc index a9dc2d6b924b..87cdb2d7ed8a 100644 --- a/src/nix/search.cc +++ b/src/nix/search.cc @@ -214,13 +214,28 @@ struct CmdSearch : SourceExprCommand, MixJSON } else { + createDirs(dirOf(jsonCacheFileName)); + Path tmpFile = fmt("%s.tmp.%d", jsonCacheFileName, getpid()); - std::ofstream jsonCacheFile(tmpFile); + std::ofstream jsonCacheFile; + + try { + // iostream considered harmful + jsonCacheFile.exceptions(std::ofstream::failbit); + jsonCacheFile.open(tmpFile); - auto cache = writeCache ? std::make_unique<JSONObject>(jsonCacheFile, false) : nullptr; + auto cache = writeCache ? std::make_unique<JSONObject>(jsonCacheFile, false) : nullptr; - doExpr(getSourceExpr(*state), "", true, cache.get()); + doExpr(getSourceExpr(*state), "", true, cache.get()); + + } catch (std::exception &) { + /* Fun fact: catching std::ios::failure does not work + due to C++11 ABI shenanigans. + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66145 */ + if (!jsonCacheFile) + throw Error("error writing to %s", tmpFile); + } if (rename(tmpFile.c_str(), jsonCacheFileName.c_str()) == -1) throw SysError("cannot rename '%s' to '%s'", tmpFile, jsonCacheFileName); |