From 166b2571ce446b4085d4c2067b0d0d36c608f131 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Mon, 16 Oct 2000 23:55:58 +0000 Subject: * Makefile.in: Remove some obsolete stuff. * dcrt0.cc (dll_crt0_1): Call signal_fixup_after_exec where appropriate. Set myself->uid from parent version. Just use ThreadItem Init method. Close or store hexec_proc as appropriate. (_dll_crt0): Store user_data->forkee here so that proper tests can be made subsequently. (do_exit): Remove hExeced stuff. * environ.cc (environ_init): Accept environ count as well as environ pointer. * environ.h: Reflect above change. * pinfo.cc (pinfo_init): Ditto. Accept environ count. (fixup_in_spawned_child): Remove. * spawn.cc (spawn_guts): Move signal code to dll_crt0_1. Don't suspend execing process since it is no longer necessary. Store envc. * exceptions.cc (signal_fixup_after_exec): New function. (call_handler): Remove hExeced test. * child_info.h (cygheap_exec_info): Store envc as well as envp. (child_info_spawn): Store hexec_proc so that it can be closed in child. * path.cc (normalize_posix_path): Avoid intermediate use of temporary cwd buf. (normalize_win32_path): Ditto. (cwdstuff::get_initial): Always set lock. * sigproc.h: Remove hExeced. * strace.cc (strace::vsprntf): Modify to accomodate for lack of hExeced. * thread.cc (MTinterface::Init): Merge Init1 and ClearReent into this method. (MTinterface::Init1): Eliminate. (MTinterface::ClearReent): Eliminate. * thread.h: Reflect above changes. * include/sys/strace.h (strace): Make microseconds() public. Make various functions 'regparm', throughout. * pinfo.h (_pinfo): Inline simple signal manipulation functions. Requires inclusion of thread.h which was removed from .cc files, where appropriate. throughout. * pinfo.cc: Eliminate signal manipulation functions. (_pinfo::exit): Calculate total rusage for exiting process here. * cygheap.cc (size2bucket): Eliminate. (init_buckets): Ditto. (_cmalloc): Calculate size and bits in a loop rather than going through a function call. (_crealloc): Use stored array index to calculate allocated size. * spawn.cc (spawn_guts): Use _pinfo exit method to exit, calculating cpu usage. --- winsup/cygwin/environ.cc | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'winsup/cygwin/environ.cc') diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc index f0a3fc7d7..612e7e13e 100644 --- a/winsup/cygwin/environ.cc +++ b/winsup/cygwin/environ.cc @@ -517,10 +517,10 @@ regopt (const char *name) * environment variable and set appropriate options from it. */ void -environ_init (char **envp) +environ_init (char **envp, int envc) { char *rawenv; - int sz, i; + int i; char *p; char *newp; int sawTERM = 0; @@ -541,9 +541,8 @@ environ_init (char **envp) envp_passed_in = 0; else { - sz = envsize (envp, 1); - char **newenv = (char **) malloc (sz); - memcpy (newenv, envp, sz); + char **newenv = (char **) malloc (envc); + memcpy (newenv, envp, envc); cfree (envp); envp = newenv; envp_passed_in = 1; @@ -551,7 +550,7 @@ environ_init (char **envp) } /* Allocate space for environment + trailing NULL + CYGWIN env. */ - lastenviron = envp = (char **) malloc ((4 + (sz = 100)) * sizeof (char *)); + lastenviron = envp = (char **) malloc ((4 + (envc = 100)) * sizeof (char *)); rawenv = GetEnvironmentStrings (); /* Current directory information is recorded as variables of the @@ -561,9 +560,8 @@ environ_init (char **envp) for (i = 0, p = rawenv; *p != '\0'; p = strchr (p, '\0') + 1, i++) { newp = strdup (p); - if (i >= sz) - envp = (char **) realloc (envp, (4 + (sz += 100)) * - sizeof (char *)); + if (i >= envc) + envp = (char **) realloc (envp, (4 + (envc += 100)) * sizeof (char *)); envp[i] = newp; if (*newp == '=') *newp = '!'; -- cgit v1.2.3