touchup gcc-config errors since at first glance they look like shell errors

3 files changed, 12 insertions, 11 deletions

diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.6 b/sys-devel/gcc-config/files/gcc-config-1.3.6
index b46581803c0b..28f824d4a45f 100755
--- a/sys-devel/gcc-config/files/gcc-config-1.3.6
+++ b/sys-devel/gcc-config/files/gcc-config-1.3.6
@@ -1,7 +1,7 @@
 #!/bin/bash
 # 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/gcc-config-1.3.6,v 1.3 2004/07/24 20:40:14 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.6,v 1.4 2004/08/19 15:16:25 vapier Exp $
 # Author:  Martin Schlemmer <azarah@gentoo.org>
 
 source /etc/init.d/functions.sh || {
@@ -332,7 +332,7 @@ NEED_ACTION="yes"
 DOIT="switch_profile"
 CHECK_CHOST="no"
 
-for x in $*
+for x in "$@"
 do
 	case "${x}" in
 		# Only use specified compiler if one is not already selected.
diff --git a/sys-devel/gcc-config/files/wrapper-1.4.1.c b/sys-devel/gcc-config/files/wrapper-1.4.1.c
index 06437ef77ee4..4c4b04628871 100644
--- a/sys-devel/gcc-config/files/wrapper-1.4.1.c
+++ b/sys-devel/gcc-config/files/wrapper-1.4.1.c
@@ -1,8 +1,8 @@
 /*
- * Copyright 1999-2003 Gentoo Technologies, Inc.
+ * 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.1.c,v 1.4 2004/08/19 15:16:25 vapier Exp $
  * Author: Martin Schlemmer <azarah@gentoo.org>
- * $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/wrapper-1.4.1.c,v 1.3 2004/07/18 04:44:54 dragonheart Exp $
  */
 
 #define _REENTRANT
@@ -46,6 +46,7 @@ static const char *wrapper_strerror(int err, struct wrapper_data *data)
 static void wrapper_exit(char *msg, ...)
 {   
 	va_list args;
+	fprintf(stderr, "gcc-config error:");
 	va_start(args, msg);
 	vfprintf(stderr, msg, args);
 	va_end(args);
@@ -196,7 +197,7 @@ static void find_wrapper_target(struct wrapper_data *data)
 #endif
 	if (NULL == inpipe)
 		wrapper_exit(
-			"Could not open pipe for gcc-config: %s\n",
+			"Could not open pipe: %s\n",
 			wrapper_strerror(errno, data));
 
 	if (0 == fgets(str, MAXPATHLEN, inpipe))
@@ -246,7 +247,7 @@ static void modify_path(struct wrapper_data *data)
 
 	newpath = (char *)malloc(len);
 	if (NULL == newpath)
-		wrapper_exit("wrapper: out of memory\n");
+		wrapper_exit("out of memory\n");
 	memset(newpath, 0, len);
 
 	snprintf(newpath, len, "%s:%s", dname, data->path);
diff --git a/sys-devel/gcc-config/files/wrapper-1.4.2.c b/sys-devel/gcc-config/files/wrapper-1.4.2.c
index be54f3ba07a6..8269f3ab4d09 100644
--- a/sys-devel/gcc-config/files/wrapper-1.4.2.c
+++ b/sys-devel/gcc-config/files/wrapper-1.4.2.c
@@ -1,8 +1,8 @@
 /*
- * Copyright 1999-2003 Gentoo Technologies, Inc.
+ * 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.2.c,v 1.3 2004/08/19 15:16:25 vapier Exp $
  * Author: Martin Schlemmer <azarah@gentoo.org>
- * $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/wrapper-1.4.2.c,v 1.2 2004/07/18 04:44:54 dragonheart Exp $
  */
 
 #define _REENTRANT
@@ -46,6 +46,7 @@ static const char *wrapper_strerror(int err, struct wrapper_data *data)
 static void wrapper_exit(char *msg, ...)
 {   
 	va_list args;
+	fprintf(stderr, "gcc-config error: ");
 	va_start(args, msg);
 	vfprintf(stderr, msg, args);
 	va_end(args);
@@ -200,7 +201,7 @@ static void find_wrapper_target(struct wrapper_data *data)
 #endif
 	if (NULL == inpipe)
 		wrapper_exit(
-			"Could not open pipe for gcc-config: %s\n",
+			"Could not open pipe: %s\n",
 			wrapper_strerror(errno, data));
 
 	if (0 == fgets(str, MAXPATHLEN, inpipe))
@@ -250,7 +251,7 @@ static void modify_path(struct wrapper_data *data)
 
 	newpath = (char *)malloc(len);
 	if (NULL == newpath)
-		wrapper_exit("wrapper: out of memory\n");
+		wrapper_exit("out of memory\n");
 	memset(newpath, 0, len);
 
 	snprintf(newpath, len, "%s:%s", dname, data->path);
@@ -311,4 +312,3 @@ int main(int argc, char **argv)
 	
 	return 0;
 }
-