maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make $NIX_PATH parsing more robust

Browse source
This commit is contained in:
Eelco Dolstra 2016-04-14 17:25:49 +02:00
parent c045630522
commit 5169a6da98
1 changed files with 32 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/libexpr/eval.cc
View file

@ -5,6 +5,7 @@
#include "derivations.hh" #include "derivations.hh"
#include "globals.hh" #include "globals.hh"
#include "eval-inline.hh" #include "eval-inline.hh"
#include "download.hh"
#include <algorithm> #include <algorithm>
#include <cstring> #include <cstring>
@ -238,12 +239,38 @@ void initGC()
/* Very hacky way to parse $NIX_PATH, which is colon-separated, but /* Very hacky way to parse $NIX_PATH, which is colon-separated, but
can contain URLs (e.g. "nixpkgs=https://bla...:foo=https://"). */ can contain URLs (e.g. "nixpkgs=https://bla...:foo=https://"). */
static Strings parseNixPath(const string & in) static Strings parseNixPath(const string & s)
{ {
string marker = "\001//"; Strings res;
auto res = tokenizeString<Strings>(replaceStrings(in, "://", marker), ":");
for (auto & s : res) auto p = s.begin();
s = replaceStrings(s, marker, "://");
while (p != s.end()) {
auto start = p;
auto start2 = p;
while (p != s.end() && *p != ':') {
if (*p == '=') start2 = p + 1;
++p;
}
if (p == s.end()) {
if (p != start) res.push_back(std::string(start, p));
break;
}
if (*p == ':') {
if (isUri(std::string(start2, s.end()))) {
++p;
while (p != s.end() && *p != ':') ++p;
}
res.push_back(std::string(start, p));
if (p == s.end()) break;
}
++p;
}
return res; return res;
} }