From owner-svn-src-all@FreeBSD.ORG Tue Jan 22 07:32:28 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id BB7A36A6; Tue, 22 Jan 2013 07:32:28 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A865F9D5; Tue, 22 Jan 2013 07:32:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0M7WSkr059483; Tue, 22 Jan 2013 07:32:28 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0M7WR1J059476; Tue, 22 Jan 2013 07:32:27 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201301220732.r0M7WR1J059476@svn.freebsd.org> From: Konstantin Belousov Date: Tue, 22 Jan 2013 07:32:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245777 - in stable/9/lib/csu: amd64 arm i386-elf mips powerpc powerpc64 sparc64 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2013 07:32:28 -0000 Author: kib Date: Tue Jan 22 07:32:26 2013 New Revision: 245777 URL: http://svnweb.freebsd.org/changeset/base/245777 Log: MFC r245133: Only assign the environ in the startup code when environ is NULL. Note that this is not the merge, but a reimplementation of the fix, done for the not-consolidated code in the stable/9. Modified: stable/9/lib/csu/amd64/crt1.c stable/9/lib/csu/arm/crt1.c stable/9/lib/csu/i386-elf/crt1_c.c stable/9/lib/csu/mips/crt1.c stable/9/lib/csu/powerpc/crt1.c stable/9/lib/csu/powerpc64/crt1.c stable/9/lib/csu/sparc64/crt1.c Directory Properties: stable/9/lib/csu/ (props changed) Modified: stable/9/lib/csu/amd64/crt1.c ============================================================================== --- stable/9/lib/csu/amd64/crt1.c Tue Jan 22 07:22:58 2013 (r245776) +++ stable/9/lib/csu/amd64/crt1.c Tue Jan 22 07:32:26 2013 (r245777) @@ -71,7 +71,8 @@ _start(char **ap, void (*cleanup)(void)) 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++) Modified: stable/9/lib/csu/arm/crt1.c ============================================================================== --- stable/9/lib/csu/arm/crt1.c Tue Jan 22 07:22:58 2013 (r245776) +++ stable/9/lib/csu/arm/crt1.c Tue Jan 22 07:32:26 2013 (r245777) @@ -106,7 +106,8 @@ __start(int argc, char **argv, char **en { const char *s; - environ = env; + if (environ == NULL) + environ = env; if (argc > 0 && argv[0] != NULL) { __progname = argv[0]; Modified: stable/9/lib/csu/i386-elf/crt1_c.c ============================================================================== --- stable/9/lib/csu/i386-elf/crt1_c.c Tue Jan 22 07:22:58 2013 (r245776) +++ stable/9/lib/csu/i386-elf/crt1_c.c Tue Jan 22 07:32:26 2013 (r245777) @@ -70,7 +70,8 @@ _start1(fptr cleanup, int argc, char *ar 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: stable/9/lib/csu/mips/crt1.c ============================================================================== --- stable/9/lib/csu/mips/crt1.c Tue Jan 22 07:22:58 2013 (r245776) +++ stable/9/lib/csu/mips/crt1.c Tue Jan 22 07:32:26 2013 (r245777) @@ -82,7 +82,8 @@ __start(char **ap, argc = * (long *) ap; argv = ap + 1; env = ap + 2 + argc; - environ = env; + if (environ == NULL) + environ = env; if (argc > 0 && argv[0] != NULL) { const char *s; __progname = argv[0]; Modified: stable/9/lib/csu/powerpc/crt1.c ============================================================================== --- stable/9/lib/csu/powerpc/crt1.c Tue Jan 22 07:22:58 2013 (r245776) +++ stable/9/lib/csu/powerpc/crt1.c Tue Jan 22 07:32:26 2013 (r245777) @@ -90,7 +90,8 @@ _start(int argc, char **argv, char **env { const char *s; - environ = env; + if (environ == NULL) + environ = env; if (argc > 0 && argv[0] != NULL) { __progname = argv[0]; Modified: stable/9/lib/csu/powerpc64/crt1.c ============================================================================== --- stable/9/lib/csu/powerpc64/crt1.c Tue Jan 22 07:22:58 2013 (r245776) +++ stable/9/lib/csu/powerpc64/crt1.c Tue Jan 22 07:32:26 2013 (r245777) @@ -89,7 +89,8 @@ _start(int argc, char **argv, char **env { const char *s; - environ = env; + if (environ == NULL) + environ = env; if (argc > 0 && argv[0] != NULL) { __progname = argv[0]; Modified: stable/9/lib/csu/sparc64/crt1.c ============================================================================== --- stable/9/lib/csu/sparc64/crt1.c Tue Jan 22 07:22:58 2013 (r245776) +++ stable/9/lib/csu/sparc64/crt1.c Tue Jan 22 07:32:26 2013 (r245777) @@ -94,7 +94,8 @@ _start(char **ap, void (*cleanup)(void), 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++)