diff options
author | Jeremy Huddleston <eradicator@gentoo.org> | 2005-01-31 06:16:58 +0000 |
---|---|---|
committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-01-31 06:16:58 +0000 |
commit | ba308dcf5bcf5206fa3bd0019007946cb1aadacd (patch) | |
tree | 812032f88705ed0789b5980cded12c35da5e0a21 /sys-devel/gcc-config | |
parent | Multilib fixes. Copies libgcc_s.so* to the correct location for all abis. A... (diff) | |
download | historical-ba308dcf5bcf5206fa3bd0019007946cb1aadacd.tar.gz historical-ba308dcf5bcf5206fa3bd0019007946cb1aadacd.tar.bz2 historical-ba308dcf5bcf5206fa3bd0019007946cb1aadacd.zip |
Fix argv[0].
Package-Manager: portage-2.0.51-r15
Diffstat (limited to 'sys-devel/gcc-config')
-rw-r--r-- | sys-devel/gcc-config/Manifest | 8 | ||||
-rw-r--r-- | sys-devel/gcc-config/files/wrapper-1.4.5.c | 10 |
2 files changed, 11 insertions, 7 deletions
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest index c25a695fb9de..78fa4401697f 100644 --- a/sys-devel/gcc-config/Manifest +++ b/sys-devel/gcc-config/Manifest @@ -11,14 +11,14 @@ MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.9 0 MD5 396974306d3ccab6db5354d94ffd21fd files/gcc-config-1.3.8 12498 MD5 e7c7a83406a374ee4262c97d6e5673b2 files/wrapper-1.4.3.c 7545 MD5 7723c767ef3e4935c2299fb253412d7e files/wrapper-1.4.4.c 10132 -MD5 c7913ab2704a652d4f9486964569a1a1 files/wrapper-1.4.5.c 10579 +MD5 a6c7c0536d2ab7cfc65d7169178ab71d files/wrapper-1.4.5.c 10668 MD5 0181c8024c1c636b700dbf7a11f07fd6 files/gcc-config-1.3.9 12641 MD5 9c5f1032109e37d3f576d3ba2d1d28a9 files/gcc-config-1.3.10 13026 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.10 0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) -iD8DBQFB/cScArHZZzCEUG0RAqOSAJ9pN3zIadMPDylmNasco+zn+gn19QCfe7nV -vn4jaybHwEW2O2vHrMmbmhU= -=7OmW +iD8DBQFB/c1oArHZZzCEUG0RArWmAJ9ZI5bza/oSsAbqr9lwhIA83cIT8gCaAwo5 +/fVoFboXBAOcfK2GwN0QOOo= +=pYFM -----END PGP SIGNATURE----- diff --git a/sys-devel/gcc-config/files/wrapper-1.4.5.c b/sys-devel/gcc-config/files/wrapper-1.4.5.c index 74ab554762c8..5edc6450cbee 100644 --- a/sys-devel/gcc-config/files/wrapper-1.4.5.c +++ b/sys-devel/gcc-config/files/wrapper-1.4.5.c @@ -1,7 +1,7 @@ /* * Copyright 1999-2004 Gentoo Foundation * Distributed under the terms of the GNU General Public License v2 - * $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/wrapper-1.4.5.c,v 1.1 2005/01/31 05:39:30 eradicator Exp $ + * $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/wrapper-1.4.5.c,v 1.2 2005/01/31 06:16:58 eradicator Exp $ * Author: Martin Schlemmer <azarah@gentoo.org> */ @@ -284,6 +284,7 @@ static char **getNewArgv(char **argv, const char *newflagsStr) { return NULL; strncpy(newflags[newflagsCount], newflagsStr + s, f - s); + newflags[newflagsCount][f - s]='\0'; newflagsCount++; } @@ -307,9 +308,12 @@ static char **getNewArgv(char **argv, const char *newflagsStr) { if(!newargv) return NULL; + /* Build argv */ + newargv[0] = argv[0]; + /* The newFlags come first since we want the environment to override them. */ - for(i=0; i < newflagsCount; i++) { - newargv[i] = newflags[i]; + for(i=1; i - 1 < newflagsCount; i++) { + newargv[i] = newflags[i - 1]; } /* We just use the existing argv[i] as the start. */ |