max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-15 02:36:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve badArchive()

Browse source
This commit is contained in:
Eelco Dolstra 2024-09-12 15:27:55 +02:00
parent 421aa1add1
commit 4de9587e50
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/libutil/archive.cc
View file

@ -128,9 +128,10 @@ void dumpString(std::string_view s, Sink & sink)
} }
static SerialisationError badArchive(const std::string & s) template<typename... Args>
static SerialisationError badArchive(std::string_view s, const Args & ... args)
{ {
return SerialisationError("bad archive: " + s); return SerialisationError("bad archive: " + s, args...);
} }
@ -223,7 +224,7 @@ static void parse(FileSystemObjectSink & sink, Source & source, const CanonPath
std::string name; std::string name;
s = getString(); s = getString();
if (s != "(") throw badArchive("expected open tag"); if (s != "(") throw badArchive("expected open tag '%s'", s);
while (1) { while (1) {
s = getString(); s = getString();
@ -233,9 +234,9 @@ static void parse(FileSystemObjectSink & sink, Source & source, const CanonPath
} else if (s == "name") { } else if (s == "name") {
name = getString(); name = getString();
if (name.empty() || name == "." || name == ".." || name.find('/') != std::string::npos || name.find((char) 0) != std::string::npos) if (name.empty() || name == "." || name == ".." || name.find('/') != std::string::npos || name.find((char) 0) != std::string::npos)
throw Error("NAR contains invalid file name '%1%'", name); throw badArchive("NAR contains invalid file name '%1%'", name);
if (name <= prevName) if (name <= prevName)
throw Error("NAR directory is not sorted"); throw badArchive("NAR directory is not sorted");
prevName = name; prevName = name;
if (archiveSettings.useCaseHack) { if (archiveSettings.useCaseHack) {
auto i = names.find(name); auto i = names.find(name);
@ -245,7 +246,7 @@ static void parse(FileSystemObjectSink & sink, Source & source, const CanonPath
name += std::to_string(++i->second); name += std::to_string(++i->second);
auto j = names.find(name); auto j = names.find(name);
if (j != names.end()) if (j != names.end())
throw Error("NAR contains file name '%s' that collides with case-hacked file name '%s'", prevName, j->first); throw badArchive("NAR contains file name '%s' that collides with case-hacked file name '%s'", prevName, j->first);
} else } else
names[name] = 0; names[name] = 0;
} }
@ -253,7 +254,7 @@ static void parse(FileSystemObjectSink & sink, Source & source, const CanonPath
if (name.empty()) throw badArchive("entry name missing"); if (name.empty()) throw badArchive("entry name missing");
parse(sink, source, path / name); parse(sink, source, path / name);
} else } else
throw badArchive("unknown field " + s); throw badArchive("unknown field '%s'", s);
} }
} }
@ -265,7 +266,7 @@ static void parse(FileSystemObjectSink & sink, Source & source, const CanonPath
s = getString(); s = getString();
if (s != "target") if (s != "target")
throw badArchive("expected 'target' got " + s); throw badArchive("expected 'target', got '%s'", s);
std::string target = getString(); std::string target = getString();
sink.createSymlink(path, target); sink.createSymlink(path, target);
@ -274,12 +275,12 @@ static void parse(FileSystemObjectSink & sink, Source & source, const CanonPath
s = getString(); s = getString();
} }
else throw badArchive("unknown file type " + t); else throw badArchive("unknown file type '%s'", t);
} }
else else
throw badArchive("unknown field " + s); throw badArchive("unknown field '%s'", s);
} }
} }