[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/binutils-config/files/

["Michael Haubenwallner" <haubi@gentoo.org>]

commit:     1f90d833970f8f6813a48f9385c234e197c3ee55
Author:     Michael Haubenwallner <michael.haubenwallner <AT> ssi-schaefer <DOT> com>
AuthorDate: Fri Apr 15 09:07:19 2016 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 08:06:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1f90d833

ldwrapper.c: check last PATH env entry; restore PATH env value; fix missing string.h warnings

 sys-devel/binutils-config/files/ldwrapper.c | 36 ++++++++++++++---------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/sys-devel/binutils-config/files/ldwrapper.c b/sys-devel/binutils-config/files/ldwrapper.c
index 958bed4..9823da8 100644
--- a/sys-devel/binutils-config/files/ldwrapper.c
+++ b/sys-devel/binutils-config/files/ldwrapper.c
@@ -8,6 +8,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <strings.h>
+#include <string.h>
 #include <ctype.h>
 #include <sys/stat.h>
 #include <errno.h>
@@ -46,6 +47,9 @@ find_real_ld(char **ld, char verbose, char *wrapper)
 	char *e;
 	struct stat lde;
 
+	/* we may not succeed finding the linker */
+	*ld = NULL;
+
 	/* respect the override in environment */
 	ldoveride = getenv("BINUTILS_CONFIG_LD");
 	if (ldoveride != NULL && *ldoveride != '\0') {
@@ -67,23 +71,20 @@ find_real_ld(char **ld, char verbose, char *wrapper)
 
 	/* find ld in PATH, allowing easy PATH overrides */
 	path = getenv("PATH");
-	if (path != NULL && *path != '\0') {
-		char *p;
-		char *q;
-
-		for (p = path; (q = strchr(p, ':')) != NULL; p = q + 1) {
-			if (q)
-				*q = '\0';
-			if (strstr(p, "/" CHOST "/binutils-bin/") != NULL) {
-				snprintf(e, ESIZ, "%s/%s", p, wrapper);
-				if (stat(e, &lde) == 0) {
-					*ld = e;
-					return;
-				}
-			}
-			if (!q)
-				break;
+	while (path > (char*)1 && *path != '\0') {
+		char *q = strchr(path, ':');
+		if (q)
+			*q = '\0';
+		if (strstr(path, "/" CHOST "/binutils-bin/") != NULL) {
+			snprintf(e, ESIZ, "%s/%s", path, wrapper);
+			if (stat(e, &lde) == 0)
+				*ld = e;
 		}
+		if (q)
+			*q = ':'; /* restore PATH value */
+		if (*ld)
+			return;
+		path = q + 1;
 	}
 	if (verbose)
 		fprintf(stdout, "%s: linker not found in PATH\n", wrapper);
@@ -135,9 +136,6 @@ find_real_ld(char **ld, char verbose, char *wrapper)
 	if (verbose)
 		fprintf(stdout, "%s: linker not found via binutils-config -c\n",
 				wrapper);
-
-	/* we didn't succeed finding the linker */
-	*ld = NULL;
 }
 
 int