Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › ff3f708
Convert the handling of the stage in plist parsing to *at functions, this reduces the code complexity and avoid useless memory manipulations
Baptiste Daroussin committed 6 years ago
commit ff3f70891a2a558f88a9cbfab07044351cd8a818
parent 8dd464b
2 files changed +24 -23
modified libpkg/pkg_ports.c
@@ -224,8 +224,7 @@ static int
dir(struct plist *p, char *line, struct file_attr *a)

{

	char path[MAXPATHLEN+1];
- 
	char stagedpath[MAXPATHLEN];
- 
	char *testpath, *cp;
+ 
	char *cp;

	struct stat st;

	int ret = EPKG_OK;
@@ -241,15 +240,10 @@ dir(struct plist *p, char *line, struct file_attr *a)
		snprintf(path, sizeof(path), "%s%s%s/", p->prefix, p->slash,

		    line);
- 
	testpath = path;
-
- 
	if (p->stage != NULL) {
- 
		snprintf(stagedpath, sizeof(stagedpath), "%s%s", p->stage, path);
- 
		testpath = stagedpath;
- 
	}
-
- 
	if (lstat(testpath, &st) == -1) {
- 
		pkg_emit_errno("lstat", testpath);
+ 
	if (fstatat(p->stagefd, RELATIVE_PATH(path), &st, AT_SYMLINK_NOFOLLOW)
+ 
	    == -1) {
+ 
		pkg_errno("Unable to access file %s%s",
+ 
		    p->stage ? p->stage: "/", RELATIVE_PATH(path));

		if (p->stage != NULL)

			ret = EPKG_FATAL;

		if (ctx.developer_mode) {
@@ -297,8 +291,6 @@ meta_file(struct plist *p, char *line, struct file_attr *a, bool is_config)
{

	size_t len;

	char path[MAXPATHLEN];
- 
	char stagedpath[MAXPATHLEN];
- 
	char *testpath;

	struct stat st;

	char *buf = NULL;

	bool regular = false;
@@ -314,15 +306,11 @@ meta_file(struct plist *p, char *line, struct file_attr *a, bool is_config)
	else

		snprintf(path, sizeof(path), "%s%s%s", p->prefix,

		    p->slash, line);
- 
	testpath = path;
-
- 
	if (p->stage != NULL) {
- 
		snprintf(stagedpath, sizeof(stagedpath), "%s%s", p->stage, path);
- 
		testpath = stagedpath;
- 
	}
- 
	if (lstat(testpath, &st) == -1) {
- 
		pkg_errno("Unable to access file %s", testpath);
+ 
	if (fstatat(p->stagefd, RELATIVE_PATH(path), &st, AT_SYMLINK_NOFOLLOW)
+ 
	    == -1) {
+ 
		pkg_errno("Unable to access file %s%s",
+ 
		    p->stage ? p->stage : "/", RELATIVE_PATH(path));

		if (p->stage != NULL)

			ret = EPKG_FATAL;

		if (ctx.developer_mode) {
@@ -343,7 +331,8 @@ meta_file(struct plist *p, char *line, struct file_attr *a, bool is_config)
	} else if (S_ISLNK(st.st_mode))

		regular = false;
- 
	buf = pkg_checksum_generate_file(testpath, PKG_HASH_TYPE_SHA256_HEX);
+ 
	buf = pkg_checksum_generate_fileat(p->stagefd, RELATIVE_PATH(path),
+ 
	    PKG_HASH_TYPE_SHA256_HEX);

	if (buf == NULL) {

		return (EPKG_FATAL);

	}
@@ -353,7 +342,8 @@ meta_file(struct plist *p, char *line, struct file_attr *a, bool is_config)
		if (is_config) {

			off_t sz;

			char *content;
- 
			file_to_buffer(testpath, &content, &sz);
+ 
			file_to_bufferat(p->stagefd, RELATIVE_PATH(path),
+ 
			    &content, &sz);

			pkg_addconfig_file(p->pkg, path, content);

			free(content);

		}
@@ -1206,11 +1196,18 @@ plist_new(struct pkg *pkg, const char *stage)
	if (p == NULL)

		return (NULL);
+ 
	p->stagefd = open(stage ? stage : "/", O_DIRECTORY | O_CLOEXEC);
+ 
	if (p->stagefd == -1) {
+ 
		free(p);
+ 
		return (NULL);
+ 
	}
+ 


	p->pkg = pkg;

	if (pkg->prefix != NULL)

		strlcpy(p->prefix, pkg->prefix, sizeof(p->prefix));

	p->slash = p->prefix[strlen(p->prefix) - 1] == '/' ? "" : "/";

	p->stage = stage;
+ 


	p->uname = xstrdup("root");

	p->gname = xstrdup("wheel");
@@ -1233,6 +1230,9 @@ plist_free(struct plist *p)
	if (p == NULL)

		return;
+ 
	if (p->stagefd != -1)
+ 
		close(p->stagefd);
+ 


	HASH_FREE(p->keywords, keyword_free);



	free(p->pkgdep);
modified libpkg/private/pkg.h
@@ -584,6 +584,7 @@ struct keyword {
struct plist {

	char last_file[MAXPATHLEN];

	const char *stage;
+ 
	int stagefd;

	char prefix[MAXPATHLEN];

	UT_string *pre_install_buf;

	UT_string *post_install_buf;