diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2022-08-03 15:35:07 +0200 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2022-08-03 15:35:34 +0200 |
| commit | efa66119823be2372b548d7807105c472514e891 (patch) | |
| tree | e07cd2ef2aaa13b1b96f2bfc32b832d05a0f335a | |
| parent | 02b273a6880b551a7ca29be244c7653b56cc2c10 (diff) | |
| download | newlib-efa66119823be2372b548d7807105c472514e891.zip newlib-efa66119823be2372b548d7807105c472514e891.tar.gz newlib-efa66119823be2372b548d7807105c472514e891.tar.bz2 | |
Cygwin: drop macro and code for CYGWIN_VERSION_DLL_MALLOC_ENV
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
| -rw-r--r-- | winsup/cygwin/environ.cc | 13 | ||||
| -rw-r--r-- | winsup/cygwin/include/cygwin/version.h | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc index 0ac1acc..008854a 100644 --- a/winsup/cygwin/environ.cc +++ b/winsup/cygwin/environ.cc @@ -291,10 +291,6 @@ env_path_to_win32 (const void *posix, void *win32, size_t size) win32, size); } -#define ENVMALLOC \ - (CYGWIN_VERSION_DLL_MAKE_COMBINED (user_data->api_major, user_data->api_minor) \ - <= CYGWIN_VERSION_DLL_MALLOC_ENV) - #define NL(x) x, (sizeof (x) - 1) /* List of names which are converted from dos to unix on the way in and back again on the way out. @@ -631,7 +627,7 @@ _addenv (const char *name, const char *value, int overwrite) char *envhere; if (!issetenv) /* Not setenv. Just overwrite existing. */ - envhere = environ[offset] = (char *) (ENVMALLOC ? strdup (name) : name); + envhere = environ[offset] = (char *) name; else { /* setenv */ /* Look for an '=' in the name and ignore anything after that if found. */ @@ -817,13 +813,6 @@ environ_init (char **envp, int envc) /* Older applications relied on the fact that cygwin malloced elements of the environment list. */ envp = newenv; - if (ENVMALLOC) - for (char **e = newenv; *e; e++) - { - char *p = *e; - *e = strdup (p); - cfree (p); - } envp_passed_in = 1; goto out; } diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h index d32da28..ae1ab83 100644 --- a/winsup/cygwin/include/cygwin/version.h +++ b/winsup/cygwin/include/cygwin/version.h @@ -34,8 +34,6 @@ details. */ #define CYGWIN_VERSION_USER_API_VERSION_COMBINED \ CYGWIN_VERSION_PER_PROCESS_API_VERSION_COMBINED (user_data) -#define CYGWIN_VERSION_DLL_MALLOC_ENV 28 - /* Old APIs had getc/putc macros that conflict with new CR/LF handling in the stdio buffers */ #define CYGWIN_VERSION_OLD_STDIO_CRLF_HANDLING \ |