From 6d5842f6eea3f16811bd199c8dd2945772ddb351 Mon Sep 17 00:00:00 2001 From: kib Date: Mon, 7 Jan 2013 17:58:27 +0000 Subject: Only assign the environ in the startup code when environ is NULL. Preloaded library could have changed the environment, and unconditional assingment to the environ undoes the customization. The binaries needs to be recompiled to get the fix. Move the common code to set up environ and __progname into the helper. Note that ia64 possibly not fixed, due to it still using old csu. Reported and tested by: John Hein Reviewed by: kan, scf Approved by: secteam (simon) MFC after: 2 weeks --- lib/csu/sparc64/crt1.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'lib/csu/sparc64') diff --git a/lib/csu/sparc64/crt1.c b/lib/csu/sparc64/crt1.c index 3b3ecc2..e11ae39 100644 --- a/lib/csu/sparc64/crt1.c +++ b/lib/csu/sparc64/crt1.c @@ -85,9 +85,7 @@ _start(char **ap, void (*cleanup)(void), struct Struct_Obj_Entry *obj __unused, argc = *(long *)(void *)ap; argv = ap + 1; env = ap + 2 + argc; - environ = env; - if (argc > 0 && argv[0] != NULL) - handle_progname(argv[0]); + handle_argv(argc, argv, env); if (&_DYNAMIC != NULL) atexit(cleanup); -- cgit v1.1