[gentoo-commits] gentoo-alt r1642 - trunk/toolchain-prefix-wrapper/ld

[Fabian Groffen (grobian)]

Author: grobian
Date: 2009-03-21 13:33:33 +0000 (Sat, 21 Mar 2009)
New Revision: 1642

Modified:
   trunk/toolchain-prefix-wrapper/ld/gnuplugin.c
Log:
A compiling version of the previous patch, copy string if need to, since we can't write in read-only defined strings

Modified: trunk/toolchain-prefix-wrapper/ld/gnuplugin.c
===================================================================
--- trunk/toolchain-prefix-wrapper/ld/gnuplugin.c	2009-03-21 13:14:16 UTC (rev 1641)
+++ trunk/toolchain-prefix-wrapper/ld/gnuplugin.c	2009-03-21 13:33:33 UTC (rev 1642)
@@ -13,6 +13,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <alloca.h>
 
 #if defined(__cplusplus)
 extern "C" {
@@ -90,14 +91,14 @@
 					if (curr == argBuffer && rpathArg == _R) {
 						struct stat sbuf;
 						int rv;
-						char colon = *next == ':';
-						/* terminate the string in case of ':' */
-						if (colon)
-							*next = '\0';
-						rv = stat(curr, &sbuf);
-						/* uncut string again */
-						if (colon)
-							*next = ':';
+						char *path = curr;
+						if (*next == ':') {
+							/* terminate the string in case of ':' */
+							path = alloca(sizeof(char) * (next - curr + 1));
+							memcpy(path, curr, next - curr);
+							path[next - curr] = '\0';
+						}
+						rv = stat(path, &sbuf);
 						/* if argument to "-R" is not a directory, then
 						 * it is not a rpath, make sure we push out the
 						 * entire argument in that case, and not just