#include "perl.h"
#define NO_XSLOCKS
+#define PERL_NO_GET_CONTEXT
#include "XSUB.h"
#include "Win32iop.h"
int _CRT_glob = 0;
#endif
+#ifdef __BORLANDC__
+# define _stat stat
+# define _utimbuf utimbuf
+#endif
+
#define EXECF_EXEC 1
#define EXECF_SPAWN 2
#define EXECF_SPAWN_NOWAIT 3
static void get_shell(void);
static long tokenize(char *str, char **dest, char ***destv);
- int do_spawn2(pTHX_ char *cmd, int exectype);
+ int do_spawn2(char *cmd, int exectype);
static BOOL has_shell_metachars(char *ptr);
static long filetime_to_clock(PFILETIME ft);
static BOOL filetime_from_time(PFILETIME ft, time_t t);
-static char * get_emd_part(char **leading, char *trailing, ...);
+static char * get_emd_part(SV **leading, char *trailing, ...);
static void remove_dead_process(long deceased);
static long find_pid(int pid);
static char * qualified_path(const char *cmd);
return (win32_os_id() == VER_PLATFORM_WIN32_NT);
}
-/* *ptr is expected to point to valid allocated space (can't be NULL) */
-char*
-GetRegStrFromKey(HKEY hkey, const char *lpszValueName, char** ptr, DWORD* lpDataLen)
+/* *svp (if non-NULL) is expected to be POK (valid allocated SvPVX(*svp)) */
+static char*
+get_regstr_from(HKEY hkey, const char *valuename, SV **svp)
{
/* Retrieve a REG_SZ or REG_EXPAND_SZ from the registry */
HKEY handle;
retval = RegOpenKeyEx(hkey, subkey, 0, KEY_READ, &handle);
if (retval == ERROR_SUCCESS) {
- retval = RegQueryValueEx(handle, lpszValueName, 0, &type, NULL, lpDataLen);
+ DWORD datalen;
+ retval = RegQueryValueEx(handle, valuename, 0, &type, NULL, &datalen);
if (retval == ERROR_SUCCESS && type == REG_SZ) {
- dPERLOBJ;
- Renew(*ptr, *lpDataLen, char);
- retval = RegQueryValueEx(handle, lpszValueName, 0, NULL,
- (PBYTE)*ptr, lpDataLen);
- if (retval == ERROR_SUCCESS)
- str = *ptr;
+ dTHXo;
+ if (!*svp)
+ *svp = sv_2mortal(newSVpvn("",0));
+ SvGROW(*svp, datalen);
+ retval = RegQueryValueEx(handle, valuename, 0, NULL,
+ (PBYTE)SvPVX(*svp), &datalen);
+ if (retval == ERROR_SUCCESS) {
+ str = SvPVX(*svp);
+ SvCUR_set(*svp,datalen-1);
+ }
}
RegCloseKey(handle);
}
return str;
}
-/* *ptr is expected to point to valid allocated space (can't be NULL) */
-char*
-GetRegStr(const char *lpszValueName, char** ptr, DWORD* lpDataLen)
+/* *svp (if non-NULL) is expected to be POK (valid allocated SvPVX(*svp)) */
+static char*
+get_regstr(const char *valuename, SV **svp)
{
- char *str = GetRegStrFromKey(HKEY_CURRENT_USER, lpszValueName, ptr, lpDataLen);
+ char *str = get_regstr_from(HKEY_CURRENT_USER, valuename, svp);
if (!str)
- str = GetRegStrFromKey(HKEY_LOCAL_MACHINE, lpszValueName, ptr, lpDataLen);
+ str = get_regstr_from(HKEY_LOCAL_MACHINE, valuename, svp);
return str;
}
-/* *prev_path is expected to point to valid allocated space (can't be NULL) */
+/* *prev_pathp (if non-NULL) is expected to be POK (valid allocated SvPVX(sv)) */
static char *
-get_emd_part(char **prev_path, char *trailing_path, ...)
+get_emd_part(SV **prev_pathp, char *trailing_path, ...)
{
char base[10];
va_list ap;
/* only add directory if it exists */
if (GetFileAttributes(mod_name) != (DWORD) -1) {
/* directory exists */
- dPERLOBJ;
- newsize = strlen(mod_name) + 1;
- oldsize = strlen(*prev_path) + 1;
- newsize += oldsize; /* includes plus 1 for ';' */
- Renew(*prev_path, newsize, char);
- (*prev_path)[oldsize-1] = ';';
- strcpy(&(*prev_path)[oldsize], mod_name);
- return *prev_path;
+ dTHXo;
+ if (!*prev_pathp)
+ *prev_pathp = sv_2mortal(newSVpvn("",0));
+ sv_catpvn(*prev_pathp, ";", 1);
+ sv_catpv(*prev_pathp, mod_name);
+ return SvPVX(*prev_pathp);
}
return Nullch;
}
char *
-win32_get_privlib(pTHX_ char *pl)
+win32_get_privlib(char *pl)
{
+ dTHXo;
char *stdlib = "lib";
char buffer[MAX_PATH+1];
- char **path;
- DWORD datalen;
- dPERLOBJ;
- SV *sv = sv_2mortal(newSVpvn("",127));
+ SV *sv = Nullsv;
/* $stdlib = $HKCU{"lib-$]"} || $HKLM{"lib-$]"} || $HKCU{"lib"} || $HKLM{"lib"} || ""; */
sprintf(buffer, "%s-%s", stdlib, pl);
- path = &SvPVX(sv);
- if (!GetRegStr(buffer, path, &datalen))
- (void)GetRegStr(stdlib, path, &datalen);
+ if (!get_regstr(buffer, &sv))
+ (void)get_regstr(stdlib, &sv);
/* $stdlib .= ";$EMD/../../lib" */
- (void)get_emd_part(path, stdlib, ARCHNAME, "bin", Nullch);
- SvCUR_set(sv, strlen(*path));
- SvLEN_set(sv, SvCUR(sv)+1);
- return SvPVX(sv);
+ return get_emd_part(&sv, stdlib, ARCHNAME, "bin", Nullch);
}
char *
-win32_get_sitelib(pTHX_ char *pl)
+win32_get_sitelib(char *pl)
{
+ dTHXo;
char *sitelib = "sitelib";
char regstr[40];
char pathstr[MAX_PATH+1];
DWORD datalen;
- char **path1, *str1 = Nullch;
- char **path2, *str2 = Nullch;
int len, newsize;
- dPERLOBJ;
- SV *sv1 = sv_2mortal(newSVpvn("",127));
- SV *sv2 = sv_2mortal(newSVpvn("",127));
+ SV *sv1 = Nullsv;
+ SV *sv2 = Nullsv;
/* $HKCU{"sitelib-$]"} || $HKLM{"sitelib-$]"} . ---; */
sprintf(regstr, "%s-%s", sitelib, pl);
- path1 = &SvPVX(sv1);
- (void)GetRegStr(regstr, path1, &datalen);
+ (void)get_regstr(regstr, &sv1);
/* $sitelib .=
* ";$EMD/" . ((-d $EMD/../../../$]) ? "../../.." : "../.."). "/site/$]/lib"; */
sprintf(pathstr, "site/%s/lib", pl);
- str1 = get_emd_part(path1, pathstr, ARCHNAME, "bin", pl, Nullch);
- if (!str1 && strlen(pl) == 7) {
+ (void)get_emd_part(&sv1, pathstr, ARCHNAME, "bin", pl, Nullch);
+ if (!sv1 && strlen(pl) == 7) {
/* pl may have been SUBVERSION-specific; try again without
* SUBVERSION */
sprintf(pathstr, "site/%.5s/lib", pl);
- str1 = get_emd_part(path1, pathstr, ARCHNAME, "bin", pl, Nullch);
+ (void)get_emd_part(&sv1, pathstr, ARCHNAME, "bin", pl, Nullch);
}
/* $HKCU{'sitelib'} || $HKLM{'sitelib'} . ---; */
- path2 = &SvPVX(sv2);
- (void)GetRegStr(sitelib, path2, &datalen);
+ (void)get_regstr(sitelib, &sv2);
/* $sitelib .=
* ";$EMD/" . ((-d $EMD/../../../$]) ? "../../.." : "../.."). "/site/lib"; */
- str2 = get_emd_part(path2, "site/lib", ARCHNAME, "bin", pl, Nullch);
+ (void)get_emd_part(&sv2, "site/lib", ARCHNAME, "bin", pl, Nullch);
- SvCUR_set(sv1, strlen(*path1));
- SvLEN_set(sv1, SvCUR(sv1)+1);
- SvCUR_set(sv2, strlen(*path2));
- SvLEN_set(sv2, SvCUR(sv2)+1);
-
- if (!str1)
- return *path2;
- if (!str2)
- return *path1;
+ if (!sv1 && !sv2)
+ return Nullch;
+ if (!sv1)
+ return SvPVX(sv2);
+ if (!sv2)
+ return SvPVX(sv1);
sv_catpvn(sv1, ";", 1);
sv_catsv(sv1, sv2);
char **retvstart = 0;
int items = -1;
if (str) {
- dPERLOBJ;
+ dTHXo;
int slen = strlen(str);
register char *ret;
register char **retv;
static void
get_shell(void)
{
- dPERLOBJ;
+ dTHXo;
if (!w32_perlshell_tokens) {
/* we don't use COMSPEC here for two reasons:
* 1. the same reason perl on UNIX doesn't use SHELL--rampant and
}
int
-do_aspawn(pTHX_ void *vreally, void **vmark, void **vsp)
+do_aspawn(void *vreally, void **vmark, void **vsp)
{
+ dTHXo;
SV *really = (SV*)vreally;
SV **mark = (SV**)vmark;
SV **sp = (SV**)vsp;
int status;
int flag = P_WAIT;
int index = 0;
- dPERLOBJ;
if (sp <= mark)
return -1;
if (flag != P_NOWAIT) {
if (status < 0) {
- if (PL_dowarn)
- Perl_warn(aTHX_ "Can't spawn \"%s\": %s", argv[0], strerror(errno));
+ dTHR;
+ if (ckWARN(WARN_EXEC))
+ Perl_warner(aTHX_ WARN_EXEC, "Can't spawn \"%s\": %s", argv[0], strerror(errno));
status = 255 * 256;
}
else
}
int
-do_spawn2(pTHX_ char *cmd, int exectype)
+do_spawn2(char *cmd, int exectype)
{
+ dTHXo;
char **a;
char *s;
char **argv;
int status = -1;
BOOL needToTry = TRUE;
char *cmd2;
- dPERLOBJ;
/* Save an extra exec if possible. See if there are shell
* metacharacters in it */
}
if (exectype != EXECF_SPAWN_NOWAIT) {
if (status < 0) {
- if (PL_dowarn)
- Perl_warn(aTHX_ "Can't %s \"%s\": %s",
+ dTHR;
+ if (ckWARN(WARN_EXEC))
+ Perl_warner(aTHX_ WARN_EXEC, "Can't %s \"%s\": %s",
(exectype == EXECF_EXEC ? "exec" : "spawn"),
cmd, strerror(errno));
status = 255 * 256;
}
int
-do_spawn(pTHX_ char *cmd)
+do_spawn(char *cmd)
{
- return do_spawn2(aTHX_ cmd, EXECF_SPAWN);
+ return do_spawn2(cmd, EXECF_SPAWN);
}
int
-do_spawn_nowait(pTHX_ char *cmd)
+do_spawn_nowait(char *cmd)
{
- return do_spawn2(aTHX_ cmd, EXECF_SPAWN_NOWAIT);
+ return do_spawn2(cmd, EXECF_SPAWN_NOWAIT);
}
bool
Perl_do_exec(pTHX_ char *cmd)
{
- do_spawn2(aTHX_ cmd, EXECF_EXEC);
+ do_spawn2(cmd, EXECF_EXEC);
return FALSE;
}
* (separated by nulls) and when one of the other dir functions is called
* return the pointer to the current file name.
*/
-DIR *
+DllExport DIR *
win32_opendir(char *filename)
{
- dTHX;
+ dTHXo;
DIR *p;
long len;
long idx;
char buffer[MAX_PATH*2];
WCHAR wbuffer[MAX_PATH];
char* ptr;
- dPERLOBJ;
len = strlen(filename);
if (len > MAX_PATH)
? FindNextFileW(fh, &wFindData)
: FindNextFileA(fh, &aFindData)) {
if (USING_WIDE()) {
- W2AHELPER(wFindData.cFileName, buffer, sizeof(buffer));
+ W2AHELPER(wFindData.cFileName, buffer, sizeof(buffer));
}
/* ptr is set above to the correct area */
len = strlen(ptr);
/* Readdir just returns the current string pointer and bumps the
* string pointer to the nDllExport entry.
*/
-struct direct *
+DllExport struct direct *
win32_readdir(DIR *dirp)
{
int len;
}
/* Telldir returns the current string pointer position */
-long
+DllExport long
win32_telldir(DIR *dirp)
{
return (long) dirp->curr;
/* Seekdir moves the string pointer to a previously saved position
*(Saved by telldir).
*/
-void
+DllExport void
win32_seekdir(DIR *dirp, long loc)
{
dirp->curr = (char *)loc;
}
/* Rewinddir resets the string pointer to the start */
-void
+DllExport void
win32_rewinddir(DIR *dirp)
{
dirp->curr = dirp->start;
}
/* free the memory allocated by opendir */
-int
+DllExport int
win32_closedir(DIR *dirp)
{
- dPERLOBJ;
+ dTHXo;
Safefree(dirp->start);
Safefree(dirp);
return 1;
char *
getlogin(void)
{
- dTHX;
+ dTHXo;
char *buf = getlogin_buffer;
DWORD size = sizeof(getlogin_buffer);
if (GetUserName(buf,&size))
static long
find_pid(int pid)
{
+ dTHXo;
long child;
- dPERLOBJ;
for (child = 0 ; child < w32_num_children ; ++child) {
if (w32_child_pids[child] == pid)
return child;
remove_dead_process(long child)
{
if (child >= 0) {
- dPERLOBJ;
+ dTHXo;
CloseHandle(w32_child_handles[child]);
Copy(&w32_child_handles[child+1], &w32_child_handles[child],
(w32_num_children-child-1), HANDLE);
DllExport int
win32_stat(const char *path, struct stat *buffer)
{
+ dTHXo;
char t[MAX_PATH+1];
int l = strlen(path);
int res;
break;
}
}
- dPERLOBJ;
if (USING_WIDE()) {
- dTHX;
A2WHELPER(path, wbuffer, sizeof(wbuffer));
res = _wstat(wbuffer, (struct _stat *)buffer);
}
DllExport char *
win32_getenv(const char *name)
{
- dTHX;
- dPERLOBJ;
- static char *curitem = Nullch; /* XXX threadead */
- static WCHAR *wCuritem = (WCHAR*)Nullch; /* XXX threadead */
- static DWORD curlen = 0, wCurlen = 0;/* XXX threadead */
+ dTHXo;
WCHAR wBuffer[MAX_PATH];
DWORD needlen;
-
- if (USING_WIDE()) {
- if (!wCuritem) {
- wCurlen = 512;
- New(1306,wCuritem,wCurlen,WCHAR);
- }
- }
- if (!curitem) {
- curlen = 512;
- New(1305,curitem,curlen,char);
- }
+ SV *curitem = Nullsv;
if (USING_WIDE()) {
A2WHELPER(name, wBuffer, sizeof(wBuffer));
- needlen = GetEnvironmentVariableW(wBuffer,wCuritem,wCurlen);
+ needlen = GetEnvironmentVariableW(wBuffer, NULL, 0);
}
else
- needlen = GetEnvironmentVariableA(name,curitem,curlen);
+ needlen = GetEnvironmentVariableA(name,NULL,0);
if (needlen != 0) {
+ curitem = sv_2mortal(newSVpvn("", 0));
if (USING_WIDE()) {
- while (needlen > wCurlen) {
- Renew(wCuritem,needlen,WCHAR);
- wCurlen = needlen;
- needlen = GetEnvironmentVariableW(wBuffer,wCuritem,wCurlen);
- }
- if (needlen > curlen) {
- Renew(curitem,needlen,char);
- curlen = needlen;
- }
- W2AHELPER(wCuritem, curitem, curlen);
+ SV *acuritem;
+ do {
+ SvGROW(curitem, (needlen+1)*sizeof(WCHAR));
+ needlen = GetEnvironmentVariableW(wBuffer,
+ (WCHAR*)SvPVX(curitem),
+ needlen);
+ } while (needlen >= SvLEN(curitem)/sizeof(WCHAR));
+ SvCUR_set(curitem, (needlen*sizeof(WCHAR))+1);
+ acuritem = sv_2mortal(newSVsv(curitem));
+ W2AHELPER((WCHAR*)SvPVX(acuritem), SvPVX(curitem), SvCUR(curitem));
}
else {
- while (needlen > curlen) {
- Renew(curitem,needlen,char);
- curlen = needlen;
- needlen = GetEnvironmentVariableA(name,curitem,curlen);
- }
+ do {
+ SvGROW(curitem, needlen+1);
+ needlen = GetEnvironmentVariableA(name,SvPVX(curitem),
+ needlen);
+ } while (needlen >= SvLEN(curitem));
+ SvCUR_set(curitem, needlen);
}
}
else {
/* allow any environment variables that begin with 'PERL'
to be stored in the registry */
- if (curitem)
- *curitem = '\0';
-
- if (strncmp(name, "PERL", 4) == 0) {
- if (curitem) {
- Safefree(curitem);
- curitem = Nullch;
- curlen = 0;
- }
- curitem = GetRegStr(name, &curitem, &curlen);
- }
+ if (strncmp(name, "PERL", 4) == 0)
+ (void)get_regstr(name, &curitem);
}
- if (curitem && *curitem == '\0')
- return Nullch;
+ if (curitem && SvCUR(curitem))
+ return SvPVX(curitem);
- return curitem;
+ return Nullch;
}
DllExport int
win32_putenv(const char *name)
{
+ dTHXo;
char* curitem;
char* val;
WCHAR* wCuritem;
WCHAR* wVal;
int length, relval = -1;
- dPERLOBJ;
+
if (name) {
if (USING_WIDE()) {
- dTHX;
length = strlen(name)+1;
New(1309,wCuritem,length,WCHAR);
- A2WHELPER(name, wCuritem, length*2);
+ A2WHELPER(name, wCuritem, length*sizeof(WCHAR));
wVal = wcschr(wCuritem, '=');
if(wVal) {
*wVal++ = '\0';
DllExport int
win32_utime(const char *filename, struct utimbuf *times)
{
+ dTHXo;
HANDLE handle;
FILETIME ftCreate;
FILETIME ftAccess;
FILETIME ftWrite;
struct utimbuf TimeBuffer;
WCHAR wbuffer[MAX_PATH];
- dPERLOBJ;
int rc;
if (USING_WIDE()) {
- dTHX;
A2WHELPER(filename, wbuffer, sizeof(wbuffer));
rc = _wutime(wbuffer, (struct _utimbuf*)times);
}
DllExport int
win32_waitpid(int pid, int *status, int flags)
{
- dPERLOBJ;
+ dTHXo;
int retval = -1;
if (pid == -1)
return win32_wait(status);
/* XXX this wait emulation only knows about processes
* spawned via win32_spawnvp(P_NOWAIT, ...).
*/
+ dTHXo;
int i, retval;
DWORD exitcode, waitcode;
- dPERLOBJ;
if (!w32_num_children) {
errno = ECHILD;
static VOID CALLBACK TimerProc(HWND win, UINT msg, UINT id, DWORD time)
{
- dPERLOBJ;
+ dTHXo;
KillTimer(NULL,timerid);
timerid=0;
sighandler(14);
* Snag is unless something is looking at the message queue
* nothing happens :-(
*/
- dPERLOBJ;
+ dTHXo;
if (sec)
{
timerid = SetTimer(NULL,timerid,sec*1000,(TIMERPROC)TimerProc);
DllExport char *
win32_crypt(const char *txt, const char *salt)
{
+ dTHXo;
#ifdef HAVE_DES_FCRYPT
dTHR;
- dPERLOBJ;
return des_fcrypt(txt, salt, crypt_buffer);
#else
die("The crypt() function is unimplemented due to excessive paranoia.");
HANDLE fh;
if (!IsWinNT()) {
- dPERLOBJ;
+ dTHXo;
Perl_croak_nocontext("flock() unimplemented on this platform");
return -1;
}
DWORD source = 0;
if (e < 0 || e > sys_nerr) {
- dTHX;
+ dTHXo;
if (e < 0)
e = GetLastError();
}
DllExport void
-win32_str_os_error(pTHX_ void *sv, DWORD dwErr)
+win32_str_os_error(void *sv, DWORD dwErr)
{
DWORD dwLen;
char *sMsg;
|FORMAT_MESSAGE_IGNORE_INSERTS
|FORMAT_MESSAGE_FROM_SYSTEM, NULL,
dwErr, 0, (char *)&sMsg, 1, NULL);
+ /* strip trailing whitespace and period */
if (0 < dwLen) {
- while (0 < dwLen && isSPACE(sMsg[--dwLen]))
- ;
+ do {
+ --dwLen; /* dwLen doesn't include trailing null */
+ } while (0 < dwLen && isSPACE(sMsg[dwLen]));
if ('.' != sMsg[dwLen])
dwLen++;
- sMsg[dwLen]= '\0';
+ sMsg[dwLen] = '\0';
}
if (0 == dwLen) {
sMsg = (char*)LocalAlloc(0, 64/**sizeof(TCHAR)*/);
dwErr, GetLastError());
}
if (sMsg) {
- dPERLOBJ;
+ dTHXo;
sv_setpvn((SV*)sv, sMsg, dwLen);
LocalFree(sMsg);
}
DllExport FILE *
win32_fopen(const char *filename, const char *mode)
{
+ dTHXo;
WCHAR wMode[MODE_SIZE], wBuffer[MAX_PATH];
+
+ if (!*filename)
+ return NULL;
+
if (stricmp(filename, "/dev/null")==0)
filename = "NUL";
- dPERLOBJ;
if (USING_WIDE()) {
- dTHX;
A2WHELPER(mode, wMode, sizeof(wMode));
A2WHELPER(filename, wBuffer, sizeof(wBuffer));
return _wfopen(wBuffer, wMode);
DllExport FILE *
win32_fdopen(int handle, const char *mode)
{
+ dTHXo;
WCHAR wMode[MODE_SIZE];
- dPERLOBJ;
if (USING_WIDE()) {
- dTHX;
A2WHELPER(mode, wMode, sizeof(wMode));
return _wfdopen(handle, wMode);
}
DllExport FILE *
win32_freopen(const char *path, const char *mode, FILE *stream)
{
+ dTHXo;
WCHAR wMode[MODE_SIZE], wBuffer[MAX_PATH];
- dPERLOBJ;
if (stricmp(path, "/dev/null")==0)
path = "NUL";
if (USING_WIDE()) {
- dTHX;
A2WHELPER(mode, wMode, sizeof(wMode));
A2WHELPER(path, wBuffer, sizeof(wBuffer));
return _wfreopen(wBuffer, wMode, stream);
/* start the child */
{
- dTHX;
- dPERLOBJ;
- if ((childpid = do_spawn_nowait(aTHX_ (char*)command)) == -1)
+ dTHXo;
+ if ((childpid = do_spawn_nowait((char*)command)) == -1)
goto cleanup;
/* revert stdfd to whatever it was before */
#ifdef USE_RTL_POPEN
return _pclose(pf);
#else
- dTHX;
- dPERLOBJ;
+ dTHXo;
int childpid, status;
SV *sv;
* it doesn't work under Windows95!
*/
if (IsWinNT()) {
- dPERLOBJ;
+ dTHXo;
if (USING_WIDE()) {
- dTHX;
A2WHELPER(oname, wOldName, sizeof(wOldName));
A2WHELPER(newname, wNewName, sizeof(wNewName));
bResult = MoveFileExW(wOldName,wNewName,
DllExport int
win32_open(const char *path, int flag, ...)
{
+ dTHXo;
va_list ap;
int pmode;
WCHAR wBuffer[MAX_PATH];
- dPERLOBJ;
va_start(ap, flag);
pmode = va_arg(ap, int);
path = "NUL";
if (USING_WIDE()) {
- dTHX;
A2WHELPER(path, wBuffer, sizeof(wBuffer));
return _wopen(wBuffer, flag, pmode);
}
static char *
create_command_line(const char* command, const char * const *args)
{
+ dTHXo;
int index;
char *cmd, *ptr, *arg;
STRLEN len = strlen(command) + 1;
- dPERLOBJ;
for (index = 0; (ptr = (char*)args[index]) != NULL; ++index)
len += strlen(ptr) + 1;
static char *
qualified_path(const char *cmd)
{
+ dTHXo;
char *pathstr;
char *fullcmd, *curfullcmd;
STRLEN cmdlen = 0;
int has_slash = 0;
- dPERLOBJ;
if (!cmd)
return Nullch;
return Nullch;
}
+/* The following are just place holders.
+ * Some hosts may provide and environment that the OS is
+ * not tracking, therefore, these host must provide that
+ * environment and the current directory to CreateProcess
+ */
+
+void*
+get_childenv(void)
+{
+ return NULL;
+}
+
+void
+free_childenv(void* d)
+{
+}
+
+char*
+get_childdir(void)
+{
+ return NULL;
+}
+
+void
+free_childdir(char* d)
+{
+}
+
+
/* XXX this needs to be made more compatible with the spawnvp()
* provided by the various RTLs. In particular, searching for
* *.{com,bat,cmd} files (as done by the RTLs) is unimplemented.
#ifdef USE_RTL_SPAWNVP
return spawnvp(mode, cmdname, (char * const *)argv);
#else
+ dTHXo;
DWORD ret;
+ void* env;
+ char* dir;
STARTUPINFO StartupInfo;
PROCESS_INFORMATION ProcessInformation;
DWORD create = 0;
- dPERLOBJ;
char *cmd = create_command_line(cmdname, strcmp(cmdname, argv[0]) == 0
? &argv[1] : argv);
char *fullcmd = Nullch;
+ env = PerlEnv_get_childenv();
+ dir = PerlEnv_get_childdir();
+
switch(mode) {
case P_NOWAIT: /* asynch + remember result */
if (w32_num_children >= MAXIMUM_WAIT_OBJECTS) {
create |= CREATE_NEW_CONSOLE;
}
-#ifndef DEBUGGING
- StartupInfo.dwFlags |= STARTF_USESHOWWINDOW;
- StartupInfo.wShowWindow = SW_HIDE;
-#endif
-
RETRY:
if (!CreateProcess(cmdname, /* search PATH to find executable */
cmd, /* executable, and its arguments */
NULL, /* thread attributes */
TRUE, /* inherit handles */
create, /* creation flags */
- NULL, /* inherit environment */
- NULL, /* inherit cwd */
+ (LPVOID)env, /* inherit environment */
+ dir, /* inherit cwd */
&StartupInfo,
&ProcessInformation))
{
}
CloseHandle(ProcessInformation.hThread);
+
RETVAL:
+ PerlEnv_free_childenv(env);
+ PerlEnv_free_childdir(dir);
Safefree(cmd);
Safefree(fullcmd);
return (int)ret;
}
DllExport void*
-win32_dynaload(aTHX_ const char*filename)
+win32_dynaload(const char* filename)
{
+ dTHXo;
HMODULE hModule;
- dPERLOBJ;
if (USING_WIDE()) {
WCHAR wfilename[MAX_PATH];
A2WHELPER(filename, wfilename, sizeof(wfilename));
* This must be called before the script is parsed,
* therefore no locking of threads is needed
*/
- dTHX;
- dPERLOBJ;
+ dTHXo;
struct host_link *link;
New(1314, link, 1, struct host_link);
link->host_data = data;
DllExport void *
win32_get_host_data(char *nameId)
{
- dTHX;
- dPERLOBJ;
+ dTHXo;
struct host_link *link = w32_host_link;
while(link) {
if(strEQ(link->nameId, nameId))
}
void
-Perl_init_os_extras(pTHX)
+Perl_init_os_extras(void)
{
+ dTHXo;
char *file = __FILE__;
dXSUB_SYS;
- dPERLOBJ;
w32_perlshell_tokens = Nullch;
w32_perlshell_items = -1;