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

* cygcheck.cc (nuke): New function.

Browse Source 
(load_cygwin): New function.
(main): Use load_cygwin to load argv/envp from cygwin environment, if
appropriate.
This commit is contained in:
Christopher Faylor 2005-05-09 01:56:34 +00:00
parent 26c07f704b
commit f991d0e53e
2 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/utils/ChangeLog
View File

@ -1,3 +1,10 @@
2005-05-08 Christopher Faylor <cgf@timesys.com>
* cygcheck.cc (nuke): New function.
(load_cygwin): New function.
(main): Use load_cygwin to load argv/envp from cygwin environment, if
appropriate.
2005-05-08 Christopher Faylor <cgf@timesys.com> 2005-05-08 Christopher Faylor <cgf@timesys.com>
* strace.cc (attach_process): Don't call load_cygwin(). Assume that * strace.cc (attach_process): Don't call load_cygwin(). Assume that

40
winsup/utils/cygcheck.cc
View File

@ -8,6 +8,7 @@
Cygwin license. Please consult the file "CYGWIN_LICENSE" for Cygwin license. Please consult the file "CYGWIN_LICENSE" for
details. */ details. */
#define cygwin_internal cygwin_internal_dontuse
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -19,6 +20,7 @@
#include <getopt.h> #include <getopt.h>
#include "cygwin/include/sys/cygwin.h" #include "cygwin/include/sys/cygwin.h"
#include "cygwin/include/mntent.h" #include "cygwin/include/mntent.h"
#undef cygwin_internal
#define alloca __builtin_alloca #define alloca __builtin_alloca
@ -1427,10 +1429,48 @@ Compiled on %s\n\
", len, v, __DATE__); ", len, v, __DATE__);
} }
void
nuke (char *ev)
{
int n = 1 + strchr (*_environ, '=') - ev;
char *s = (char *) alloca (n);
memcpy (s, ev, n);
s[n] = '\0';
putenv (s);
}
DWORD (*cygwin_internal) (int, ...);
static void
load_cygwin (int& argc, char **&argv)
{
HMODULE h;
if (!(h = LoadLibrary ("cygwin1.dll")))
return;
if (!(cygwin_internal = (DWORD (*) (int, ...)) GetProcAddress (h, "cygwin_internal")))
return;
char **av = (char **) cygwin_internal (CW_ARGV);
if (av)
for (argc = 0, argv = av; *av; av++)
argc++;
char **envp = (char **) cygwin_internal (CW_ENVP);
if (envp)
{
while (*_environ)
nuke (*_environ);
for (char **ev = envp; *ev; ev++)
putenv (*ev);
}
}
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
int i; int i;
load_cygwin (argc, argv);
(void) putenv("POSIXLY_CORRECT=1"); (void) putenv("POSIXLY_CORRECT=1");
while ((i = getopt_long (argc, argv, opts, longopts, NULL)) != EOF) while ((i = getopt_long (argc, argv, opts, longopts, NULL)) != EOF)