NixOS/nix
NixOS/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2024-09-19 10:50:24 -04:00
Code Activity

tweak unpack channel built-in, std::filesystem::path for tarball

Browse source
This commit is contained in:
John Ericson 2024-09-11 11:59:11 -04:00
parent 04ce0e648a
commit 193dc49097
3 changed files with 37 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/libstore/builtins/unpack-channel.cc
View file

@ -3,46 +3,52 @@
namespace nix { namespace nix {
namespace fs { using namespace std::filesystem; }
void builtinUnpackChannel( void builtinUnpackChannel(
const BasicDerivation & drv, const BasicDerivation & drv,
const std::map<std::string, Path> & outputs) const std::map<std::string, Path> & outputs)
{ {
auto getAttr = [&](const std::string & name) { auto getAttr = [&](const std::string & name) -> const std::string & {
auto i = drv.env.find(name); auto i = drv.env.find(name);
if (i == drv.env.end()) throw Error("attribute '%s' missing", name); if (i == drv.env.end()) throw Error("attribute '%s' missing", name);
return i->second; return i->second;
}; };
std::filesystem::path out(outputs.at("out")); fs::path out{outputs.at("out")};
std::filesystem::path channelName(getAttr("channelName")); auto & channelName = getAttr("channelName");
auto src = getAttr("src"); auto & src = getAttr("src");
if (channelName.filename() != channelName) { if (fs::path{channelName}.filename().string() != channelName) {
throw Error("channelName is not allowed to contain filesystem seperators, got %1%", channelName); throw Error("channelName is not allowed to contain filesystem seperators, got %1%", channelName);
} }
createDirs(out); try {
fs::create_directories(out);
} catch (fs::filesystem_error &) {
throw SysError("creating directory '%1%'", out.string());
}
unpackTarfile(src, out); unpackTarfile(src, out);
size_t fileCount; size_t fileCount;
std::string fileName; std::string fileName;
try { try {
auto entries = std::filesystem::directory_iterator{out}; auto entries = fs::directory_iterator{out};
fileName = entries->path().string(); fileName = entries->path().string();
fileCount = std::distance(std::filesystem::begin(entries), std::filesystem::end(entries)); fileCount = std::distance(fs::begin(entries), fs::end(entries));
} catch (std::filesystem::filesystem_error &e) { } catch (fs::filesystem_error &) {
throw SysError("failed to read directory %1%", out); throw SysError("failed to read directory %1%", out.string());
} }
if (fileCount != 1) if (fileCount != 1)
throw Error("channel tarball '%s' contains more than one file", src); throw Error("channel tarball '%s' contains more than one file", src);
std::filesystem::path target(out / channelName);
auto target = out / channelName;
try { try {
std::filesystem::rename(fileName, target); fs::rename(fileName, target);
} catch (std::filesystem::filesystem_error &e) { } catch (fs::filesystem_error &) {
throw SysError("failed to rename %1% to %2%", fileName, target); throw SysError("failed to rename %1% to %2%", fileName, target.string());
} }
} }

22
src/libutil/tarfile.cc
View file

@ -8,6 +8,10 @@
namespace nix { namespace nix {
namespace fs {
using namespace std::filesystem;
}
namespace { namespace {
int callback_open(struct archive *, void * self) int callback_open(struct archive *, void * self)
@ -102,14 +106,14 @@ TarArchive::TarArchive(Source & source, bool raw, std::optional<std::string> com
"Failed to open archive (%s)"); "Failed to open archive (%s)");
} }
TarArchive::TarArchive(const Path & path) TarArchive::TarArchive(const fs::path & path)
: archive{archive_read_new()} : archive{archive_read_new()}
, buffer(defaultBufferSize) , buffer(defaultBufferSize)
{ {
archive_read_support_filter_all(archive); archive_read_support_filter_all(archive);
enableSupportedFormats(archive); enableSupportedFormats(archive);
archive_read_set_option(archive, NULL, "mac-ext", NULL); archive_read_set_option(archive, NULL, "mac-ext", NULL);
check(archive_read_open_filename(archive, path.c_str(), 16384), "failed to open archive: %s"); check(archive_read_open_filename(archive, path.string().c_str(), 16384), "failed to open archive: %s");
} }
void TarArchive::close() void TarArchive::close()
@ -123,7 +127,7 @@ TarArchive::~TarArchive()
archive_read_free(this->archive); archive_read_free(this->archive);
} }
static void extract_archive(TarArchive & archive, const Path & destDir) static void extract_archive(TarArchive & archive, const fs::path & destDir)
{ {
int flags = ARCHIVE_EXTRACT_TIME | ARCHIVE_EXTRACT_SECURE_SYMLINKS | ARCHIVE_EXTRACT_SECURE_NODOTDOT; int flags = ARCHIVE_EXTRACT_TIME | ARCHIVE_EXTRACT_SECURE_SYMLINKS | ARCHIVE_EXTRACT_SECURE_NODOTDOT;
@ -140,7 +144,7 @@ static void extract_archive(TarArchive & archive, const Path & destDir)
else else
archive.check(r); archive.check(r);
archive_entry_copy_pathname(entry, (destDir + "/" + name).c_str()); archive_entry_copy_pathname(entry, (destDir / name).string().c_str());
// sources can and do contain dirs with no rx bits // sources can and do contain dirs with no rx bits
if (archive_entry_filetype(entry) == AE_IFDIR && (archive_entry_mode(entry) & 0500) != 0500) if (archive_entry_filetype(entry) == AE_IFDIR && (archive_entry_mode(entry) & 0500) != 0500)
@ -149,7 +153,7 @@ static void extract_archive(TarArchive & archive, const Path & destDir)
// Patch hardlink path // Patch hardlink path
const char * original_hardlink = archive_entry_hardlink(entry); const char * original_hardlink = archive_entry_hardlink(entry);
if (original_hardlink) { if (original_hardlink) {
archive_entry_copy_hardlink(entry, (destDir + "/" + original_hardlink).c_str()); archive_entry_copy_hardlink(entry, (destDir / original_hardlink).string().c_str());
} }
archive.check(archive_read_extract(archive.archive, entry, flags)); archive.check(archive_read_extract(archive.archive, entry, flags));
@ -158,19 +162,19 @@ static void extract_archive(TarArchive & archive, const Path & destDir)
archive.close(); archive.close();
} }
void unpackTarfile(Source & source, const Path & destDir) void unpackTarfile(Source & source, const fs::path & destDir)
{ {
auto archive = TarArchive(source); auto archive = TarArchive(source);
createDirs(destDir); fs::create_directories(destDir);
extract_archive(archive, destDir); extract_archive(archive, destDir);
} }
void unpackTarfile(const Path & tarFile, const Path & destDir) void unpackTarfile(const fs::path & tarFile, const fs::path & destDir)
{ {
auto archive = TarArchive(tarFile); auto archive = TarArchive(tarFile);
createDirs(destDir); fs::create_directories(destDir);
extract_archive(archive, destDir); extract_archive(archive, destDir);
} }

6
src/libutil/tarfile.hh
View file

@ -15,7 +15,7 @@ struct TarArchive
void check(int err, const std::string & reason = "failed to extract archive (%s)"); void check(int err, const std::string & reason = "failed to extract archive (%s)");
explicit TarArchive(const Path & path); explicit TarArchive(const std::filesystem::path & path);
/// @brief Create a generic archive from source. /// @brief Create a generic archive from source.
/// @param source - Input byte stream. /// @param source - Input byte stream.
@ -37,9 +37,9 @@ struct TarArchive
int getArchiveFilterCodeByName(const std::string & method); int getArchiveFilterCodeByName(const std::string & method);
void unpackTarfile(Source & source, const Path & destDir); void unpackTarfile(Source & source, const std::filesystem::path & destDir);
void unpackTarfile(const Path & tarFile, const Path & destDir); void unpackTarfile(const std::filesystem::path & tarFile, const std::filesystem::path & destDir);
time_t unpackTarfileToSink(TarArchive & archive, ExtendedFileSystemObjectSink & parseSink); time_t unpackTarfileToSink(TarArchive & archive, ExtendedFileSystemObjectSink & parseSink);