9c7360f HBSD: Resolve merge conflict — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

HBSD: Resolve merge conflict

Shawn Webb committed 3 years ago

commit 9c7360f2656e1b72962dbbaedaa6afc4b89e7013
parent fa6223f

1 file changed +3 -10

modified libpkg/pkg_add.c

@@ -627,16 +627,6 @@ open_tempfile(int rootfd, const char *path, int perm)

 {
 	int fd;
 	bool tried_mkdir = false;
 <<<<<<< HEAD
 	size_t len;
 	char buf[32768];
 	const char *attrname;
 	void *attrval;
 	size_t attrsz;
 	hidden_tempfile(f->temppath, sizeof(f->temppath), f->path);
 =======
 >>>>>>> upstream-master
 retry:
 	fd = openat(rootfd, RELATIVE_PATH(path), O_CREAT|O_WRONLY|O_EXCL, perm);

@@ -661,6 +651,9 @@ create_regfile(struct pkg *pkg, struct pkg_file *f, struct archive *a,

 	char buf[32768];
 	char *path;
 	struct tempdir *tmpdir = NULL;
 	const char *attrname;
 	void *attrval;
 	size_t attrsz;
 	tmpdir = get_tempdir(pkg->rootfd, f->path, tempdirs);
 	if (tmpdir == NULL && errno == 0)