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

ZipInputAccessor: Improve error messages

Browse source
This commit is contained in:
Eelco Dolstra 2022-09-02 16:25:04 +02:00
parent 7c1bdff9f2
commit c0dd35a65f
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/libfetchers/zip-input-accessor.cc
View file

@ -89,12 +89,12 @@ struct ZipInputAccessor : InputAccessor
{ {
auto i = members.find(((std::string) path.abs()).c_str()); auto i = members.find(((std::string) path.abs()).c_str());
if (i == members.end()) if (i == members.end())
throw Error("file '%s' does not exist", path); throw Error("file '%s' does not exist", showPath(path));
ZipMember member(zip_fopen_index(zipFile, i->second.index, 0)); ZipMember member(zip_fopen_index(zipFile, i->second.index, 0));
if (!member) if (!member)
throw Error("couldn't open archive member '%s' in '%s': %s", throw Error("couldn't open archive member '%s': %s",
path, zipPath, zip_strerror(zipFile)); showPath(path), zip_strerror(zipFile));
std::string buf(i->second.size, 0); std::string buf(i->second.size, 0);
if (zip_fread(member, buf.data(), i->second.size) != (zip_int64_t) i->second.size) if (zip_fread(member, buf.data(), i->second.size) != (zip_int64_t) i->second.size)
@ -132,14 +132,14 @@ struct ZipInputAccessor : InputAccessor
type = tDirectory; type = tDirectory;
} }
if (i == members.end()) if (i == members.end())
throw Error("file '%s' does not exist", path); throw Error("file '%s' does not exist", showPath(path));
// FIXME: cache this // FIXME: cache this
zip_uint8_t opsys; zip_uint8_t opsys;
zip_uint32_t attributes; zip_uint32_t attributes;
if (zip_file_get_external_attributes(zipFile, i->second.index, ZIP_FL_UNCHANGED, &opsys, &attributes) == -1) if (zip_file_get_external_attributes(zipFile, i->second.index, ZIP_FL_UNCHANGED, &opsys, &attributes) == -1)
throw Error("couldn't get external attributes of '%s' in '%s': %s", throw Error("couldn't get external attributes of '%s': %s",
path, zipPath, zip_strerror(zipFile)); showPath(path), zip_strerror(zipFile));
switch (opsys) { switch (opsys) {
case ZIP_OPSYS_UNIX: case ZIP_OPSYS_UNIX:
@ -152,7 +152,7 @@ struct ZipInputAccessor : InputAccessor
break; break;
case 0120000: type = tSymlink; break; case 0120000: type = tSymlink; break;
default: default:
throw Error("file '%s' in '%s' has unsupported type %o", path, zipPath, t); throw Error("file '%s' has unsupported type %o", showPath(path), t);
} }
break; break;
} }
@ -167,7 +167,7 @@ struct ZipInputAccessor : InputAccessor
auto i = members.find(path.c_str()); auto i = members.find(path.c_str());
if (i == members.end()) if (i == members.end())
throw Error("directory '%s' does not exist", path); throw Error("directory '%s' does not exist", showPath(_path));
++i; ++i;
@ -187,7 +187,7 @@ struct ZipInputAccessor : InputAccessor
std::string readLink(const CanonPath & path) override std::string readLink(const CanonPath & path) override
{ {
if (lstat(path).type != tSymlink) if (lstat(path).type != tSymlink)
throw Error("file '%s' is not a symlink"); throw Error("file '%s' is not a symlink", showPath(path));
return _readFile(path); return _readFile(path);
} }