#include "perl.h"
#define NO_XSLOCKS
-#ifdef PERL_OBJECT
-extern CPerlObj* pPerl;
-#endif
+#define PERL_NO_GET_CONTEXT
#include "XSUB.h"
#include "Win32iop.h"
#define do_aspawn g_do_aspawn
#undef do_spawn
#define do_spawn g_do_spawn
-#undef do_exec
-#define do_exec g_do_exec
+#undef Perl_do_exec
+#define Perl_do_exec g_do_exec
#undef getlogin
#define getlogin g_getlogin
#endif
-static DWORD os_id(void);
static void get_shell(void);
static long tokenize(char *str, char **dest, char ***destv);
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);
#endif
int
-IsWin95(void) {
- return (os_id() == VER_PLATFORM_WIN32_WINDOWS);
+IsWin95(void)
+{
+ return (win32_os_id() == VER_PLATFORM_WIN32_WINDOWS);
}
int
-IsWinNT(void) {
- return (os_id() == VER_PLATFORM_WIN32_NT);
+IsWinNT(void)
+{
+ 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) {
- 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;
optr = ptr;
*ptr = '\0';
ptr = strrchr(mod_name, '/');
+ /* avoid stripping component if there is no slash,
+ * or it doesn't match ... */
if (!ptr || stricmp(ptr+1, strip) != 0) {
- if(!(*strip == '5' && *(ptr+1) == '5'
- && strncmp(strip, base, 5) == 0
- && strncmp(ptr+1, base, 5) == 0))
+ /* ... but not if component matches 5.00X* */
+ if (!ptr || !(*strip == '5' && *(ptr+1) == '5'
+ && strncmp(strip, base, 5) == 0
+ && strncmp(ptr+1, base, 5) == 0))
{
*optr = '/';
ptr = optr;
/* only add directory if it exists */
if (GetFileAttributes(mod_name) != (DWORD) -1) {
/* directory exists */
- 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(char *pl)
{
+ dTHXo;
char *stdlib = "lib";
char buffer[MAX_PATH+1];
- char **path;
- DWORD datalen;
- 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(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;
- 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);
-
- SvCUR_set(sv1, strlen(*path1));
- SvLEN_set(sv1, SvCUR(sv1)+1);
- SvCUR_set(sv2, strlen(*path2));
- SvLEN_set(sv2, SvCUR(sv2)+1);
+ (void)get_emd_part(&sv2, "site/lib", ARCHNAME, "bin", pl, Nullch);
- 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);
* the library functions will get the correct environment
*/
PerlIO *
-my_popen(char *cmd, char *mode)
+Perl_my_popen(pTHX_ char *cmd, char *mode)
{
#ifdef FIXCMD
#define fixcmd(x) { \
}
long
-my_pclose(PerlIO *fp)
+Perl_my_pclose(pTHX_ PerlIO *fp)
{
return win32_pclose(fp);
}
#endif
-static DWORD
-os_id(void)
+DllExport unsigned long
+win32_os_id(void)
{
static OSVERSIONINFO osver;
GetVersionEx(&osver);
w32_platform = osver.dwPlatformId;
}
- return (w32_platform);
+ return (unsigned long)w32_platform;
}
/* Tokenize a string. Words are null-separated, and the list
char **retvstart = 0;
int items = -1;
if (str) {
+ dTHXo;
int slen = strlen(str);
register char *ret;
register char **retv;
static void
get_shell(void)
{
+ 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(void *vreally, void **vmark, void **vsp)
{
+ dTHXo;
SV *really = (SV*)vreally;
SV **mark = (SV**)vmark;
SV **sp = (SV**)vsp;
if (flag != P_NOWAIT) {
if (status < 0) {
- if (PL_dowarn)
- warn("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(char *cmd, int exectype)
{
+ dTHXo;
char **a;
char *s;
char **argv;
}
if (exectype != EXECF_SPAWN_NOWAIT) {
if (status < 0) {
- if (PL_dowarn)
- warn("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;
}
bool
-do_exec(char *cmd)
+Perl_do_exec(pTHX_ char *cmd)
{
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)
{
+ dTHXo;
DIR *p;
long len;
long idx;
char scanname[MAX_PATH+3];
struct stat sbuf;
- WIN32_FIND_DATA FindData;
+ WIN32_FIND_DATAA aFindData;
+ WIN32_FIND_DATAW wFindData;
HANDLE fh;
+ char buffer[MAX_PATH*2];
+ WCHAR wbuffer[MAX_PATH];
+ char* ptr;
len = strlen(filename);
if (len > MAX_PATH)
scanname[len] = '\0';
/* do the FindFirstFile call */
- fh = FindFirstFile(scanname, &FindData);
+ if (USING_WIDE()) {
+ A2WHELPER(scanname, wbuffer, sizeof(wbuffer));
+ fh = FindFirstFileW(wbuffer, &wFindData);
+ }
+ else {
+ fh = FindFirstFileA(scanname, &aFindData);
+ }
if (fh == INVALID_HANDLE_VALUE) {
/* FindFirstFile() fails on empty drives! */
if (GetLastError() == ERROR_FILE_NOT_FOUND)
/* now allocate the first part of the string table for
* the filenames that we find.
*/
- idx = strlen(FindData.cFileName)+1;
+ if (USING_WIDE()) {
+ W2AHELPER(wFindData.cFileName, buffer, sizeof(buffer));
+ ptr = buffer;
+ }
+ else {
+ ptr = aFindData.cFileName;
+ }
+ idx = strlen(ptr)+1;
New(1304, p->start, idx, char);
if (p->start == NULL)
- croak("opendir: malloc failed!\n");
- strcpy(p->start, FindData.cFileName);
+ Perl_croak_nocontext("opendir: malloc failed!\n");
+ strcpy(p->start, ptr);
p->nfiles++;
/* loop finding all the files that match the wildcard
* the variable idx should point one past the null terminator
* of the previous string found.
*/
- while (FindNextFile(fh, &FindData)) {
- len = strlen(FindData.cFileName);
+ while (USING_WIDE()
+ ? FindNextFileW(fh, &wFindData)
+ : FindNextFileA(fh, &aFindData)) {
+ if (USING_WIDE()) {
+ W2AHELPER(wFindData.cFileName, buffer, sizeof(buffer));
+ }
+ /* ptr is set above to the correct area */
+ len = strlen(ptr);
/* bump the string table size by enough for the
* new name and it's null terminator
*/
Renew(p->start, idx+len+1, char);
if (p->start == NULL)
- croak("opendir: malloc failed!\n");
- strcpy(&p->start[idx], FindData.cFileName);
+ Perl_croak_nocontext("opendir: malloc failed!\n");
+ strcpy(&p->start[idx], ptr);
p->nfiles++;
idx += len+1;
}
/* 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)
{
+ dTHXo;
Safefree(dirp->start);
Safefree(dirp);
return 1;
char *
getlogin(void)
{
- dTHR;
+ dTHXo;
char *buf = getlogin_buffer;
DWORD size = sizeof(getlogin_buffer);
if (GetUserName(buf,&size))
static long
find_pid(int pid)
{
+ dTHXo;
long child;
for (child = 0 ; child < w32_num_children ; ++child) {
if (w32_child_pids[child] == pid)
remove_dead_process(long child)
{
if (child >= 0) {
+ 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;
+ WCHAR wbuffer[MAX_PATH];
if (l > 1) {
switch(path[l - 1]) {
break;
}
}
- res = stat(path,buffer);
+ if (USING_WIDE()) {
+ A2WHELPER(path, wbuffer, sizeof(wbuffer));
+ res = _wstat(wbuffer, (struct _stat *)buffer);
+ }
+ else {
+ res = stat(path, buffer);
+ }
if (res < 0) {
/* CRT is buggy on sharenames, so make sure it really isn't.
* XXX using GetFileAttributesEx() will enable us to set
* buffer->st_*time (but note that's not available on the
* Windows of 1995) */
- DWORD r = GetFileAttributes(path);
+ DWORD r;
+ if (USING_WIDE()) {
+ r = GetFileAttributesW(wbuffer);
+ }
+ else {
+ r = GetFileAttributesA(path);
+ }
if (r != 0xffffffff && (r & FILE_ATTRIBUTE_DIRECTORY)) {
/* buffer may still contain old garbage since stat() failed */
Zero(buffer, 1, struct stat);
&& (path[2] == '\\' || path[2] == '/'))
{
/* The drive can be inaccessible, some _stat()s are buggy */
- if (!GetVolumeInformation(path,NULL,0,NULL,NULL,NULL,NULL,0)) {
+ if (USING_WIDE()
+ ? !GetVolumeInformationW(wbuffer,NULL,0,NULL,NULL,NULL,NULL,0)
+ : !GetVolumeInformationA(path,NULL,0,NULL,NULL,NULL,NULL,0)) {
errno = ENOENT;
return -1;
}
DllExport char *
win32_getenv(const char *name)
{
- static char *curitem = Nullch; /* XXX threadead */
- static DWORD curlen = 0; /* XXX threadead */
+ dTHXo;
+ WCHAR wBuffer[MAX_PATH];
DWORD needlen;
- if (!curitem) {
- curlen = 512;
- New(1305,curitem,curlen,char);
- }
+ SV *curitem = Nullsv;
- needlen = GetEnvironmentVariable(name,curitem,curlen);
+ if (USING_WIDE()) {
+ A2WHELPER(name, wBuffer, sizeof(wBuffer));
+ needlen = GetEnvironmentVariableW(wBuffer, NULL, 0);
+ }
+ else
+ needlen = GetEnvironmentVariableA(name,NULL,0);
if (needlen != 0) {
- while (needlen > curlen) {
- Renew(curitem,needlen,char);
- curlen = needlen;
- needlen = GetEnvironmentVariable(name,curitem,curlen);
+ curitem = sv_2mortal(newSVpvn("", 0));
+ if (USING_WIDE()) {
+ 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 {
+ 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;
- int relval = -1;
- if(name) {
- New(1309,curitem,strlen(name)+1,char);
- strcpy(curitem, name);
- val = strchr(curitem, '=');
- if(val) {
- /* The sane way to deal with the environment.
- * Has these advantages over putenv() & co.:
- * * enables us to store a truly empty value in the
- * environment (like in UNIX).
- * * we don't have to deal with RTL globals, bugs and leaks.
- * * Much faster.
- * Why you may want to enable USE_WIN32_RTL_ENV:
- * * environ[] and RTL functions will not reflect changes,
- * which might be an issue if extensions want to access
- * the env. via RTL. This cuts both ways, since RTL will
- * not see changes made by extensions that call the Win32
- * functions directly, either.
- * GSAR 97-06-07
- */
- *val++ = '\0';
- if(SetEnvironmentVariable(curitem, *val ? val : NULL))
- relval = 0;
+ WCHAR* wCuritem;
+ WCHAR* wVal;
+ int length, relval = -1;
+
+ if (name) {
+ if (USING_WIDE()) {
+ length = strlen(name)+1;
+ New(1309,wCuritem,length,WCHAR);
+ A2WHELPER(name, wCuritem, length*sizeof(WCHAR));
+ wVal = wcschr(wCuritem, '=');
+ if(wVal) {
+ *wVal++ = '\0';
+ if(SetEnvironmentVariableW(wCuritem, *wVal ? wVal : NULL))
+ relval = 0;
+ }
+ Safefree(wCuritem);
+ }
+ else {
+ New(1309,curitem,strlen(name)+1,char);
+ strcpy(curitem, name);
+ val = strchr(curitem, '=');
+ if(val) {
+ /* The sane way to deal with the environment.
+ * Has these advantages over putenv() & co.:
+ * * enables us to store a truly empty value in the
+ * environment (like in UNIX).
+ * * we don't have to deal with RTL globals, bugs and leaks.
+ * * Much faster.
+ * Why you may want to enable USE_WIN32_RTL_ENV:
+ * * environ[] and RTL functions will not reflect changes,
+ * which might be an issue if extensions want to access
+ * the env. via RTL. This cuts both ways, since RTL will
+ * not see changes made by extensions that call the Win32
+ * functions directly, either.
+ * GSAR 97-06-07
+ */
+ *val++ = '\0';
+ if(SetEnvironmentVariableA(curitem, *val ? val : NULL))
+ relval = 0;
+ }
+ Safefree(curitem);
}
- Safefree(curitem);
}
return relval;
}
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];
- int rc = utime(filename,times);
+ int rc;
+ if (USING_WIDE()) {
+ A2WHELPER(filename, wbuffer, sizeof(wbuffer));
+ rc = _wutime(wbuffer, (struct _utimbuf*)times);
+ }
+ else {
+ rc = utime(filename, times);
+ }
/* EACCES: path specifies directory or readonly file */
if (rc == 0 || errno != EACCES /* || !IsWinNT() */)
return rc;
}
/* This will (and should) still fail on readonly files */
- handle = CreateFile(filename, GENERIC_READ | GENERIC_WRITE,
- FILE_SHARE_READ | FILE_SHARE_DELETE, NULL,
- OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
+ if (USING_WIDE()) {
+ handle = CreateFileW(wbuffer, GENERIC_READ | GENERIC_WRITE,
+ FILE_SHARE_READ | FILE_SHARE_DELETE, NULL,
+ OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
+ }
+ else {
+ handle = CreateFileA(filename, GENERIC_READ | GENERIC_WRITE,
+ FILE_SHARE_READ | FILE_SHARE_DELETE, NULL,
+ OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
+ }
if (handle == INVALID_HANDLE_VALUE)
return rc;
char *arch;
GetSystemInfo(&info);
-#ifdef __MINGW32__
- switch (info.DUMMYUNIONNAME.DUMMYSTRUCTNAME.wProcessorArchitecture) {
-#else
-#ifdef __BORLANDC__
+#if defined(__BORLANDC__) || defined(__MINGW32__)
switch (info.u.s.wProcessorArchitecture) {
#else
switch (info.wProcessorArchitecture) {
#endif
-#endif
case PROCESSOR_ARCHITECTURE_INTEL:
arch = "x86"; break;
case PROCESSOR_ARCHITECTURE_MIPS:
DllExport int
win32_waitpid(int pid, int *status, int flags)
{
+ 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;
static VOID CALLBACK TimerProc(HWND win, UINT msg, UINT id, DWORD time)
{
- KillTimer(NULL,timerid);
- timerid=0;
- sighandler(14);
+ dTHXo;
+ KillTimer(NULL,timerid);
+ timerid=0;
+ sighandler(14);
}
DllExport unsigned int
* Snag is unless something is looking at the message queue
* nothing happens :-(
*/
+ dTHXo;
if (sec)
{
timerid = SetTimer(NULL,timerid,sec*1000,(TIMERPROC)TimerProc);
if (!timerid)
- croak("Cannot set timer");
+ Perl_croak_nocontext("Cannot set timer");
}
else
{
{
#ifdef HAVE_DES_FCRYPT
dTHR;
+ dTHXo;
return des_fcrypt(txt, salt, crypt_buffer);
#else
die("The crypt() function is unimplemented due to excessive paranoia.");
HANDLE fh;
if (!IsWinNT()) {
- croak("flock() unimplemented on this platform");
+ dTHXo;
+ Perl_croak_nocontext("flock() unimplemented on this platform");
return -1;
}
fh = (HANDLE)_get_osfhandle(fd);
DWORD source = 0;
if (e < 0 || e > sys_nerr) {
- dTHR;
+ dTHXo;
if (e < 0)
e = GetLastError();
dwErr, GetLastError());
}
if (sMsg) {
+ dTHXo;
sv_setpvn((SV*)sv, sMsg, dwLen);
LocalFree(sMsg);
}
return fwrite(buf, size, count, fp);
}
+#define MODE_SIZE 10
+
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)
- return fopen("NUL", mode);
+ filename = "NUL";
+
+ if (USING_WIDE()) {
+ A2WHELPER(mode, wMode, sizeof(wMode));
+ A2WHELPER(filename, wBuffer, sizeof(wBuffer));
+ return _wfopen(wBuffer, wMode);
+ }
return fopen(filename, mode);
}
#endif
DllExport FILE *
-win32_fdopen( int handle, const char *mode)
+win32_fdopen(int handle, const char *mode)
{
+ dTHXo;
+ WCHAR wMode[MODE_SIZE];
+ if (USING_WIDE()) {
+ A2WHELPER(mode, wMode, sizeof(wMode));
+ return _wfdopen(handle, wMode);
+ }
return fdopen(handle, (char *) mode);
}
DllExport FILE *
-win32_freopen( const char *path, const char *mode, FILE *stream)
+win32_freopen(const char *path, const char *mode, FILE *stream)
{
+ dTHXo;
+ WCHAR wMode[MODE_SIZE], wBuffer[MAX_PATH];
if (stricmp(path, "/dev/null")==0)
- return freopen("NUL", mode, stream);
+ path = "NUL";
+
+ if (USING_WIDE()) {
+ A2WHELPER(mode, wMode, sizeof(wMode));
+ A2WHELPER(path, wBuffer, sizeof(wBuffer));
+ return _wfreopen(wBuffer, wMode, stream);
+ }
return freopen(path, mode, stream);
}
win32_close(p[child]);
/* start the child */
- if ((childpid = do_spawn_nowait((char*)command)) == -1)
- goto cleanup;
+ {
+ dTHXo;
+ if ((childpid = do_spawn_nowait((char*)command)) == -1)
+ goto cleanup;
- /* revert stdfd to whatever it was before */
- if (win32_dup2(oldfd, stdfd) == -1)
- goto cleanup;
+ /* revert stdfd to whatever it was before */
+ if (win32_dup2(oldfd, stdfd) == -1)
+ goto cleanup;
+
+ /* close saved handle */
+ win32_close(oldfd);
- /* close saved handle */
- win32_close(oldfd);
+ sv_setiv(*av_fetch(w32_fdpid, p[parent], TRUE), childpid);
- sv_setiv(*av_fetch(w32_fdpid, p[parent], TRUE), childpid);
+ /* set process id so that it can be returned by perl's open() */
+ PL_forkprocess = childpid;
+ }
/* we have an fd, return a file stream */
return (win32_fdopen(p[parent], (char *)mode));
#ifdef USE_RTL_POPEN
return _pclose(pf);
#else
-
+ dTHXo;
int childpid, status;
SV *sv;
DllExport int
win32_rename(const char *oname, const char *newname)
{
+ WCHAR wOldName[MAX_PATH];
+ WCHAR wNewName[MAX_PATH];
+ BOOL bResult;
/* XXX despite what the documentation says about MoveFileEx(),
* it doesn't work under Windows95!
*/
if (IsWinNT()) {
- if (!MoveFileEx(oname,newname,
- MOVEFILE_COPY_ALLOWED|MOVEFILE_REPLACE_EXISTING)) {
+ dTHXo;
+ if (USING_WIDE()) {
+ A2WHELPER(oname, wOldName, sizeof(wOldName));
+ A2WHELPER(newname, wNewName, sizeof(wNewName));
+ bResult = MoveFileExW(wOldName,wNewName,
+ MOVEFILE_COPY_ALLOWED|MOVEFILE_REPLACE_EXISTING);
+ }
+ else {
+ bResult = MoveFileExA(oname,newname,
+ MOVEFILE_COPY_ALLOWED|MOVEFILE_REPLACE_EXISTING);
+ }
+ if (!bResult) {
DWORD err = GetLastError();
switch (err) {
case ERROR_BAD_NET_NAME:
DllExport int
win32_open(const char *path, int flag, ...)
{
+ dTHXo;
va_list ap;
int pmode;
+ WCHAR wBuffer[MAX_PATH];
va_start(ap, flag);
pmode = va_arg(ap, int);
va_end(ap);
if (stricmp(path, "/dev/null")==0)
- return open("NUL", flag, pmode);
+ path = "NUL";
+
+ if (USING_WIDE()) {
+ A2WHELPER(path, wBuffer, sizeof(wBuffer));
+ return _wopen(wBuffer, flag, pmode);
+ }
return open(path,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;
static char *
qualified_path(const char *cmd)
{
+ dTHXo;
char *pathstr;
char *fullcmd, *curfullcmd;
STRLEN cmdlen = 0;
#ifdef USE_RTL_SPAWNVP
return spawnvp(mode, cmdname, (char * const *)argv);
#else
+ dTHXo;
DWORD ret;
STARTUPINFO StartupInfo;
PROCESS_INFORMATION ProcessInformation;
}
memset(&StartupInfo,0,sizeof(StartupInfo));
StartupInfo.cb = sizeof(StartupInfo);
- StartupInfo.wShowWindow = SW_SHOWDEFAULT;
+ StartupInfo.hStdInput = GetStdHandle(STD_INPUT_HANDLE);
+ StartupInfo.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
+ StartupInfo.hStdError = GetStdHandle(STD_ERROR_HANDLE);
+ if (StartupInfo.hStdInput != INVALID_HANDLE_VALUE &&
+ StartupInfo.hStdOutput != INVALID_HANDLE_VALUE &&
+ StartupInfo.hStdError != INVALID_HANDLE_VALUE)
+ {
+ StartupInfo.dwFlags |= STARTF_USESTDHANDLES;
+ }
+ else {
+ create |= CREATE_NEW_CONSOLE;
+ }
+
+#ifndef DEBUGGING
+ StartupInfo.dwFlags |= STARTF_USESHOWWINDOW;
+ StartupInfo.wShowWindow = SW_HIDE;
+#endif
RETRY:
if (!CreateProcess(cmdname, /* search PATH to find executable */
return _get_osfhandle(fd);
}
+DllExport void*
+win32_dynaload(const char* filename)
+{
+ dTHXo;
+ HMODULE hModule;
+ if (USING_WIDE()) {
+ WCHAR wfilename[MAX_PATH];
+ A2WHELPER(filename, wfilename, sizeof(wfilename));
+ hModule = LoadLibraryExW(wfilename, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
+ }
+ else {
+ hModule = LoadLibraryExA(filename, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
+ }
+ return hModule;
+}
+
+DllExport int
+win32_add_host(char *nameId, void *data)
+{
+ /*
+ * This must be called before the script is parsed,
+ * therefore no locking of threads is needed
+ */
+ dTHXo;
+ struct host_link *link;
+ New(1314, link, 1, struct host_link);
+ link->host_data = data;
+ link->nameId = nameId;
+ link->next = w32_host_link;
+ w32_host_link = link;
+ return 1;
+}
+
+DllExport void *
+win32_get_host_data(char *nameId)
+{
+ dTHXo;
+ struct host_link *link = w32_host_link;
+ while(link) {
+ if(strEQ(link->nameId, nameId))
+ return link->host_data;
+ link = link->next;
+ }
+ return Nullch;
+}
+
/*
* Extras.
*/
{
dXSARGS;
if (items != 1)
- croak("usage: Win32::SetCurrentDirectory($cwd)");
+ Perl_croak(aTHX_ "usage: Win32::SetCurrentDirectory($cwd)");
if (SetCurrentDirectory(SvPV_nolen(ST(0))))
XSRETURN_YES;
{
dXSARGS;
if (items != 1)
- croak("usage: Win32::SetLastError($error)");
+ Perl_croak(aTHX_ "usage: Win32::SetLastError($error)");
SetLastError(SvIV(ST(0)));
XSRETURN_EMPTY;
}
char msgbuf[1024];
if (items != 1)
- croak("usage: Win32::FormatMessage($errno)");
+ Perl_croak(aTHX_ "usage: Win32::FormatMessage($errno)");
if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,
&source, SvIV(ST(0)), 0,
BOOL bSuccess = FALSE;
if (items != 3)
- croak("usage: Win32::Spawn($cmdName, $args, $PID)");
+ Perl_croak(aTHX_ "usage: Win32::Spawn($cmdName, $args, $PID)");
cmd = SvPV_nolen(ST(0));
args = SvPV_nolen(ST(1));
DWORD len;
if (items != 1)
- croak("usage: Win32::GetShortPathName($longPathName)");
+ Perl_croak(aTHX_ "usage: Win32::GetShortPathName($longPathName)");
shortpath = sv_mortalcopy(ST(0));
SvUPGRADE(shortpath, SVt_PV);
DWORD len;
if (items != 1)
- croak("usage: Win32::GetFullPathName($filename)");
+ Perl_croak(aTHX_ "usage: Win32::GetFullPathName($filename)");
filename = ST(0);
fullpath = sv_mortalcopy(filename);
STRLEN len;
if (items != 1)
- croak("usage: Win32::GetLongPathName($pathname)");
+ Perl_croak(aTHX_ "usage: Win32::GetLongPathName($pathname)");
path = ST(0);
pathstr = SvPV(path,len);
{
dXSARGS;
if (items != 1)
- croak("usage: Win32::Sleep($milliseconds)");
+ Perl_croak(aTHX_ "usage: Win32::Sleep($milliseconds)");
Sleep(SvIV(ST(0)));
XSRETURN_YES;
}
{
dXSARGS;
if (items != 3)
- croak("usage: Win32::CopyFile($from, $to, $overwrite)");
+ Perl_croak(aTHX_ "usage: Win32::CopyFile($from, $to, $overwrite)");
if (CopyFile(SvPV_nolen(ST(0)), SvPV_nolen(ST(1)), !SvTRUE(ST(2))))
XSRETURN_YES;
XSRETURN_NO;
}
void
-Perl_init_os_extras()
+Perl_init_os_extras(void)
{
+ dTHXo;
char *file = __FILE__;
dXSUB_SYS;
}
#endif
+
projects / p5sagit/p5-mst-13.2.git / blobdiff