[patch] install-xattr: canonicalize portage_helper_path

install-xattr-bug-523994.patch (text/plain), 782 bytes, created by Zac Medico on 2014-10-01 18:40:20 UTC

--- install-xattr.c
+++ install-xattr.c
@@ -325,6 +325,7 @@
 	 */
 	char *oldpwd = getenv("OLDPWD");
 	char *portage_helper_path = getenv("__PORTAGE_HELPER_PATH");
+	char *portage_helper_canpath = NULL;
 	if (portage_helper_path)
 		chdir(oldpwd);
 
@@ -334,8 +335,11 @@
 
 		case 0:
 			/* find system install avoiding mypath and portage_helper_path! */
-			install = which(mypath, portage_helper_path);
+			if (portage_helper_path)
+				portage_helper_canpath = realpath(portage_helper_path, NULL);
+			install = which(mypath, portage_helper_canpath);
 			free(mypath);
+			free(portage_helper_canpath);
 			argv[0] = install;        /* so coreutils' lib/program.c behaves  */
 			execv(install, argv);     /* The kernel will free(install).       */
 			err(1, "execv() failed");