| 1 |
Author: grobian |
| 2 |
Date: 2009-03-21 13:07:54 +0000 (Sat, 21 Mar 2009) |
| 3 |
New Revision: 1640 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/toolchain-prefix-wrapper/ld/gnuplugin.c |
| 7 |
Log: |
| 8 |
decomplicate previous commit |
| 9 |
|
| 10 |
Modified: trunk/toolchain-prefix-wrapper/ld/gnuplugin.c |
| 11 |
=================================================================== |
| 12 |
--- trunk/toolchain-prefix-wrapper/ld/gnuplugin.c 2009-03-21 12:58:57 UTC (rev 1639) |
| 13 |
+++ trunk/toolchain-prefix-wrapper/ld/gnuplugin.c 2009-03-21 13:07:54 UTC (rev 1640) |
| 14 |
@@ -95,6 +95,9 @@ |
| 15 |
if (colon) |
| 16 |
*next = '\0'; |
| 17 |
rv = stat(curr, &sbuf); |
| 18 |
+ /* uncut string again */ |
| 19 |
+ if (colon) |
| 20 |
+ *next = ':'; |
| 21 |
/* if argument to "-R" is not a directory, then |
| 22 |
* it is not a rpath */ |
| 23 |
if (rv != 0 || (sbuf.st_mode & S_IFDIR) == 0) { |
| 24 |
@@ -103,22 +106,13 @@ |
| 25 |
, curr, next - curr |
| 26 |
, NULL) < 0) |
| 27 |
{ |
| 28 |
- /* uncut string again */ |
| 29 |
- if (colon) |
| 30 |
- *next = ':'; |
| 31 |
/* failed to append arg */ |
| 32 |
break; |
| 33 |
} |
| 34 |
- /* uncut string again */ |
| 35 |
- if (colon) |
| 36 |
- *next = ':'; |
| 37 |
/* done */ |
| 38 |
err = 0; |
| 39 |
break; |
| 40 |
} |
| 41 |
- /* uncut string again */ |
| 42 |
- if (colon) |
| 43 |
- *next = ':'; |
| 44 |
} |
| 45 |
|
| 46 |
if (next - curr <= 1) { |
Archives