[Midnightbsd-cvs] src [8655] trunk/lib/csu: only assign environ if it is NULL.

[laffer1 at midnightbsd.org]

Revision: 8655
          http://svnweb.midnightbsd.org/src/?rev=8655
Author:   laffer1
Date:     2016-09-25 16:03:48 -0400 (Sun, 25 Sep 2016)
Log Message:
-----------
only assign environ if it is NULL.

Modified Paths:
--------------
    trunk/lib/csu/amd64/crt1.c
    trunk/lib/csu/i386-elf/crt1_c.c
    trunk/lib/csu/sparc64/crt1.c

Modified: trunk/lib/csu/amd64/crt1.c
===================================================================
--- trunk/lib/csu/amd64/crt1.c	2016-09-25 20:02:52 UTC (rev 8654)
+++ trunk/lib/csu/amd64/crt1.c	2016-09-25 20:03:48 UTC (rev 8655)
@@ -68,7 +68,8 @@
 	argc = *(long *)(void *)ap;
 	argv = ap + 1;
 	env = ap + 2 + argc;
-	environ = env;
+	if (environ == NULL)
+		environ = env;
 	if (argc > 0 && argv[0] != NULL) {
 		__progname = argv[0];
 		for (s = __progname; *s != '\0'; s++)
@@ -93,4 +94,4 @@
 	exit( main(argc, argv, env) );
 }
 
-__asm__(".ident\t\"$MidnightBSD: src/lib/csu/amd64/crt1.c,v 1.4 2012/02/12 21:14:24 laffer1 Exp $\"");
+__asm__(".ident\t\"$MidnightBSD$\"");

Modified: trunk/lib/csu/i386-elf/crt1_c.c
===================================================================
--- trunk/lib/csu/i386-elf/crt1_c.c	2016-09-25 20:02:52 UTC (rev 8654)
+++ trunk/lib/csu/i386-elf/crt1_c.c	2016-09-25 20:03:48 UTC (rev 8655)
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $MidnightBSD: src/lib/csu/i386-elf/crt1_c.c,v 1.2 2012/02/12 21:14:24 laffer1 Exp $
+ * $MidnightBSD$
  * $FreeBSD: src/lib/csu/i386-elf/crt1_c.c,v 1.1.4.2 2010/01/19 20:19:52 kib Exp $
  */
 
@@ -68,7 +68,8 @@
 	const char *s;
 
 	env = argv + argc + 1;
-	environ = env;
+	if (environ == NULL)
+		environ = env;
 	if (argc > 0 && argv[0] != NULL) {
 		__progname = argv[0];
 		for (s = __progname; *s != '\0'; s++)

Modified: trunk/lib/csu/sparc64/crt1.c
===================================================================
--- trunk/lib/csu/sparc64/crt1.c	2016-09-25 20:02:52 UTC (rev 8654)
+++ trunk/lib/csu/sparc64/crt1.c	2016-09-25 20:03:48 UTC (rev 8655)
@@ -91,7 +91,8 @@
 	argc = *(long *)(void *)ap;
 	argv = ap + 1;
 	env  = ap + 2 + argc;
-	environ = env;
+	if (environ == NULL)
+		environ = env;
 	if (argc > 0 && argv[0] != NULL) {
 		__progname = argv[0];
 		for (s = __progname; *s != '\0'; s++)
@@ -122,4 +123,4 @@
 __asm__(".previous");
 #endif
 
-__asm__(".ident\t\"$MidnightBSD: src/lib/csu/sparc64/crt1.c,v 1.4 2012/02/12 21:14:24 laffer1 Exp $\"");
+__asm__(".ident\t\"$MidnightBSD$\"");