summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-01-31 06:16:58 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-01-31 06:16:58 +0000
commit532951d0d03a41ced0917035ecefdb6fd70e6cbf (patch)
treef52b874b3865841e1bea7afc4cf45a05be2f70e7 /sys-devel
parentMultilib fixes. Copies libgcc_s.so* to the correct location for all abis. A... (diff)
downloadgentoo-2-532951d0d03a41ced0917035ecefdb6fd70e6cbf.tar.gz
gentoo-2-532951d0d03a41ced0917035ecefdb6fd70e6cbf.tar.bz2
gentoo-2-532951d0d03a41ced0917035ecefdb6fd70e6cbf.zip
Fix argv[0].
(Portage version: 2.0.51-r15)
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/gcc-config/files/wrapper-1.4.5.c10
1 files changed, 7 insertions, 3 deletions
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. */