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

[Fabian Groffen (grobian)]

Author: grobian
Date: 2009-03-21 12:58:57 +0000 (Sat, 21 Mar 2009)
New Revision: 1639

Modified:
   trunk/toolchain-prefix-wrapper/ld/gnuplugin.c
Log:
Fix path check in case of -R, don't try to resolve a combined :-separated path

Modified: trunk/toolchain-prefix-wrapper/ld/gnuplugin.c
===================================================================
--- trunk/toolchain-prefix-wrapper/ld/gnuplugin.c	2009-03-19 19:01:19 UTC (rev 1638)
+++ trunk/toolchain-prefix-wrapper/ld/gnuplugin.c	2009-03-21 12:58:57 UTC (rev 1639)
@@ -82,27 +82,43 @@
 				}
 
 				err = 0;
-				for(curr = next = argBuffer; !err && *next != '\0'; curr = next+1) {
+				for (curr = next = argBuffer; !err && *next != '\0'; curr = next+1) {
 					err = -1;
 
-					for(next = curr; *next != '\0' && *next != ':'; next++);
+					for (next = curr; *next != '\0' && *next != ':'; next++);
 
 					if (curr == argBuffer && rpathArg == _R) {
 						struct stat sbuf;
-						int rv = stat(curr, &sbuf);
-						/* if argument to "-R" is not a directory, then it is not a rpath */
+						int rv;
+						char colon = *next == ':';
+						/* terminate the string in case of ':' */
+						if (colon)
+							*next = '\0';
+						rv = stat(curr, &sbuf);
+						/* if argument to "-R" is not a directory, then
+						 * it is not a rpath */
 						if (rv != 0 || (sbuf.st_mode & S_IFDIR) == 0) {
 							if (StringListAppendConcat(data->out->argList
 									, _R, _R_len
 									, curr, next - curr
-							, NULL) < 0) {
+									, NULL) < 0)
+							{
+								/* uncut string again */
+								if (colon)
+									*next = ':';
 								/* failed to append arg */
 								break;
 							}
+							/* uncut string again */
+							if (colon)
+								*next = ':';
 							/* done */
 							err = 0;
 							break;
 						}
+						/* uncut string again */
+						if (colon)
+							*next = ':';
 					}
 
 					if (next - curr <= 1) {