Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › e1928d6
hardlinks: add an explicit error in failing case
Baptiste Daroussin committed 2 months ago
commit e1928d6af84fc47a149ec300b667d1f7b7ebf472
parent dc198c7
1 file changed +21 -1
modified libpkg/pkg_add.c
@@ -512,6 +512,11 @@ create_symlinks(struct pkg_add_context *context, struct pkg_file *f, const char
		f->temppath = xstrdup(temppath);

	}

	if (tmpdir == NULL) {
+ 
		if (f->temppath == NULL) {
+ 
			pkg_emit_error("Fail to create symlink %s: "
+ 
			    "no temporary path", f->path);
+ 
			return (EPKG_FATAL);
+ 
		}

		fd = context->rootfd;

		path = f->temppath;

	} else {
@@ -628,6 +633,12 @@ create_hardlink(struct pkg_add_context *context, struct pkg_file *f, const char
		}

	}

	if (tmpdir == NULL) {
+ 
		if (f->temppath == NULL) {
+ 
			close_tempdir(tmpdir);
+ 
			pkg_emit_error("Fail to create hardlink %s: "
+ 
			    "no temporary path", f->path);
+ 
			return (EPKG_FATAL);
+ 
		}

		pathto = f->temppath;

		fd = context->rootfd;

	} else {
@@ -636,6 +647,12 @@ create_hardlink(struct pkg_add_context *context, struct pkg_file *f, const char
	}



	if (tmphdir == NULL) {
+ 
		if (fh->temppath == NULL) {
+ 
			close_tempdir(tmpdir);
+ 
			pkg_emit_error("Fail to create hardlink %s -> %s: "
+ 
			    "no temporary path for source", f->path, path);
+ 
			return (EPKG_FATAL);
+ 
		}

		pathfrom = fh->temppath;

		fdh = context->rootfd;

	} else {
@@ -731,8 +748,11 @@ create_regfile(struct pkg_add_context *context, struct pkg_file *f, struct archi


	if (tmpdir != NULL) {

		fd = open_tempfile(tmpdir->fd, f->path + tmpdir->len, f->perm);
+ 
	} else if (f->temppath != NULL) {
+ 
		fd = open_tempfile(context->rootfd, f->temppath, f->perm);

	} else {
- 
		fd = open_tempfile(context->rootfd, f->temppath,  f->perm);
+ 
		pkg_emit_error("Fail to create temporary file for %s", f->path);
+ 
		return (EPKG_FATAL);

	}

	if (fd == -2) {

		close_tempdir(tmpdir);