JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* environ.cc (_addenv): malloc space for setenv if cygwin1.dll is used in

Browse Source 
conjunction with older binaries.
(environ_init): Ditto.
* external.cc (get_cygdrive_info): New function.
* external.cc (get_cygdrive_prefixes): Change to use get_cygdrive_info but toss
the user and system flags.
* external.cc (cygwin_internal): Add new CW_GET_CYGDRIVE_INFO case.
* path.cc (mount_info::get_cygdrive_prefixes): Remove method.
* path.cc (mount_info::get_cygdrive_info): New method.  Actually,
get_cygdrive_info is really an enhanced version of get_cygdrive_prefixes
renamed to get_cygdrive_info that also gets the user and system flags.
* shared_info.h (get_cygdrive_prefixes): Remove method.
* shared_info.h (get_cygdrive_info): New method.
* include/cygwin/version.h: Bump minor API version due to adding
CW_GET_CYGDRIVE_INFO to cygwin_internal.
* include/sys/cygwin.h (cygwin_getinfo_types): Add CW_GET_CYGDRIVE_INFO.
This commit is contained in:
Christopher Faylor
2000-11-08 20:36:37 +00:00
parent 315f8fd37b
commit 9bc846bd3d
8 changed files with 88 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
winsup/cygwin/environ.cc
View File

@@ -24,6 +24,7 @@ details. */
#include "cygheap.h"
#include "registry.h"
#include "environ.h"
#include "perprocess.h"
extern BOOL allow_glob;
extern BOOL allow_ntea;
@@ -34,6 +35,11 @@ static BOOL envcache = TRUE;
static char **lastenviron = NULL;
#define ENVMALLOC \
(CYGWIN_VERSION_DLL_MAKE_COMBINED (user_data->api_major, user_data->api_minor) \
<= CYGWIN_VERSION_DLL_MALLOC_ENV)
/* List of names which are converted from dos to unix
* on the way in and back again on the way out.
*
@@ -247,8 +253,8 @@ _addenv (const char *name, const char *value, int overwrite)
char *envhere;
if (!issetenv)
envhere = cur_environ ()[offset] = (char *) name; /* Not setenv. Just
overwrite existing. */
/* Not setenv. Just overwrite existing. */
envhere = cur_environ ()[offset] = (char *) (ENVMALLOC ? strdup (name) : name);
else
{ /* setenv */
/* Look for an '=' in the name and ignore anything after that if found. */
@@ -566,7 +572,17 @@ environ_init (char **envp, int envc)
char **newenv = (char **) malloc (envc);
memcpy (newenv, envp, envc);
cfree (envp);
/* 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;
}