Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 40173db
Ensure we are picking the exact temp directory
Baptiste Daroussin committed 3 years ago
commit 40173db3c8cfb47b5fad4d5f79e869c31775e7a4
parent 3ec1926
1 file changed +4 -4
modified libpkg/pkg_add.c
@@ -324,7 +324,7 @@ create_dir(struct pkg *pkg, struct pkg_dir *d, tempdirs_t *tempdirs __unused)
	const char *path;



	tll_foreach(*tempdirs, t) {
- 
		if (strncmp(t->item->name, d->path, t->item->len) == 0) {
+ 
		if (strncmp(t->item->name, d->path, t->item->len) == 0 && d->path[t->item->len] == '/') {

			tmpdir = t->item;

			break;

		}
@@ -422,7 +422,7 @@ create_symlinks(struct pkg *pkg, struct pkg_file *f, const char *target, tempdir
	bool tried_mkdir = false;



	tll_foreach(*tempdirs, t) {
- 
		if (strncmp(t->item->name, f->path, t->item->len) == 0) {
+ 
		if (strncmp(t->item->name, f->path, t->item->len) == 0 &&  f->path[t->item->len] == '/') {

			tmpdir = t->item;

			break;

		}
@@ -507,7 +507,7 @@ create_hardlink(struct pkg *pkg, struct pkg_file *f, const char *path, tempdirs_
	struct tempdir *tmpdir = NULL;



	tll_foreach(*tempdirs, t) {
- 
		if (strncmp(t->item->name, f->path, t->item->len) == 0) {
+ 
		if (strncmp(t->item->name, f->path, t->item->len) == 0 && f->path[t->item->len] == '/' ) {

			tmpdir = t->item;

			break;

		}
@@ -611,7 +611,7 @@ create_regfile(struct pkg *pkg, struct pkg_file *f, struct archive *a,
	struct tempdir *tmpdir = NULL;



	tll_foreach(*tempdirs, t) {
- 
		if (strncmp(t->item->name, f->path, t->item->len) == 0) {
+ 
		if (strncmp(t->item->name, f->path, t->item->len) == 0 && f->path[t->item->len] == '/') {

			tmpdir = t->item;

			break;

		}