Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 614c6a9
Fix hardlink extraction with --rootdir
Baptiste Daroussin committed 10 years ago
commit 614c6a90fa36bc83daa8794b9848a79acea3995b
parent 8a47063
1 file changed +15 -1
modified libpkg/pkg_add.c
@@ -182,7 +182,8 @@ do_extract(struct archive *a, struct archive_entry *ae, const char *location,
	int	retcode = EPKG_OK;

	int	ret = 0, cur_file = 0;

	char	path[MAXPATHLEN], pathname[MAXPATHLEN], rpath[MAXPATHLEN];
- 
	char	bd[MAXPATHLEN], *cp;
+ 
	char	linkpath[MAXPATHLEN], bd[MAXPATHLEN], *cp;
+ 
	const char *lp;

	struct stat st;

	const struct stat *aest;

	bool renamed = false;
@@ -242,6 +243,19 @@ do_extract(struct archive *a, struct archive_entry *ae, const char *location,
		}



		archive_entry_set_pathname(ae, rpath);
+ 
		/*
+ 
		 * Deal with hardlinks to rooted path.  Use pathname as
+ 
		 * temporary work space, restore it from rpath for use below.
+ 
		 */
+ 
		lp = archive_entry_hardlink(ae);
+ 
		if (lp != NULL) {
+ 
			pkg_absolutepath(lp, linkpath, sizeof(linkpath));
+ 
			snprintf(pathname, sizeof(pathname), "%s%s%s",
+ 
			    location ? location : "", *linkpath == '/' ? "" : "/",
+ 
			    linkpath);
+ 
			archive_entry_set_hardlink(ae, pathname);
+ 
			strcpy(pathname, rpath);
+ 
		}



		/* load in memory the content of config files */

		if (pkg_is_config_file(pkg, path, &rf, &rcf)) {