platform/shared/ruby/win32/win32.c in rhodes-5.5.15 vs platform/shared/ruby/win32/win32.c in rhodes-5.5.17
- old
+ new
@@ -27,10 +27,11 @@
#include <windows.h>
#include <winbase.h>
#include <wincon.h>
+
#ifndef _WIN32_WCE
#include <share.h>
#endif
#ifndef _WP8_LIB
@@ -63,10 +64,14 @@
#undef stat
#undef fclose
#undef close
#undef setsockopt
+#ifdef RHODES_VERSION_2
+ #define _filbuf fgetc
+ #define _flsbuf fputc
+#endif
#if defined __BORLANDC__ || defined _WIN32_WCE
# define _filbuf _fgetc
# define _flsbuf _fputc
# define enough_to_get(n) (--(n) >= 0)
@@ -93,10 +98,17 @@
#define rb_w32_open_osfhandle(osfhandle, flags) _open_osfhandle(osfhandle, flags)
#endif//_WIN32_WCE
static int wstati64(const WCHAR *path, struct stati64 *st);
VALUE rb_w32_conv_from_wchar(const WCHAR *wstr, rb_encoding *enc);
+
+#ifdef RHODES_VERSION_2
+# define _filbuf _fgetc_nolock
+# define _flsbuf _fputc_nolock
+static FARPROC get_proc_address(const char *module, const char *func, HANDLE *mh);
+#endif;
+
#define RUBY_CRITICAL(expr) do { expr; } while (0)
/* errno mapping */
static struct {
DWORD winerr;
@@ -238,21 +250,21 @@
rb_w32_map_errno(DWORD winerr)
{
int i;
if (winerr == 0) {
- return 0;
+ return 0;
}
for (i = 0; i < (int)(sizeof(errmap) / sizeof(*errmap)); i++) {
- if (errmap[i].winerr == winerr) {
- return errmap[i].err;
- }
+ if (errmap[i].winerr == winerr) {
+ return errmap[i].err;
}
+ }
if (winerr >= WSABASEERR) {
- return winerr;
+ return winerr;
}
return EINVAL;
}
#define map_errno rb_w32_map_errno
@@ -296,34 +308,34 @@
{
static HANDLE current_process_handle = NULL;
HANDLE h;
if (!current_process_handle)
- current_process_handle = GetCurrentProcess();
+ current_process_handle = GetCurrentProcess();
if (!DuplicateHandle(current_process_handle, GetCurrentThread(),
- current_process_handle, &h,
- 0, FALSE, DUPLICATE_SAME_ACCESS))
- return NULL;
+ current_process_handle, &h,
+ 0, FALSE, DUPLICATE_SAME_ACCESS))
+ return NULL;
return h;
}
/* simulate flock by locking a range on the file */
#define LK_ERR(f,i) \
do { \
- if (f) \
- i = 0; \
- else { \
- DWORD err = GetLastError(); \
- if (err == ERROR_LOCK_VIOLATION || err == ERROR_IO_PENDING) \
- errno = EWOULDBLOCK; \
- else if (err == ERROR_NOT_LOCKED) \
- i = 0; \
- else \
- errno = map_errno(err); \
- } \
+ if (f) \
+ i = 0; \
+ else { \
+ DWORD err = GetLastError(); \
+ if (err == ERROR_LOCK_VIOLATION || err == ERROR_IO_PENDING) \
+ errno = EWOULDBLOCK; \
+ else if (err == ERROR_NOT_LOCKED) \
+ i = 0; \
+ else \
+ errno = map_errno(err); \
+ } \
} while (0)
#define LK_LEN ULONG_MAX
static uintptr_t
flock_winnt(uintptr_t self, int argc, uintptr_t* argv)
@@ -335,30 +347,30 @@
memset(&o, 0, sizeof(o));
switch(oper) {
case LOCK_SH: /* shared lock */
- LK_ERR(LockFileEx(fh, 0, 0, LK_LEN, LK_LEN, &o), i);
- break;
+ LK_ERR(LockFileEx(fh, 0, 0, LK_LEN, LK_LEN, &o), i);
+ break;
case LOCK_EX: /* exclusive lock */
- LK_ERR(LockFileEx(fh, LOCKFILE_EXCLUSIVE_LOCK, 0, LK_LEN, LK_LEN, &o), i);
- break;
+ LK_ERR(LockFileEx(fh, LOCKFILE_EXCLUSIVE_LOCK, 0, LK_LEN, LK_LEN, &o), i);
+ break;
case LOCK_SH|LOCK_NB: /* non-blocking shared lock */
- LK_ERR(LockFileEx(fh, LOCKFILE_FAIL_IMMEDIATELY, 0, LK_LEN, LK_LEN, &o), i);
- break;
+ LK_ERR(LockFileEx(fh, LOCKFILE_FAIL_IMMEDIATELY, 0, LK_LEN, LK_LEN, &o), i);
+ break;
case LOCK_EX|LOCK_NB: /* non-blocking exclusive lock */
- LK_ERR(LockFileEx(fh,
- LOCKFILE_EXCLUSIVE_LOCK|LOCKFILE_FAIL_IMMEDIATELY,
- 0, LK_LEN, LK_LEN, &o), i);
- break;
+ LK_ERR(LockFileEx(fh,
+ LOCKFILE_EXCLUSIVE_LOCK|LOCKFILE_FAIL_IMMEDIATELY,
+ 0, LK_LEN, LK_LEN, &o), i);
+ break;
case LOCK_UN: /* unlock lock */
case LOCK_UN|LOCK_NB: /* unlock is always non-blocking, I hope */
- LK_ERR(UnlockFileEx(fh, 0, LK_LEN, LK_LEN, &o), i);
- break;
+ LK_ERR(UnlockFileEx(fh, 0, LK_LEN, LK_LEN, &o), i);
+ break;
default: /* unknown */
- errno = EINVAL;
- break;
+ errno = EINVAL;
+ break;
}
return i;
}
#ifdef WIN95
@@ -369,24 +381,24 @@
const HANDLE fh = (HANDLE)self;
const int oper = argc;
switch(oper) {
case LOCK_EX:
- do {
- LK_ERR(LockFile(fh, 0, 0, LK_LEN, LK_LEN), i);
- } while (i && errno == EWOULDBLOCK);
- break;
+ do {
+ LK_ERR(LockFile(fh, 0, 0, LK_LEN, LK_LEN), i);
+ } while (i && errno == EWOULDBLOCK);
+ break;
case LOCK_EX|LOCK_NB:
- LK_ERR(LockFile(fh, 0, 0, LK_LEN, LK_LEN), i);
- break;
+ LK_ERR(LockFile(fh, 0, 0, LK_LEN, LK_LEN), i);
+ break;
case LOCK_UN:
case LOCK_UN|LOCK_NB:
- LK_ERR(UnlockFile(fh, 0, 0, LK_LEN, LK_LEN), i);
- break;
+ LK_ERR(UnlockFile(fh, 0, 0, LK_LEN, LK_LEN), i);
+ break;
default:
- errno = EINVAL;
- break;
+ errno = EINVAL;
+ break;
}
return i;
}
#endif
@@ -397,41 +409,41 @@
{
#ifdef WIN95
static asynchronous_func_t locker = NULL;
if (!locker) {
- if (IsWinNT())
- locker = flock_winnt;
- else
- locker = flock_win95;
+ if (IsWinNT())
+ locker = flock_winnt;
+ else
+ locker = flock_win95;
}
#else
const asynchronous_func_t locker = flock_winnt;
#endif
return rb_w32_asynchronize(locker,
- (VALUE)_get_osfhandle(fd), oper, NULL,
- (DWORD)-1);
+ (VALUE)_get_osfhandle(fd), oper, NULL,
+ (DWORD)-1);
}
static inline WCHAR *
translate_wchar(WCHAR *p, int from, int to)
{
for (; *p; p++) {
- if (*p == from)
- *p = to;
+ if (*p == from)
+ *p = to;
}
return p;
}
static inline char *
translate_char(char *p, int from, int to)
{
while (*p) {
- if ((unsigned char)*p == from)
- *p = to;
- p = CharNext(p);
+ if ((unsigned char)*p == from)
+ *p = to;
+ p = CharNext(p);
}
return p;
}
#ifndef CSIDL_LOCAL_APPDATA
@@ -455,40 +467,65 @@
{
LPITEMIDLIST pidl;
LPMALLOC alloc;
BOOL f = FALSE;
if (SHGetSpecialFolderLocation(NULL, n, &pidl) == 0) {
- f = SHGetPathFromIDListW(pidl, env);
- SHGetMalloc(&alloc);
- alloc->lpVtbl->Free(alloc, pidl);
- alloc->lpVtbl->Release(alloc);
+ f = SHGetPathFromIDListW(pidl, env);
+ SHGetMalloc(&alloc);
+ alloc->lpVtbl->Free(alloc, pidl);
+ alloc->lpVtbl->Release(alloc);
}
return f;
} */
static void
regulate_path(WCHAR *path)
{
WCHAR *p = translate_wchar(path, L'\\', L'/');
if (p - path == 2 && path[1] == L':') {
- *p++ = L'/';
- *p = L'\0';
+ *p++ = L'/';
+ *p = L'\0';
}
}
+
+#ifdef RHODES_VERSION_2
+static FARPROC get_proc_address(const char *module, const char *func, HANDLE *mh)
+{
+ HANDLE h;
+ FARPROC ptr;
+
+ if (mh)
+ h = LoadLibrary(module);
+ else
+ h = GetModuleHandle(module);
+ if (!h)
+ return NULL;
+
+ ptr = GetProcAddress(h, func);
+ if (mh) {
+ if (ptr)
+ *mh = h;
+ else
+ FreeLibrary(h);
+ }
+ return ptr;
+}
+#endif
+
static UINT
get_system_directory(WCHAR *path, UINT len)
{
HANDLE hKernel = GetModuleHandle("kernel32.dll");
if (hKernel) {
- typedef UINT WINAPI wgetdir_func(WCHAR*, UINT);
- FARPROC ptr = GetProcAddress(hKernel, "GetSystemWindowsDirectoryW");
- if (ptr) {
- return (*(wgetdir_func *)ptr)(path, len);
- }
+ typedef UINT WINAPI wgetdir_func(WCHAR*, UINT);
+ FARPROC ptr = GetProcAddress(hKernel, "GetSystemWindowsDirectoryW");
+ if (ptr) {
+ return (*(wgetdir_func *)ptr)(path, len);
}
+ }
return GetWindowsDirectoryW(path, len);
}
#define numberof(array) (sizeof(array) / sizeof(*array))
/*
@@ -507,11 +544,11 @@
{
static const WCHAR temp[] = L"temp";
WCHAR *p;
if (!get_special_folder(CSIDL_LOCAL_APPDATA, path)) {
- if (get_system_directory(path, len)) return 0;
+ if (get_system_directory(path, len)) return 0;
}
p = translate_wchar(path, L'\\', L'/');
if (*(p - 1) != L'/') *p++ = L'/';
if (p - path + numberof(temp) >= len) return 0;
memcpy(p, temp, sizeof(temp));
@@ -525,57 +562,57 @@
struct {WCHAR name[6], eq, val[_MAX_PATH];} wk;
DWORD len;
BOOL f;
#define env wk.val
#define set_env_val(vname) do { \
- typedef char namesizecheck[numberof(wk.name) < numberof(vname) - 1 ? -1 : 1]; \
- WCHAR *const buf = wk.name + numberof(wk.name) - numberof(vname) + 1; \
- MEMCPY(buf, vname, WCHAR, numberof(vname) - 1); \
- _wputenv(buf); \
+ typedef char namesizecheck[numberof(wk.name) < numberof(vname) - 1 ? -1 : 1]; \
+ WCHAR *const buf = wk.name + numberof(wk.name) - numberof(vname) + 1; \
+ MEMCPY(buf, vname, WCHAR, numberof(vname) - 1); \
+ _wputenv(buf); \
} while (0)
wk.eq = L'=';
if (!GetEnvironmentVariableW(L"HOME", env, numberof(env))) {
- f = FALSE;
- if (GetEnvironmentVariableW(L"HOMEDRIVE", env, numberof(env)))
- len = lstrlenW(env);
- else
- len = 0;
- if (GetEnvironmentVariableW(L"HOMEPATH", env + len, numberof(env) - len) || len) {
- f = TRUE;
- }
- else if (GetEnvironmentVariableW(L"USERPROFILE", env, numberof(env))) {
- f = TRUE;
- }
- else if (get_special_folder(CSIDL_PROFILE, env)) {
- f = TRUE;
- }
- else if (get_special_folder(CSIDL_PERSONAL, env)) {
- f = TRUE;
- }
- if (f) {
- regulate_path(env);
- set_env_val(L"HOME");
- }
+ f = FALSE;
+ if (GetEnvironmentVariableW(L"HOMEDRIVE", env, numberof(env)))
+ len = lstrlenW(env);
+ else
+ len = 0;
+ if (GetEnvironmentVariableW(L"HOMEPATH", env + len, numberof(env) - len) || len) {
+ f = TRUE;
}
+ else if (GetEnvironmentVariableW(L"USERPROFILE", env, numberof(env))) {
+ f = TRUE;
+ }
+ else if (get_special_folder(CSIDL_PROFILE, env)) {
+ f = TRUE;
+ }
+ else if (get_special_folder(CSIDL_PERSONAL, env)) {
+ f = TRUE;
+ }
+ if (f) {
+ regulate_path(env);
+ set_env_val(L"HOME");
+ }
+ }
if (!GetEnvironmentVariableW(L"USER", env, numberof(env))) {
- if (!GetEnvironmentVariableW(L"USERNAME", env, numberof(env)) &&
- !GetUserNameW(env, (len = numberof(env), &len))) {
- NTLoginName = "<Unknown>";
- return;
- }
- set_env_val(L"USER");
+ if (!GetEnvironmentVariableW(L"USERNAME", env, numberof(env)) &&
+ !GetUserNameW(env, (len = numberof(env), &len))) {
+ NTLoginName = "<Unknown>";
+ return;
}
+ set_env_val(L"USER");
+ }
NTLoginName = strdup(rb_w32_getenv("USER"));
if (!GetEnvironmentVariableW(TMPDIR, env, numberof(env)) &&
- !GetEnvironmentVariableW(L"TMP", env, numberof(env)) &&
- !GetEnvironmentVariableW(L"TEMP", env, numberof(env)) &&
- rb_w32_system_tmpdir(env, numberof(env))) {
- set_env_val(TMPDIR);
+ !GetEnvironmentVariableW(L"TMP", env, numberof(env)) &&
+ !GetEnvironmentVariableW(L"TEMP", env, numberof(env)) &&
+ rb_w32_system_tmpdir(env, numberof(env))) {
+ set_env_val(TMPDIR);
}
#undef env
#undef set_env_val
}*/
@@ -592,12 +629,12 @@
static void
init_func(void)
{
if (!cancel_io)
- cancel_io = (cancel_io_t)GetProcAddress(GetModuleHandle("kernel32"),
- "CancelIo");
+ cancel_io = (cancel_io_t)GetProcAddress(GetModuleHandle("kernel32"),
+ "CancelIo");
}
static void init_stdhandle(void);
#if RT_VER >= 80
@@ -633,18 +670,18 @@
static void
exit_handler(void)
{
if (NtSocketsInitialized) {
- WSACleanup();
- st_free_table(socklist);
- socklist = NULL;
- NtSocketsInitialized = 0;
+ WSACleanup();
+ st_free_table(socklist);
+ socklist = NULL;
+ NtSocketsInitialized = 0;
}
if (envarea) {
- FreeEnvironmentStrings(envarea);
- envarea = NULL;
+ FreeEnvironmentStrings(envarea);
+ envarea = NULL;
}
DeleteCriticalSection(&select_mutex);
}
static void
@@ -657,13 +694,13 @@
// initalize the winsock interface and insure that it's
// cleaned up at exit.
//
version = MAKEWORD(2, 0);
if (WSAStartup(version, &retdata))
- rb_fatal ("Unable to locate winsock library!\n");
+ rb_fatal ("Unable to locate winsock library!\n");
if (LOBYTE(retdata.wVersion) != 2)
- rb_fatal("could not find version 2 of winsock dll\n");
+ rb_fatal("could not find version 2 of winsock dll\n");
socklist = st_init_numtable();
NtSocketsInitialized = 1;
}
@@ -671,11 +708,11 @@
//
// Initialization stuff
//
void
rb_w32_sysinit(int *argc, char ***argv)
-{
+{
#if RT_VER >= 80
static void set_pioinfo_extra(void);
#if !defined(APP_BUILD_CAPABILITY_WINXPE)
_CrtSetReportMode(_CRT_ASSERT, 0);
@@ -746,25 +783,25 @@
static struct ChildRecord *
FindChildSlot(rb_pid_t pid)
{
FOREACH_CHILD(child) {
- if (child->pid == pid) {
- return child;
- }
+ if (child->pid == pid) {
+ return child;
+ }
} END_FOREACH_CHILD;
return NULL;
}
static struct ChildRecord *
FindChildSlotByHandle(HANDLE h)
{
FOREACH_CHILD(child) {
- if (child->hProcess == h) {
- return child;
- }
+ if (child->hProcess == h) {
+ return child;
+ }
} END_FOREACH_CHILD;
return NULL;
}
static void
@@ -778,15 +815,15 @@
static struct ChildRecord *
FindFreeChildSlot(void)
{
FOREACH_CHILD(child) {
- if (!child->pid) {
- child->pid = -1; /* lock the slot */
- child->hProcess = NULL;
- return child;
- }
+ if (!child->pid) {
+ child->pid = -1; /* lock the slot */
+ child->hProcess = NULL;
+ return child;
+ }
} END_FOREACH_CHILD;
return NULL;
}
@@ -858,12 +895,12 @@
is_command_com(const char *interp)
{
int i = strlen(interp) - 11;
if ((i == 0 || i > 0 && isdirsep(interp[i-1])) &&
- strcasecmp(interp+i, "command.com") == 0) {
- return 1;
+ strcasecmp(interp+i, "command.com") == 0) {
+ return 1;
}
return 0;
}
static int internal_cmd_match(const char *cmdname, int nt);
@@ -872,25 +909,25 @@
is_internal_cmd(const char *cmd, int nt)
{
char cmdname[9], *b = cmdname, c;
do {
- if (!(c = *cmd++)) return 0;
+ if (!(c = *cmd++)) return 0;
} while (isspace(c));
while (isalpha(c)) {
- *b++ = tolower(c);
- if (b == cmdname + sizeof(cmdname)) return 0;
- c = *cmd++;
+ *b++ = tolower(c);
+ if (b == cmdname + sizeof(cmdname)) return 0;
+ c = *cmd++;
}
if (c == '.') c = *cmd;
switch (c) {
case '<': case '>': case '|':
- return 1;
+ return 1;
case '\0': case ' ': case '\t': case '\n':
- break;
+ break;
default:
- return 0;
+ return 0;
}
*b = 0;
return internal_cmd_match(cmdname, nt);
}
@@ -898,15 +935,15 @@
internal_cmd_match(const char *cmdname, int nt)
{
char **nm;
nm = bsearch(cmdname, szInternalCmds,
- sizeof(szInternalCmds) / sizeof(*szInternalCmds),
- sizeof(*szInternalCmds),
- internal_match);
+ sizeof(szInternalCmds) / sizeof(*szInternalCmds),
+ sizeof(*szInternalCmds),
+ internal_match);
if (!nm || !(nm[0][-1] & (nt ? 2 : 1)))
- return 0;
+ return 0;
return 1;
}
SOCKET
rb_w32_get_osfhandle(int fh)
@@ -920,66 +957,66 @@
const char *p, *s;
char *q, *const *t;
int len, n, bs, quote;
for (t = argv, q = cmd, len = 0; p = *t; t++) {
- quote = 0;
- s = p;
- if (!*p || strpbrk(p, " \t\"'")) {
- quote = 1;
- len++;
- if (q) *q++ = '"';
- }
- for (bs = 0; *p; ++p) {
- switch (*p) {
- case '\\':
- ++bs;
- break;
- case '"':
- len += n = p - s;
- if (q) {
- memcpy(q, s, n);
- q += n;
- }
- s = p;
- len += ++bs;
- if (q) {
- memset(q, '\\', bs);
- q += bs;
- }
- bs = 0;
- break;
- case '<': case '>': case '|': case '^':
- if (escape && !quote) {
- len += (n = p - s) + 1;
- if (q) {
- memcpy(q, s, n);
- q += n;
- *q++ = '^';
- }
- s = p;
- break;
- }
- default:
- bs = 0;
- p = CharNext(p) - 1;
- break;
- }
- }
- len += (n = p - s) + 1;
- if (quote) len++;
- if (q) {
- memcpy(q, s, n);
- q += n;
- if (quote) *q++ = '"';
- *q++ = ' ';
- }
+ quote = 0;
+ s = p;
+ if (!*p || strpbrk(p, " \t\"'")) {
+ quote = 1;
+ len++;
+ if (q) *q++ = '"';
}
+ for (bs = 0; *p; ++p) {
+ switch (*p) {
+ case '\\':
+ ++bs;
+ break;
+ case '"':
+ len += n = p - s;
+ if (q) {
+ memcpy(q, s, n);
+ q += n;
+ }
+ s = p;
+ len += ++bs;
+ if (q) {
+ memset(q, '\\', bs);
+ q += bs;
+ }
+ bs = 0;
+ break;
+ case '<': case '>': case '|': case '^':
+ if (escape && !quote) {
+ len += (n = p - s) + 1;
+ if (q) {
+ memcpy(q, s, n);
+ q += n;
+ *q++ = '^';
+ }
+ s = p;
+ break;
+ }
+ default:
+ bs = 0;
+ p = CharNext(p) - 1;
+ break;
+ }
+ }
+ len += (n = p - s) + 1;
+ if (quote) len++;
+ if (q) {
+ memcpy(q, s, n);
+ q += n;
+ if (quote) *q++ = '"';
+ *q++ = ' ';
+ }
+ }
if (q > cmd) --len;
if (q) {
- if (q > cmd) --q;
- *q = '\0';
+ if (q > cmd) --q;
+ *q = '\0';
}
return len;
}
#ifdef HAVE_SYS_PARAM_H
@@ -995,119 +1032,119 @@
check_spawn_mode(int mode)
{
switch (mode) {
case P_NOWAIT:
case P_OVERLAY:
- return 0;
+ return 0;
default:
- errno = EINVAL;
- return -1;
+ errno = EINVAL;
+ return -1;
}
}
static rb_pid_t
child_result(struct ChildRecord *child, int mode)
{
DWORD exitcode;
if (!child) {
- return -1;
+ return -1;
}
switch (mode) {
case P_NOWAIT:
- return child->pid;
+ return child->pid;
case P_OVERLAY:
- WaitForSingleObject(child->hProcess, INFINITE);
- GetExitCodeProcess(child->hProcess, &exitcode);
- CloseChildHandle(child);
- _exit(exitcode);
+ WaitForSingleObject(child->hProcess, INFINITE);
+ GetExitCodeProcess(child->hProcess, &exitcode);
+ CloseChildHandle(child);
+ _exit(exitcode);
default:
- return -1; /* not reached */
+ return -1; /* not reached */
}
}
static struct ChildRecord *
CreateChild(const char *cmd, const char *prog, SECURITY_ATTRIBUTES *psa,
- HANDLE hInput, HANDLE hOutput, HANDLE hError)
+ HANDLE hInput, HANDLE hOutput, HANDLE hError)
{
BOOL fRet;
DWORD dwCreationFlags;
STARTUPINFO aStartupInfo;
PROCESS_INFORMATION aProcessInformation;
SECURITY_ATTRIBUTES sa;
struct ChildRecord *child;
if (!cmd && !prog) {
- errno = EFAULT;
- return NULL;
+ errno = EFAULT;
+ return NULL;
}
child = FindFreeChildSlot();
if (!child) {
- errno = EAGAIN;
- return NULL;
+ errno = EAGAIN;
+ return NULL;
}
if (!psa) {
- sa.nLength = sizeof (SECURITY_ATTRIBUTES);
- sa.lpSecurityDescriptor = NULL;
- sa.bInheritHandle = TRUE;
- psa = &sa;
+ sa.nLength = sizeof (SECURITY_ATTRIBUTES);
+ sa.lpSecurityDescriptor = NULL;
+ sa.bInheritHandle = TRUE;
+ psa = &sa;
}
memset(&aStartupInfo, 0, sizeof (STARTUPINFO));
memset(&aProcessInformation, 0, sizeof (PROCESS_INFORMATION));
aStartupInfo.cb = sizeof (STARTUPINFO);
aStartupInfo.dwFlags = STARTF_USESTDHANDLES;
if (hInput) {
- aStartupInfo.hStdInput = hInput;
+ aStartupInfo.hStdInput = hInput;
}
else {
- aStartupInfo.hStdInput = GetStdHandle(STD_INPUT_HANDLE);
+ aStartupInfo.hStdInput = GetStdHandle(STD_INPUT_HANDLE);
}
if (hOutput) {
- aStartupInfo.hStdOutput = hOutput;
+ aStartupInfo.hStdOutput = hOutput;
}
else {
- aStartupInfo.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
+ aStartupInfo.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
}
if (hError) {
- aStartupInfo.hStdError = hError;
+ aStartupInfo.hStdError = hError;
}
else {
- aStartupInfo.hStdError = GetStdHandle(STD_ERROR_HANDLE);
+ aStartupInfo.hStdError = GetStdHandle(STD_ERROR_HANDLE);
}
dwCreationFlags = (NORMAL_PRIORITY_CLASS);
if (lstrlenW(cmd) > 32767) {
- child->pid = 0; /* release the slot */
- errno = E2BIG;
- return NULL;
+ child->pid = 0; /* release the slot */
+ errno = E2BIG;
+ return NULL;
}
RUBY_CRITICAL({
- fRet = CreateProcess(prog, (char *)cmd, psa, psa,
- psa->bInheritHandle, dwCreationFlags, NULL, NULL,
- &aStartupInfo, &aProcessInformation);
- errno = map_errno(GetLastError());
+ fRet = CreateProcess(prog, (char *)cmd, psa, psa,
+ psa->bInheritHandle, dwCreationFlags, NULL, NULL,
+ &aStartupInfo, &aProcessInformation);
+ errno = map_errno(GetLastError());
});
if (!fRet) {
- child->pid = 0; /* release the slot */
- return NULL;
+ child->pid = 0; /* release the slot */
+ return NULL;
}
CloseHandle(aProcessInformation.hThread);
child->hProcess = aProcessInformation.hProcess;
child->pid = (rb_pid_t)aProcessInformation.dwProcessId;
if (!IsWinNT()) {
- /* On Win9x, make pid positive similarly to cygwin and perl */
- child->pid = -child->pid;
+ /* On Win9x, make pid positive similarly to cygwin and perl */
+ child->pid = -child->pid;
}
return child;
}
@@ -1131,86 +1168,86 @@
const char *shell = NULL;
if (check_spawn_mode(mode)) return -1;
if (prog) {
- if (!(p = dln_find_exe_r(prog, NULL, fbuf, sizeof(fbuf)))) {
- shell = prog;
- }
- else {
- shell = p;
- translate_char(p, '/', '\\');
- }
+ if (!(p = dln_find_exe_r(prog, NULL, fbuf, sizeof(fbuf)))) {
+ shell = prog;
}
else {
- int redir = -1;
- int nt;
- while (ISSPACE(*cmd)) cmd++;
- if ((shell = getenv("RUBYSHELL")) && (redir = has_redirection(cmd))) {
- char *tmp = ALLOCA_N(char, strlen(shell) + strlen(cmd) + sizeof(" -c ") + 2);
- sprintf(tmp, "%s -c \"%s\"", shell, cmd);
- cmd = tmp;
- }
- else if ((shell = getenv("COMSPEC")) &&
- (nt = !is_command_com(shell),
- (redir < 0 ? has_redirection(cmd) : redir) ||
- is_internal_cmd(cmd, nt))) {
- char *tmp = ALLOCA_N(char, strlen(shell) + strlen(cmd) + sizeof(" /c ")
- + (nt ? 2 : 0));
- sprintf(tmp, nt ? "%s /c \"%s\"" : "%s /c %s", shell, cmd);
- cmd = tmp;
- }
- else {
- int len = 0, quote = (*cmd == '"') ? '"' : (*cmd == '\'') ? '\'' : 0;
- for (prog = cmd + !!quote;; prog = CharNext(prog)) {
- if (!*prog) {
- len = prog - cmd;
- shell = cmd;
- break;
- }
- if ((unsigned char)*prog == quote) {
- len = prog++ - cmd - 1;
- STRNDUPA(p, cmd + 1, len);
- shell = p;
- break;
- }
- if (quote) continue;
- if (ISSPACE(*prog) || strchr("<>|*?\"", *prog)) {
- len = prog - cmd;
- STRNDUPA(p, cmd, len);
- shell = p;
- break;
- }
- }
- shell = dln_find_exe_r(shell, NULL, fbuf, sizeof(fbuf));
- if (!shell) {
- shell = p ? p : cmd;
- }
- else {
- len = strlen(shell);
- if (strchr(shell, ' ')) quote = -1;
- if (shell == fbuf) {
- p = fbuf;
- }
- else if (shell != p && strchr(shell, '/')) {
- STRNDUPA(p, shell, len);
- shell = p;
- }
- if (p) translate_char(p, '/', '\\');
- if (is_batch(shell)) {
- int alen = strlen(prog);
- cmd = p = ALLOCA_N(char, len + alen + (quote ? 2 : 0) + 1);
- if (quote) *p++ = '"';
- memcpy(p, shell, len);
- p += len;
- if (quote) *p++ = '"';
- memcpy(p, prog, alen + 1);
- shell = 0;
- }
- }
- }
+ shell = p;
+ translate_char(p, '/', '\\');
}
+ }
+ else {
+ int redir = -1;
+ int nt;
+ while (ISSPACE(*cmd)) cmd++;
+ if ((shell = getenv("RUBYSHELL")) && (redir = has_redirection(cmd))) {
+ char *tmp = ALLOCA_N(char, strlen(shell) + strlen(cmd) + sizeof(" -c ") + 2);
+ sprintf(tmp, "%s -c \"%s\"", shell, cmd);
+ cmd = tmp;
+ }
+ else if ((shell = getenv("COMSPEC")) &&
+ (nt = !is_command_com(shell),
+ (redir < 0 ? has_redirection(cmd) : redir) ||
+ is_internal_cmd(cmd, nt))) {
+ char *tmp = ALLOCA_N(char, strlen(shell) + strlen(cmd) + sizeof(" /c ")
+ + (nt ? 2 : 0));
+ sprintf(tmp, nt ? "%s /c \"%s\"" : "%s /c %s", shell, cmd);
+ cmd = tmp;
+ }
+ else {
+ int len = 0, quote = (*cmd == '"') ? '"' : (*cmd == '\'') ? '\'' : 0;
+ for (prog = cmd + !!quote;; prog = CharNext(prog)) {
+ if (!*prog) {
+ len = prog - cmd;
+ shell = cmd;
+ break;
+ }
+ if ((unsigned char)*prog == quote) {
+ len = prog++ - cmd - 1;
+ STRNDUPA(p, cmd + 1, len);
+ shell = p;
+ break;
+ }
+ if (quote) continue;
+ if (ISSPACE(*prog) || strchr("<>|*?\"", *prog)) {
+ len = prog - cmd;
+ STRNDUPA(p, cmd, len);
+ shell = p;
+ break;
+ }
+ }
+ shell = dln_find_exe_r(shell, NULL, fbuf, sizeof(fbuf));
+ if (!shell) {
+ shell = p ? p : cmd;
+ }
+ else {
+ len = strlen(shell);
+ if (strchr(shell, ' ')) quote = -1;
+ if (shell == fbuf) {
+ p = fbuf;
+ }
+ else if (shell != p && strchr(shell, '/')) {
+ STRNDUPA(p, shell, len);
+ shell = p;
+ }
+ if (p) translate_char(p, '/', '\\');
+ if (is_batch(shell)) {
+ int alen = strlen(prog);
+ cmd = p = ALLOCA_N(char, len + alen + (quote ? 2 : 0) + 1);
+ if (quote) *p++ = '"';
+ memcpy(p, shell, len);
+ p += len;
+ if (quote) *p++ = '"';
+ memcpy(p, prog, alen + 1);
+ shell = 0;
+ }
+ }
+ }
+ }
return child_result(CreateChild(cmd, shell, NULL, NULL, NULL, NULL), mode);
}
rb_pid_t
@@ -1224,47 +1261,47 @@
if (check_spawn_mode(mode)) return -1;
if (!prog) prog = argv[0];
if ((shell = getenv("COMSPEC")) &&
- internal_cmd_match(prog, tmpnt = !is_command_com(shell))) {
- ntcmd = tmpnt;
- prog = shell;
- c_switch = 1;
+ internal_cmd_match(prog, tmpnt = !is_command_com(shell))) {
+ ntcmd = tmpnt;
+ prog = shell;
+ c_switch = 1;
}
else if ((cmd = dln_find_exe_r(prog, NULL, fbuf, sizeof(fbuf)))) {
- if (cmd == prog) strlcpy(cmd = fbuf, prog, sizeof(fbuf));
- translate_char(cmd, '/', '\\');
- prog = cmd;
+ if (cmd == prog) strlcpy(cmd = fbuf, prog, sizeof(fbuf));
+ translate_char(cmd, '/', '\\');
+ prog = cmd;
}
else if (strchr(prog, '/')) {
- len = strlen(prog);
- if (len < sizeof(fbuf))
- strlcpy(cmd = fbuf, prog, sizeof(fbuf));
- else
- STRNDUPA(cmd, prog, len);
- translate_char(cmd, '/', '\\');
- prog = cmd;
+ len = strlen(prog);
+ if (len < sizeof(fbuf))
+ strlcpy(cmd = fbuf, prog, sizeof(fbuf));
+ else
+ STRNDUPA(cmd, prog, len);
+ translate_char(cmd, '/', '\\');
+ prog = cmd;
}
if (c_switch || is_batch(prog)) {
- char *progs[2];
- progs[0] = (char *)prog;
- progs[1] = NULL;
- len = join_argv(NULL, progs, ntcmd);
- if (c_switch) len += 3;
- else ++argv;
- if (argv[0]) len += join_argv(NULL, argv, ntcmd);
- cmd = ALLOCA_N(char, len);
- join_argv(cmd, progs, ntcmd);
- if (c_switch) strlcat(cmd, " /c", len);
- if (argv[0]) join_argv(cmd + strlcat(cmd, " ", len), argv, ntcmd);
- prog = c_switch ? shell : 0;
+ char *progs[2];
+ progs[0] = (char *)prog;
+ progs[1] = NULL;
+ len = join_argv(NULL, progs, ntcmd);
+ if (c_switch) len += 3;
+ else ++argv;
+ if (argv[0]) len += join_argv(NULL, argv, ntcmd);
+ cmd = ALLOCA_N(char, len);
+ join_argv(cmd, progs, ntcmd);
+ if (c_switch) strlcat(cmd, " /c", len);
+ if (argv[0]) join_argv(cmd + strlcat(cmd, " ", len), argv, ntcmd);
+ prog = c_switch ? shell : 0;
}
else {
- len = join_argv(NULL, argv, FALSE);
- cmd = ALLOCA_N(char, len);
- join_argv(cmd, argv, FALSE);
+ len = join_argv(NULL, argv, FALSE);
+ cmd = ALLOCA_N(char, len);
+ join_argv(cmd, argv, FALSE);
}
return child_result(CreateChild(cmd, prog, NULL, NULL, NULL, NULL), mode);
}
@@ -1310,29 +1347,29 @@
char *p;
NtCmdLineElement **last = tail;
int status;
if (patt->len >= MAXPATHLEN)
- if (!(buf = malloc(patt->len + 1))) return 0;
+ if (!(buf = malloc(patt->len + 1))) return 0;
strlcpy(buf, patt->str, patt->len + 1);
buf[patt->len] = '\0';
for (p = buf; *p; p = CharNext(p))
- if (*p == '\\')
- *p = '/';
+ if (*p == '\\')
+ *p = '/';
status = ruby_brace_glob(buf, 0, insert, (VALUE)&tail);
if (buf != buffer)
- free(buf);
+ free(buf);
if (status || last == tail) return 0;
if (patt->flags & NTMALLOC)
- free(patt->str);
+ free(patt->str);
free(patt);
return tail;
}
-//
+//
// Check a command string to determine if it has I/O redirection
// characters that require it to be executed by a command interpreter
//
static int
@@ -1345,54 +1382,54 @@
// Scan the string, looking for redirection characters (< or >), pipe
// character (|) or newline (\n) that are not in a quoted string
//
for (ptr = cmd; *ptr;) {
- switch (*ptr) {
- case '\'':
- case '\"':
- if (!quote)
- quote = *ptr;
- else if (quote == *ptr)
- quote = '\0';
- ptr++;
- break;
+ switch (*ptr) {
+ case '\'':
+ case '\"':
+ if (!quote)
+ quote = *ptr;
+ else if (quote == *ptr)
+ quote = '\0';
+ ptr++;
+ break;
- case '>':
- case '<':
- case '|':
- case '\n':
- if (!quote)
- return TRUE;
- ptr++;
- break;
+ case '>':
+ case '<':
+ case '|':
+ case '\n':
+ if (!quote)
+ return TRUE;
+ ptr++;
+ break;
- case '%':
- if (*++ptr != '_' && !ISALPHA(*ptr)) break;
- while (*++ptr == '_' || ISALNUM(*ptr));
- if (*ptr++ == '%') return TRUE;
- break;
+ case '%':
+ if (*++ptr != '_' && !ISALPHA(*ptr)) break;
+ while (*++ptr == '_' || ISALNUM(*ptr));
+ if (*ptr++ == '%') return TRUE;
+ break;
- case '\\':
- ptr++;
- default:
- ptr = CharNext(ptr);
- break;
- }
+ case '\\':
+ ptr++;
+ default:
+ ptr = CharNext(ptr);
+ break;
}
+ }
return FALSE;
}
static inline char *
skipspace(char *ptr)
{
while (ISSPACE(*ptr))
- ptr++;
+ ptr++;
return ptr;
}
-int
+int
rb_w32_cmdvector(const char *cmd, char ***vec)
{
int globbing, len;
int elements, strsz, done;
int slashes, escape;
@@ -1405,196 +1442,196 @@
//
// just return if we don't have a command line
//
while (ISSPACE(*cmd))
- cmd++;
+ cmd++;
if (!*cmd) {
- *vec = NULL;
- return 0;
+ *vec = NULL;
+ return 0;
}
ptr = cmdline = strdup(cmd);
//
// Ok, parse the command line, building a list of CmdLineElements.
// When we've finished, and it's an input command (meaning that it's
- // the processes argv), we'll do globing and then build the argument
+ // the processes argv), we'll do globing and then build the argument
// vector.
- // The outer loop does one interation for each element seen.
+ // The outer loop does one interation for each element seen.
// The inner loop does one interation for each character in the element.
//
while (*(ptr = skipspace(ptr))) {
- base = ptr;
- quote = slashes = globbing = escape = 0;
- for (done = 0; !done && *ptr; ) {
- //
- // Switch on the current character. We only care about the
- // white-space characters, the wild-card characters, and the
- // quote characters.
- //
+ base = ptr;
+ quote = slashes = globbing = escape = 0;
+ for (done = 0; !done && *ptr; ) {
+ //
+ // Switch on the current character. We only care about the
+ // white-space characters, the wild-card characters, and the
+ // quote characters.
+ //
- switch (*ptr) {
- case '\\':
- if (quote != '\'') slashes++;
- break;
+ switch (*ptr) {
+ case '\\':
+ if (quote != '\'') slashes++;
+ break;
- case ' ':
- case '\t':
- case '\n':
- //
- // if we're not in a string, then we're finished with this
- // element
- //
+ case ' ':
+ case '\t':
+ case '\n':
+ //
+ // if we're not in a string, then we're finished with this
+ // element
+ //
- if (!quote) {
- *ptr = 0;
- done = 1;
- }
- break;
+ if (!quote) {
+ *ptr = 0;
+ done = 1;
+ }
+ break;
- case '*':
- case '?':
- case '[':
- case '{':
- //
- // record the fact that this element has a wildcard character
- // N.B. Don't glob if inside a single quoted string
- //
+ case '*':
+ case '?':
+ case '[':
+ case '{':
+ //
+ // record the fact that this element has a wildcard character
+ // N.B. Don't glob if inside a single quoted string
+ //
- if (quote != '\'')
- globbing++;
- slashes = 0;
- break;
+ if (quote != '\'')
+ globbing++;
+ slashes = 0;
+ break;
- case '\'':
- case '\"':
- //
- // if we're already in a string, see if this is the
- // terminating close-quote. If it is, we're finished with
- // the string, but not neccessarily with the element.
- // If we're not already in a string, start one.
- //
+ case '\'':
+ case '\"':
+ //
+ // if we're already in a string, see if this is the
+ // terminating close-quote. If it is, we're finished with
+ // the string, but not neccessarily with the element.
+ // If we're not already in a string, start one.
+ //
- if (!(slashes & 1)) {
- if (!quote)
- quote = *ptr;
- else if (quote == *ptr) {
- if (quote == '"' && quote == ptr[1])
- ptr++;
- quote = '\0';
- }
- }
- escape++;
- slashes = 0;
- break;
+ if (!(slashes & 1)) {
+ if (!quote)
+ quote = *ptr;
+ else if (quote == *ptr) {
+ if (quote == '"' && quote == ptr[1])
+ ptr++;
+ quote = '\0';
+ }
+ }
+ escape++;
+ slashes = 0;
+ break;
- default:
- ptr = CharNext(ptr);
- slashes = 0;
- continue;
- }
- ptr++;
- }
+ default:
+ ptr = CharNext(ptr);
+ slashes = 0;
+ continue;
+ }
+ ptr++;
+ }
- //
- // when we get here, we've got a pair of pointers to the element,
- // base and ptr. Base points to the start of the element while ptr
- // points to the character following the element.
- //
+ //
+ // when we get here, we've got a pair of pointers to the element,
+ // base and ptr. Base points to the start of the element while ptr
+ // points to the character following the element.
+ //
- len = ptr - base;
- if (done) --len;
+ len = ptr - base;
+ if (done) --len;
- //
- // if it's an input vector element and it's enclosed by quotes,
- // we can remove them.
- //
+ //
+ // if it's an input vector element and it's enclosed by quotes,
+ // we can remove them.
+ //
- if (escape) {
- char *p = base, c;
- slashes = quote = 0;
- while (p < base + len) {
- switch (c = *p) {
- case '\\':
- p++;
- if (quote != '\'') slashes++;
- break;
+ if (escape) {
+ char *p = base, c;
+ slashes = quote = 0;
+ while (p < base + len) {
+ switch (c = *p) {
+ case '\\':
+ p++;
+ if (quote != '\'') slashes++;
+ break;
- case '\'':
- case '"':
- if (!(slashes & 1) && quote && quote != c) {
- p++;
- slashes = 0;
- break;
- }
- memcpy(p - ((slashes + 1) >> 1), p + (~slashes & 1),
- base + len - p);
- len -= ((slashes + 1) >> 1) + (~slashes & 1);
- p -= (slashes + 1) >> 1;
- if (!(slashes & 1)) {
- if (quote) {
- if (quote == '"' && quote == *p)
- p++;
- quote = '\0';
- }
- else
- quote = c;
- }
- else
- p++;
- slashes = 0;
- break;
+ case '\'':
+ case '"':
+ if (!(slashes & 1) && quote && quote != c) {
+ p++;
+ slashes = 0;
+ break;
+ }
+ memcpy(p - ((slashes + 1) >> 1), p + (~slashes & 1),
+ base + len - p);
+ len -= ((slashes + 1) >> 1) + (~slashes & 1);
+ p -= (slashes + 1) >> 1;
+ if (!(slashes & 1)) {
+ if (quote) {
+ if (quote == '"' && quote == *p)
+ p++;
+ quote = '\0';
+ }
+ else
+ quote = c;
+ }
+ else
+ p++;
+ slashes = 0;
+ break;
- default:
- p = CharNext(p);
- slashes = 0;
- break;
- }
- }
- }
+ default:
+ p = CharNext(p);
+ slashes = 0;
+ break;
+ }
+ }
+ }
- curr = (NtCmdLineElement *)calloc(sizeof(NtCmdLineElement), 1);
- if (!curr) goto do_nothing;
- curr->str = base;
- curr->len = len;
+ curr = (NtCmdLineElement *)calloc(sizeof(NtCmdLineElement), 1);
+ if (!curr) goto do_nothing;
+ curr->str = base;
+ curr->len = len;
- if (globbing && (tail = cmdglob(curr, cmdtail))) {
- cmdtail = tail;
- }
- else {
- *cmdtail = curr;
- cmdtail = &curr->next;
- }
+ if (globbing && (tail = cmdglob(curr, cmdtail))) {
+ cmdtail = tail;
}
+ else {
+ *cmdtail = curr;
+ cmdtail = &curr->next;
+ }
+ }
//
- // Almost done!
+ // Almost done!
// Count up the elements, then allocate space for a vector of pointers
// (argv) and a string table for the elements.
- //
+ //
for (elements = 0, strsz = 0, curr = cmdhead; curr; curr = curr->next) {
- elements++;
- strsz += (curr->len + 1);
+ elements++;
+ strsz += (curr->len + 1);
}
len = (elements+1)*sizeof(char *) + strsz;
buffer = (char *)malloc(len);
if (!buffer) {
do_nothing:
- while (curr = cmdhead) {
- cmdhead = curr->next;
- if (curr->flags & NTMALLOC) free(curr->str);
- free(curr);
- }
- free(cmdline);
- for (vptr = *vec; *vptr; ++vptr);
- return vptr - *vec;
+ while (curr = cmdhead) {
+ cmdhead = curr->next;
+ if (curr->flags & NTMALLOC) free(curr->str);
+ free(curr);
}
-
+ free(cmdline);
+ for (vptr = *vec; *vptr; ++vptr);
+ return vptr - *vec;
+ }
+
//
// make vptr point to the start of the buffer
// and ptr point to the area we'll consider the string table.
//
// buffer (*vec)
@@ -1608,16 +1645,16 @@
vptr = (char **) buffer;
ptr = buffer + (elements+1) * sizeof(char *);
while (curr = cmdhead) {
- strlcpy(ptr, curr->str, curr->len + 1);
- *vptr++ = ptr;
- ptr += curr->len + 1;
- cmdhead = curr->next;
- if (curr->flags & NTMALLOC) free(curr->str);
- free(curr);
+ strlcpy(ptr, curr->str, curr->len + 1);
+ *vptr++ = ptr;
+ ptr += curr->len + 1;
+ cmdhead = curr->next;
+ if (curr->flags & NTMALLOC) free(curr->str);
+ free(curr);
}
*vptr = 0;
*vec = (char **) buffer;
free(cmdline);
@@ -1631,11 +1668,11 @@
#define PATHLEN 1024
//
// The idea here is to read all the directory names into a string table
// (separated by nulls) and when one of the other dir functions is called
-// return the pointer to the current file name.
+// return the pointer to the current file name.
//
#define GetBit(bits, i) ((bits)[(i) / CHAR_BIT] & (1 << (i) % CHAR_BIT))
#define SetBit(bits, i) ((bits)[(i) / CHAR_BIT] |= (1 << (i) % CHAR_BIT))
@@ -1658,13 +1695,13 @@
len = lstrlenW(filename);
scanname = ALLOCA_N(WCHAR, len + sizeof(wildcard) / sizeof(WCHAR));
lstrcpyW(scanname, filename);
p = CharPrevW(scanname, scanname + len);
if (*p == L'/' || *p == L'\\' || *p == L':')
- lstrcatW(scanname, wildcard + 1);
+ lstrcatW(scanname, wildcard + 1);
else
- lstrcatW(scanname, wildcard);
+ lstrcatW(scanname, wildcard);
for( i = 0; scanname[i]; i++)
{
if ( scanname[i] == L'/' )
scanname[i] = L'\\';
@@ -1672,17 +1709,17 @@
//
// do the FindFirstFile call
//
fh = FindFirstFileW(scanname, fd);
- if (fh == INVALID_HANDLE_VALUE)
+ if (fh == INVALID_HANDLE_VALUE)
{
DWORD dwErr = GetLastError();
if ( dwErr == 18)
fh = 0;
else
- errno = map_errno(GetLastError());
+ errno = map_errno(GetLastError());
}
return fh;
}
static DIR *
@@ -1693,61 +1730,61 @@
long idx;
WCHAR *tmpW;
char *tmp;
if (fh == INVALID_HANDLE_VALUE) {
- return NULL;
+ return NULL;
}
//
// Get us a DIR structure
//
p = calloc(sizeof(DIR), 1);
if (p == NULL)
- return NULL;
+ return NULL;
idx = 0;
//
// loop finding all the files that match the wildcard
// (which should be all of them in this directory!).
// the variable idx should point one past the null terminator
// of the previous string found.
//
do {
- len = lstrlenW(fd->cFileName) + 1;
+ len = lstrlenW(fd->cFileName) + 1;
- //
- // bump the string table size by enough for the
- // new name and it's null terminator
- //
- tmpW = realloc(p->start, (idx + len) * sizeof(WCHAR));
- if (!tmpW) {
- error:
- rb_w32_closedir(p);
- FindClose(fh);
- errno = ENOMEM;
- return NULL;
- }
+ //
+ // bump the string table size by enough for the
+ // new name and it's null terminator
+ //
+ tmpW = realloc(p->start, (idx + len) * sizeof(WCHAR));
+ if (!tmpW) {
+ error:
+ rb_w32_closedir(p);
+ FindClose(fh);
+ errno = ENOMEM;
+ return NULL;
+ }
- p->start = tmpW;
- memcpy(&p->start[idx], fd->cFileName, len * sizeof(WCHAR));
+ p->start = tmpW;
+ memcpy(&p->start[idx], fd->cFileName, len * sizeof(WCHAR));
- if (p->nfiles % DIRENT_PER_CHAR == 0) {
- tmp = realloc(p->bits, p->nfiles / DIRENT_PER_CHAR + 1);
- if (!tmp)
- goto error;
- p->bits = tmp;
- p->bits[p->nfiles / DIRENT_PER_CHAR] = 0;
- }
- if (fd->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
- SetBit(p->bits, BitOfIsDir(p->nfiles));
- if (fd->dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)
- SetBit(p->bits, BitOfIsRep(p->nfiles));
+ if (p->nfiles % DIRENT_PER_CHAR == 0) {
+ tmp = realloc(p->bits, p->nfiles / DIRENT_PER_CHAR + 1);
+ if (!tmp)
+ goto error;
+ p->bits = tmp;
+ p->bits[p->nfiles / DIRENT_PER_CHAR] = 0;
+ }
+ if (fd->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+ SetBit(p->bits, BitOfIsDir(p->nfiles));
+ if (fd->dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)
+ SetBit(p->bits, BitOfIsRep(p->nfiles));
- p->nfiles++;
- idx += len;
+ p->nfiles++;
+ idx += len;
} while (FindNextFileW(fh, fd));
FindClose(fh);
p->size = idx;
p->curr = p->start;
return p;
@@ -1755,11 +1792,11 @@
static char *
wstr_to_filecp(const WCHAR *wstr, long *plen)
{
UINT cp = AreFileApisANSI() ? CP_ACP : CP_OEMCP;
- char *ptr;
+ char *ptr;
int len = WideCharToMultiByte(cp, 0, wstr, -1, NULL, 0, NULL, NULL) - 1;
if (!(ptr = malloc(len + 1))) return 0;
WideCharToMultiByte(cp, 0, wstr, -1, ptr, len + 1, NULL, NULL);
if (plen) *plen = len;
return ptr;
@@ -1806,25 +1843,25 @@
WIN32_FIND_DATAW fd = {0};
HANDLE fh;
WCHAR *wpath;
if (!(wpath = filecp_to_wstr(filename, NULL)))
- return NULL;
+ return NULL;
//
// check to see if we've got a directory
//
if (wstati64(wpath, &sbuf) < 0) {
- free(wpath);
- return NULL;
+ free(wpath);
+ return NULL;
}
if (!(sbuf.st_mode & S_IFDIR) &&
- (!ISALPHA(filename[0]) || filename[1] != ':' || filename[2] != '\0' ||
- ((1 << ((filename[0] & 0x5f) - 'A')) & GetLogicalDrives()) == 0)) {
- free(wpath);
- errno = ENOTDIR;
- return NULL;
+ (!ISALPHA(filename[0]) || filename[1] != ':' || filename[2] != '\0' ||
+ ((1 << ((filename[0] & 0x5f) - 'A')) & GetLogicalDrives()) == 0)) {
+ free(wpath);
+ errno = ENOTDIR;
+ return NULL;
}
fh = open_dir_handle(wpath, &fd);
free(wpath);
return opendir_internal(fh, &fd);
@@ -1836,27 +1873,27 @@
static void
move_to_next_entry(DIR *dirp)
{
if (dirp->curr) {
- dirp->loc++;
- dirp->curr += lstrlenW(dirp->curr) + 1;
- if (dirp->curr >= (dirp->start + dirp->size)) {
- dirp->curr = NULL;
- }
+ dirp->loc++;
+ dirp->curr += lstrlenW(dirp->curr) + 1;
+ if (dirp->curr >= (dirp->start + dirp->size)) {
+ dirp->curr = NULL;
}
+ }
}
//
// Readdir just returns the current string pointer and bumps the
// string pointer to the next entry.
//
static BOOL
win32_direct_conv(const WCHAR *file, struct direct *entry, rb_encoding *dummy)
{
if (!(entry->d_name = wstr_to_filecp(file, &entry->d_namlen)))
- return FALSE;
+ return FALSE;
return TRUE;
}
VALUE
rb_w32_conv_from_wchar(const WCHAR *wstr, rb_encoding *enc)
@@ -1866,22 +1903,22 @@
VALUE opthash;
int ecflags;
VALUE ecopts;
if (utf16 == (rb_encoding *)-1) {
- utf16 = rb_enc_find("UTF-16LE");
- if (utf16 == rb_ascii8bit_encoding())
- utf16 = NULL;
+ utf16 = rb_enc_find("UTF-16LE");
+ if (utf16 == rb_ascii8bit_encoding())
+ utf16 = NULL;
}
if (!utf16)
- /* maybe miniruby */
- return Qnil;
+ /* maybe miniruby */
+ return Qnil;
src = rb_enc_str_new((char *)wstr, lstrlenW(wstr) * sizeof(WCHAR), utf16);
opthash = rb_hash_new();
rb_hash_aset(opthash, ID2SYM(rb_intern("undef")),
- ID2SYM(rb_intern("replace")));
+ ID2SYM(rb_intern("replace")));
ecflags = rb_econv_prepare_opts(opthash, &ecopts);
return rb_str_encode(src, rb_enc_from_encoding(enc), ecflags, ecopts);
}
char *
@@ -1900,49 +1937,49 @@
static BOOL
ruby_direct_conv(const WCHAR *file, struct direct *entry, rb_encoding *enc)
{
if (!(entry->d_name = rb_w32_conv_from_wstr(file, &entry->d_namlen, enc)))
- return FALSE;
+ return FALSE;
return TRUE;
}
static struct direct *
readdir_internal(DIR *dirp, BOOL (*conv)(const WCHAR *, struct direct *, rb_encoding *), rb_encoding *enc)
{
static int dummy = 0;
if (dirp->curr) {
- //
- // first set up the structure to return
- //
- if (dirp->dirstr.d_name)
- free(dirp->dirstr.d_name);
- conv(dirp->curr, &dirp->dirstr, enc);
+ //
+ // first set up the structure to return
+ //
+ if (dirp->dirstr.d_name)
+ free(dirp->dirstr.d_name);
+ conv(dirp->curr, &dirp->dirstr, enc);
- //
- // Fake inode
- //
- dirp->dirstr.d_ino = dummy++;
+ //
+ // Fake inode
+ //
+ dirp->dirstr.d_ino = dummy++;
- //
- // Attributes
- //
- dirp->dirstr.d_isdir = GetBit(dirp->bits, BitOfIsDir(dirp->loc));
- dirp->dirstr.d_isrep = GetBit(dirp->bits, BitOfIsRep(dirp->loc));
+ //
+ // Attributes
+ //
+ dirp->dirstr.d_isdir = GetBit(dirp->bits, BitOfIsDir(dirp->loc));
+ dirp->dirstr.d_isrep = GetBit(dirp->bits, BitOfIsRep(dirp->loc));
- //
- // Now set up for the next call to readdir
- //
+ //
+ // Now set up for the next call to readdir
+ //
- move_to_next_entry(dirp);
+ move_to_next_entry(dirp);
- return &(dirp->dirstr);
+ return &(dirp->dirstr);
} else
- return NULL;
+ return NULL;
}
struct direct *
rb_w32_readdir(DIR *dirp)
{
@@ -1951,13 +1988,13 @@
struct direct *
rb_w32_readdir_with_enc(DIR *dirp, rb_encoding *enc)
{
if (enc == rb_ascii8bit_encoding())
- return readdir_internal(dirp, win32_direct_conv, NULL);
+ return readdir_internal(dirp, win32_direct_conv, NULL);
else
- return readdir_internal(dirp, ruby_direct_conv, enc);
+ return readdir_internal(dirp, ruby_direct_conv, enc);
}
//
// Telldir returns the current string pointer position
//
@@ -1976,11 +2013,11 @@
rb_w32_seekdir(DIR *dirp, long loc)
{
if (dirp->loc > loc) rb_w32_rewinddir(dirp);
while (dirp->curr && dirp->loc < loc) {
- move_to_next_entry(dirp);
+ move_to_next_entry(dirp);
}
}
//
// Rewinddir resets the string pointer to the start
@@ -1999,17 +2036,17 @@
void
rb_w32_closedir(DIR *dirp)
{
if (dirp) {
- if (dirp->dirstr.d_name)
- free(dirp->dirstr.d_name);
- if (dirp->start)
- free(dirp->start);
- if (dirp->bits)
- free(dirp->bits);
- free(dirp);
+ if (dirp->dirstr.d_name)
+ free(dirp->dirstr.d_name);
+ if (dirp->start)
+ free(dirp->start);
+ if (dirp->bits)
+ free(dirp->bits);
+ free(dirp);
}
}
#if (defined _MT || defined __MSVCRT__) && !defined __BORLANDC__
#define MSVCRT_THREADS
@@ -2023,11 +2060,31 @@
#else
# define MTHREAD_ONLY(x)
# define STHREAD_ONLY(x) x
#endif
-typedef struct {
+
+#ifdef RHODES_VERSION_2
+typedef char lowio_text_mode;
+typedef char lowio_pipe_lookahead[3];
+
+typedef struct {
+ CRITICAL_SECTION lock;
+ intptr_t osfhnd; // underlying OS file HANDLE
+ __int64 startpos; // File position that matches buffer start
+ unsigned char osfile; // Attributes of file (e.g., open in text mode?)
+ lowio_text_mode textmode;
+ lowio_pipe_lookahead _pipe_lookahead;
+
+ uint8_t unicode : 1; // Was the file opened as unicode?
+ uint8_t utf8translations : 1; // Buffer contains translations other than CRLF
+ uint8_t dbcsBufferUsed : 1; // Is the dbcsBuffer in use?
+ char dbcsBuffer; // Buffer for the lead byte of DBCS when converting from DBCS to Unicode
+} ioinfo;
+#else
+
+typedef struct{
intptr_t osfhnd; /* underlying OS file HANDLE */
char osfile; /* attributes of file (e.g., open in text mode?) */
char pipech; /* one char buffer for handles opened on pipes */
#ifdef MSVCRT_THREADS
int lockinitflag;
@@ -2036,20 +2093,27 @@
#if RT_VER >= 80
char textmode;
char pipech2[2];
#endif
} ioinfo;
+#endif
+
#if !defined _CRTIMP || defined __MINGW32__
#undef _CRTIMP
#define _CRTIMP __declspec(dllimport)
#endif
#if !defined(__BORLANDC__) && !defined(_WIN32_WCE)
+#ifdef RHODES_VERSION_2
+static ioinfo ** __pioinfo = NULL;
+#define IOINFO_L2E 6
+#else
EXTERN_C _CRTIMP ioinfo * __pioinfo[];
-
#define IOINFO_L2E 5
+#endif
+
#define IOINFO_ARRAY_ELTS (1 << IOINFO_L2E)
#define _pioinfo(i) ((ioinfo*)((char*)(__pioinfo[i >> IOINFO_L2E]) + (i & (IOINFO_ARRAY_ELTS - 1)) * (sizeof(ioinfo) + pioinfo_extra)))
#define _osfhnd(i) (_pioinfo(i)->osfhnd)
#define _osfile(i) (_pioinfo(i)->osfile)
#define _pipech(i) (_pioinfo(i)->pipech)
@@ -2058,24 +2122,65 @@
static size_t pioinfo_extra = 0; /* workaround for VC++8 SP1 */
static void
set_pioinfo_extra(void)
{
+#ifdef RHODES_VERSION_2
+# define FUNCTION_RET 0xc3 /* ret */
+# ifdef _DEBUG
+# define UCRTBASE "ucrtbased.dll"
+# else
+# define UCRTBASE "ucrtbase.dll"
+# endif
+ /* get __pioinfo addr with _isatty */
+ char *p = (char*)get_proc_address(UCRTBASE, "_isatty", NULL);
+ char *pend = p;
+ /* _osfile(fh) & FDEV */
+
+# define FUNCTION_BEFORE_RET_MARK "\x5d"
+# define FUNCTION_SKIP_BYTES 0
+ /* mov eax,dword ptr [eax*4+100EB430h] */
+# define PIOINFO_MARK "\x8B\x04\x85"
+
+ if (p) {
+ for (pend += 10; pend < p + 300; pend++) {
+ // find end of function
+ if (memcmp(pend, FUNCTION_BEFORE_RET_MARK, sizeof(FUNCTION_BEFORE_RET_MARK) - 1) == 0 &&
+ *(pend + (sizeof(FUNCTION_BEFORE_RET_MARK) - 1) + FUNCTION_SKIP_BYTES) & FUNCTION_RET == FUNCTION_RET) {
+ // search backwards from end of function
+ for (pend -= (sizeof(PIOINFO_MARK) - 1); pend > p; pend--) {
+ if (memcmp(pend, PIOINFO_MARK, sizeof(PIOINFO_MARK) - 1) == 0) {
+ p = pend;
+ goto found;
+ }
+ }
+ break;
+ }
+ }
+ }
+ fprintf(stderr, "unexpected " UCRTBASE "\n");
+ _exit(1);
+
+ found:
+ p += sizeof(PIOINFO_MARK) - 1;
+ __pioinfo = *(ioinfo***)(p);
+#else
int fd;
fd = _open("NUL", O_RDONLY);
for (pioinfo_extra = 0; pioinfo_extra <= 64; pioinfo_extra += sizeof(void *)) {
- if (_osfhnd(fd) == _get_osfhandle(fd)) {
- break;
- }
+ if (_osfhnd(fd) == _get_osfhandle(fd)) {
+ break;
}
+ }
_close(fd);
if (pioinfo_extra > 64) {
- /* not found, maybe something wrong... */
- pioinfo_extra = 0;
+ /* not found, maybe something wrong... */
+ pioinfo_extra = 0;
}
+#endif
}
#else
#define pioinfo_extra 0
#endif
@@ -2088,83 +2193,120 @@
#define FNOINHERIT 0x10 /* file handle opened O_NOINHERIT */
#define FAPPEND 0x20 /* file handle opened O_APPEND */
#define FDEV 0x40 /* file handle refers to device */
#define FTEXT 0x80 /* file handle is in text mode */
-static int
-rb_w32_open_osfhandle(intptr_t osfhandle, int flags)
+static int rb_w32_open_osfhandle(intptr_t osfhandle, int flags)
{
int fh;
char fileflags; /* _osfile flags */
HANDLE hF;
/* copy relevant flags from second parameter */
fileflags = FDEV;
if (flags & O_APPEND)
- fileflags |= FAPPEND;
+ fileflags |= FAPPEND;
if (flags & O_TEXT)
- fileflags |= FTEXT;
+ fileflags |= FTEXT;
if (flags & O_NOINHERIT)
- fileflags |= FNOINHERIT;
+ fileflags |= FNOINHERIT;
/* attempt to allocate a C Runtime file handle */
hF = CreateFile("NUL", 0, 0, NULL, OPEN_ALWAYS, 0, NULL);
fh = _open_osfhandle((intptr_t)hF, 0);
CloseHandle(hF);
if (fh == -1) {
- errno = EMFILE; /* too many open files */
- _doserrno = 0L; /* not an OS error */
+ errno = EMFILE; /* too many open files */
+ _doserrno = 0L; /* not an OS error */
}
else {
- MTHREAD_ONLY(EnterCriticalSection(&(_pioinfo(fh)->lock)));
- /* the file is open. now, set the info in _osfhnd array */
- _set_osfhnd(fh, osfhandle);
+ MTHREAD_ONLY(EnterCriticalSection(&(_pioinfo(fh)->lock)));
+ /* the file is open. now, set the info in _osfhnd array */
+ _set_osfhnd(fh, osfhandle);
- fileflags |= FOPEN; /* mark as open */
+ fileflags |= FOPEN; /* mark as open */
- _set_osflags(fh, fileflags); /* set osfile entry */
- MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fh)->lock));
+ _set_osflags(fh, fileflags); /* set osfile entry */
+ MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fh)->lock));
}
return fh; /* return handle */
}
-static void
-init_stdhandle(void)
+#ifdef CPP_ELEVEN
+typedef struct {
+ union
+ {
+ FILE _public_file;
+ char* _ptr;
+ };
+
+ char* _base;
+ int _cnt;
+ long _flags;
+ long _file;
+ int _charbuf;
+ int _bufsiz;
+ char* _tmpfname;
+ CRITICAL_SECTION _lock;
+} vcruntime_file;
+#define FILE_FILENO(stream) ((vcruntime_file*)stream)->_file
+#define GET_STREAM_PTR(stream) ((vcruntime_file*)stream)
+#endif
+
+static void init_stdhandle(void)
{
int nullfd = -1;
int keep = 0;
#define open_null(fd) \
(((nullfd < 0) ? \
- (nullfd = open("NUL", O_RDWR|O_BINARY)) : 0), \
+ (nullfd = open("NUL", O_RDWR)) : 0), \
((nullfd == (fd)) ? (keep = 1) : dup2(nullfd, fd)), \
(fd))
+#ifdef RHODES_VERSION_2
if (fileno(stdin) < 0) {
- stdin->_file = open_null(0);
+ FILE_FILENO(stdin) = open_null(0);
}
else {
- setmode(fileno(stdin), O_BINARY);
+ setmode(fileno(stdin), O_BINARY);
}
if (fileno(stdout) < 0) {
- stdout->_file = open_null(1);
+ FILE_FILENO(stdout) = open_null(1);
}
+ if (fileno(stderr) < 0) {
+ FILE_FILENO(stderr) = open_null(2);
+ }
+
+#else
+ if (fileno(stdin) < 0) {
+ stdin->_file = open_null(0);
+ }
else {
- setmode(fileno(stdout), O_BINARY);
+ setmode(fileno(stdin), O_BINARY);
}
+ if (fileno(stdout) < 0) {
+ stdout->_file = open_null(1);
+ }
+ else {
+ setmode(fileno(stdout), O_BINARY);
+ }
if (fileno(stderr) < 0) {
- stderr->_file = open_null(2);
+ stderr->_file = open_null(2);
}
else {
- setmode(fileno(stderr), O_BINARY);
+ setmode(fileno(stderr), O_BINARY);
}
+
+#endif
if (nullfd >= 0 && !keep) close(nullfd);
setvbuf(stderr, NULL, _IONBF, 0);
}
+
#else
#define _set_osfhnd(fh, osfh) (void)((fh), (osfh))
#define _set_osflags(fh, flags) (void)((fh), (flags))
@@ -2178,12 +2320,12 @@
static int
rb_w32_open_osfhandle(intptr_t osfhandle, int flags)
{
int fd = _open_osfhandle(osfhandle, flags);
if (fd == -1) {
- errno = EMFILE; /* too many open files */
- _doserrno = 0L; /* not an OS error */
+ errno = EMFILE; /* too many open files */
+ _doserrno = 0L; /* not an OS error */
}
return fd;
}
#endif
@@ -2191,23 +2333,23 @@
static int
is_socket(SOCKET sock)
{
if (st_lookup(socklist, (st_data_t)sock, NULL))
- return TRUE;
+ return TRUE;
else
- return FALSE;
+ return FALSE;
}
int
rb_w32_is_socket(int fd)
{
return is_socket(TO_SOCKET(fd));
}
//
-// Since the errors returned by the socket error function
+// Since the errors returned by the socket error function
// WSAGetLastError() are not known by the library routine strerror
// we have to roll our own.
//
#undef strerror
@@ -2220,45 +2362,45 @@
char *p;
#if defined __BORLANDC__ && defined ENOTEMPTY // _sys_errlist is broken
switch (e) {
case ENAMETOOLONG:
- return "Filename too long";
+ return "Filename too long";
case ENOTEMPTY:
- return "Directory not empty";
+ return "Directory not empty";
}
#endif
if (e < 0 || e > sys_nerr) {
- if (e < 0)
- e = GetLastError();
+ if (e < 0)
+ e = GetLastError();
#if WSAEWOULDBLOCK != EWOULDBLOCK
- else if (e >= EADDRINUSE && e <= EWOULDBLOCK) {
- static int s = -1;
- int i;
- if (s < 0)
- for (s = 0; s < (int)(sizeof(errmap)/sizeof(*errmap)); s++)
- if (errmap[s].winerr == WSAEWOULDBLOCK)
- break;
- for (i = s; i < (int)(sizeof(errmap)/sizeof(*errmap)); i++)
- if (errmap[i].err == e) {
- e = errmap[i].winerr;
- break;
- }
- }
+ else if (e >= EADDRINUSE && e <= EWOULDBLOCK) {
+ static int s = -1;
+ int i;
+ if (s < 0)
+ for (s = 0; s < (int)(sizeof(errmap)/sizeof(*errmap)); s++)
+ if (errmap[s].winerr == WSAEWOULDBLOCK)
+ break;
+ for (i = s; i < (int)(sizeof(errmap)/sizeof(*errmap)); i++)
+ if (errmap[i].err == e) {
+ e = errmap[i].winerr;
+ break;
+ }
+ }
#endif
- if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM |
- FORMAT_MESSAGE_IGNORE_INSERTS, &source, e, 0,
- buffer, sizeof(buffer), NULL) == 0)
- strlcpy(buffer, "Unknown Error", sizeof(buffer));
+ if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM |
+ FORMAT_MESSAGE_IGNORE_INSERTS, &source, e, 0,
+ buffer, sizeof(buffer), NULL) == 0)
+ strlcpy(buffer, "Unknown Error", sizeof(buffer));
}
else
- strlcpy(buffer, strerror(e), sizeof(buffer));
+ strlcpy(buffer, strerror(e), sizeof(buffer));
p = buffer;
while ((p = strpbrk(p, "\r\n")) != NULL) {
- memmove(p, p + 1, strlen(p));
+ memmove(p, p + 1, strlen(p));
}
return buffer;
}
//
@@ -2276,34 +2418,34 @@
#define ROOT_GID 0
rb_uid_t
getuid(void)
{
- return ROOT_UID;
+ return ROOT_UID;
}
rb_uid_t
geteuid(void)
{
- return ROOT_UID;
+ return ROOT_UID;
}
rb_gid_t
getgid(void)
{
- return ROOT_GID;
+ return ROOT_GID;
}
rb_gid_t
getegid(void)
{
return ROOT_GID;
}
int
setuid(rb_uid_t uid)
-{
+{
return (uid == ROOT_UID ? 0 : -1);
}
int
setgid(rb_gid_t gid)
@@ -2351,12 +2493,12 @@
unsigned int i;
SOCKET s = TO_SOCKET(fd);
for (i = 0; i < set->fd_count; i++) {
if (set->fd_array[i] == s) {
- memmove(&set->fd_array[i], &set->fd_array[i+1],
- sizeof(set->fd_array[0]) * (--set->fd_count - i));
+ memmove(&set->fd_array[i], &set->fd_array[i+1],
+ sizeof(set->fd_array[0]) * (--set->fd_count - i));
break;
}
}
}
@@ -2373,11 +2515,11 @@
return ret;
}
//
// Networking trampolines
-// These are used to avoid socket startup/shutdown overhead in case
+// These are used to avoid socket startup/shutdown overhead in case
// the socket routines aren't used.
//
#undef select
@@ -2388,31 +2530,31 @@
if (!src || !dst) return 0;
while (s < src->fd_count) {
SOCKET fd = src->fd_array[s];
- if (!func || (*func)(fd)) { /* move it to dst */
- unsigned int d;
+ if (!func || (*func)(fd)) { /* move it to dst */
+ unsigned int d;
- for (d = 0; d < dst->fdset->fd_count; d++) {
- if (dst->fdset->fd_array[d] == fd)
- break;
- }
- if (d == dst->fdset->fd_count) {
- if ((int)dst->fdset->fd_count >= dst->capa) {
- dst->capa = (dst->fdset->fd_count / FD_SETSIZE + 1) * FD_SETSIZE;
- dst->fdset = xrealloc(dst->fdset, sizeof(unsigned int) + sizeof(SOCKET) * dst->capa);
- }
- dst->fdset->fd_array[dst->fdset->fd_count++] = fd;
- }
- memmove(
- &src->fd_array[s],
- &src->fd_array[s+1],
- sizeof(src->fd_array[0]) * (--src->fd_count - s));
- }
- else s++;
+ for (d = 0; d < dst->fdset->fd_count; d++) {
+ if (dst->fdset->fd_array[d] == fd)
+ break;
+ }
+ if (d == dst->fdset->fd_count) {
+ if ((int)dst->fdset->fd_count >= dst->capa) {
+ dst->capa = (dst->fdset->fd_count / FD_SETSIZE + 1) * FD_SETSIZE;
+ dst->fdset = xrealloc(dst->fdset, sizeof(unsigned int) + sizeof(SOCKET) * dst->capa);
+ }
+ dst->fdset->fd_array[dst->fdset->fd_count++] = fd;
+ }
+ memmove(
+ &src->fd_array[s],
+ &src->fd_array[s+1],
+ sizeof(src->fd_array[0]) * (--src->fd_count - s));
}
+ else s++;
+ }
return dst->fdset->fd_count;
}
static int
@@ -2420,20 +2562,20 @@
{
unsigned int s;
if (!src || !dst) return 0;
for (s = 0; s < src->fd_count; ++s) {
- SOCKET fd = src->fd_array[s];
- unsigned int d;
- for (d = 0; d < dst->fd_count; ++d) {
- if (dst->fd_array[d] == fd)
- break;
- }
- if (d == dst->fd_count && d < FD_SETSIZE) {
- dst->fd_array[dst->fd_count++] = fd;
- }
+ SOCKET fd = src->fd_array[s];
+ unsigned int d;
+ for (d = 0; d < dst->fd_count; ++d) {
+ if (dst->fd_array[d] == fd)
+ break;
}
+ if (d == dst->fd_count && d < FD_SETSIZE) {
+ dst->fd_array[dst->fd_count++] = fd;
+ }
+ }
return dst->fd_count;
}
static int
@@ -2446,11 +2588,11 @@
is_pipe(SOCKET sock) /* DONT call this for SOCKET! it clains it is PIPE. */
{
int ret;
RUBY_CRITICAL({
- ret = (GetFileType((HANDLE)sock) == FILE_TYPE_PIPE);
+ ret = (GetFileType((HANDLE)sock) == FILE_TYPE_PIPE);
});
return ret;
}
@@ -2463,16 +2605,16 @@
int ret;
DWORD n = 0;
RUBY_CRITICAL(
- if (PeekNamedPipe((HANDLE)sock, NULL, 0, NULL, &n, NULL)) {
- ret = (n > 0);
- }
- else {
- ret = (GetLastError() == ERROR_BROKEN_PIPE); /* pipe was closed */
- }
+ if (PeekNamedPipe((HANDLE)sock, NULL, 0, NULL, &n, NULL)) {
+ ret = (n > 0);
+ }
+ else {
+ ret = (GetLastError() == ERROR_BROKEN_PIPE); /* pipe was closed */
+ }
);
return ret;
#endif
}
@@ -2486,11 +2628,11 @@
int ret;
DWORD n = 0;
INPUT_RECORD ir;
RUBY_CRITICAL(
- ret = (PeekConsoleInput((HANDLE)sock, &ir, 1, &n))
+ ret = (PeekConsoleInput((HANDLE)sock, &ir, 1, &n))
);
return ret;
#endif //_WIN32_WCE
}
@@ -2505,19 +2647,19 @@
int ret = 0;
DWORD n = 0;
INPUT_RECORD ir;
RUBY_CRITICAL(
- if (PeekConsoleInput((HANDLE)sock, &ir, 1, &n) && n > 0) {
- if (ir.EventType == KEY_EVENT && ir.Event.KeyEvent.bKeyDown &&
- ir.Event.KeyEvent.uChar.AsciiChar) {
- ret = 1;
- }
- else {
- ReadConsoleInput((HANDLE)sock, &ir, 1, &n);
- }
- }
+ if (PeekConsoleInput((HANDLE)sock, &ir, 1, &n) && n > 0) {
+ if (ir.EventType == KEY_EVENT && ir.Event.KeyEvent.bKeyDown &&
+ ir.Event.KeyEvent.uChar.AsciiChar) {
+ ret = 1;
+ }
+ else {
+ ReadConsoleInput((HANDLE)sock, &ir, 1, &n);
+ }
+ }
);
return ret;
#endif //_WIN32_WCE
}
@@ -2527,66 +2669,66 @@
struct timeval *timeout)
{
int r = 0;
if (nfds == 0) {
- if (timeout)
- rb_w32_sleep(timeout->tv_sec * 1000 + timeout->tv_usec / 1000);
- else
- rb_w32_sleep(INFINITE);
+ if (timeout)
+ rb_w32_sleep(timeout->tv_sec * 1000 + timeout->tv_usec / 1000);
+ else
+ rb_w32_sleep(INFINITE);
}
else {
- RUBY_CRITICAL(
- EnterCriticalSection(&select_mutex);
- r = select(nfds, rd, wr, ex, timeout);
- LeaveCriticalSection(&select_mutex);
- if (r == SOCKET_ERROR) {
- errno = map_errno(WSAGetLastError());
- r = -1;
- }
- );
+ RUBY_CRITICAL(
+ EnterCriticalSection(&select_mutex);
+ r = select(nfds, rd, wr, ex, timeout);
+ LeaveCriticalSection(&select_mutex);
+ if (r == SOCKET_ERROR) {
+ errno = map_errno(WSAGetLastError());
+ r = -1;
+ }
+ );
}
return r;
}
static inline int
subtract(struct timeval *rest, const struct timeval *wait)
{
if (rest->tv_sec < wait->tv_sec) {
- return 0;
+ return 0;
}
while (rest->tv_usec < wait->tv_usec) {
- if (rest->tv_sec <= wait->tv_sec) {
- return 0;
- }
- rest->tv_sec -= 1;
- rest->tv_usec += 1000 * 1000;
+ if (rest->tv_sec <= wait->tv_sec) {
+ return 0;
}
+ rest->tv_sec -= 1;
+ rest->tv_usec += 1000 * 1000;
+ }
rest->tv_sec -= wait->tv_sec;
rest->tv_usec -= wait->tv_usec;
return rest->tv_sec != 0 || rest->tv_usec != 0;
}
static inline int
compare(const struct timeval *t1, const struct timeval *t2)
{
if (t1->tv_sec < t2->tv_sec)
- return -1;
+ return -1;
if (t1->tv_sec > t2->tv_sec)
- return 1;
+ return 1;
if (t1->tv_usec < t2->tv_usec)
- return -1;
+ return -1;
if (t1->tv_usec > t2->tv_usec)
- return 1;
+ return 1;
return 0;
}
#undef Sleep
int WSAAPI
rb_w32_select(int nfds, fd_set *rd, fd_set *wr, fd_set *ex,
- struct timeval *timeout)
+ struct timeval *timeout)
{
int r;
rb_fdset_t pipe_rd;
rb_fdset_t cons_rd;
rb_fdset_t else_rd;
@@ -2594,32 +2736,32 @@
rb_fdset_t except;
int nonsock = 0;
struct timeval limit = {0, 0};
if (nfds < 0 || (timeout && (timeout->tv_sec < 0 || timeout->tv_usec < 0))) {
- errno = EINVAL;
- return -1;
+ errno = EINVAL;
+ return -1;
}
if (timeout) {
- if (timeout->tv_sec < 0 ||
- timeout->tv_usec < 0 ||
- timeout->tv_usec >= 1000000) {
- errno = EINVAL;
- return -1;
- }
- gettimeofday(&limit, NULL);
- limit.tv_sec += timeout->tv_sec;
- limit.tv_usec += timeout->tv_usec;
- if (limit.tv_usec >= 1000000) {
- limit.tv_usec -= 1000000;
- limit.tv_sec++;
- }
+ if (timeout->tv_sec < 0 ||
+ timeout->tv_usec < 0 ||
+ timeout->tv_usec >= 1000000) {
+ errno = EINVAL;
+ return -1;
}
+ gettimeofday(&limit, NULL);
+ limit.tv_sec += timeout->tv_sec;
+ limit.tv_usec += timeout->tv_usec;
+ if (limit.tv_usec >= 1000000) {
+ limit.tv_usec -= 1000000;
+ limit.tv_sec++;
+ }
+ }
if (!NtSocketsInitialized) {
- StartSockets();
+ StartSockets();
}
// assume else_{rd,wr} (other than socket, pipe reader, console reader)
// are always readable/writable. but this implementation still has
// problem. if pipe's buffer is full, writing to pipe will block
@@ -2646,58 +2788,58 @@
if (wr && (int)wr->fd_count > r) r = (int)wr->fd_count;
if (ex && (int)ex->fd_count > r) r = (int)ex->fd_count;
if (nfds > r) nfds = r;
{
- struct timeval rest;
- struct timeval wait;
- struct timeval zero;
- wait.tv_sec = 0; wait.tv_usec = 10 * 1000; // 10ms
- zero.tv_sec = 0; zero.tv_usec = 0; // 0ms
- for (;;) {
- if (nonsock) {
- // modifying {else,pipe,cons}_rd is safe because
- // if they are modified, function returns immediately.
- extract_fd(&else_rd, pipe_rd.fdset, is_readable_pipe);
- extract_fd(&else_rd, cons_rd.fdset, is_readable_console);
- }
+ struct timeval rest;
+ struct timeval wait;
+ struct timeval zero;
+ wait.tv_sec = 0; wait.tv_usec = 10 * 1000; // 10ms
+ zero.tv_sec = 0; zero.tv_usec = 0; // 0ms
+ for (;;) {
+ if (nonsock) {
+ // modifying {else,pipe,cons}_rd is safe because
+ // if they are modified, function returns immediately.
+ extract_fd(&else_rd, pipe_rd.fdset, is_readable_pipe);
+ extract_fd(&else_rd, cons_rd.fdset, is_readable_console);
+ }
- if (else_rd.fdset->fd_count || else_wr.fdset->fd_count) {
- r = do_select(nfds, rd, wr, ex, &zero); // polling
- if (r < 0) break; // XXX: should I ignore error and return signaled handles?
- r = copy_fd(rd, else_rd.fdset);
- r += copy_fd(wr, else_wr.fdset);
- if (ex)
- r += ex->fd_count;
- break;
- }
- else {
- struct timeval *dowait = &wait;
+ if (else_rd.fdset->fd_count || else_wr.fdset->fd_count) {
+ r = do_select(nfds, rd, wr, ex, &zero); // polling
+ if (r < 0) break; // XXX: should I ignore error and return signaled handles?
+ r = copy_fd(rd, else_rd.fdset);
+ r += copy_fd(wr, else_wr.fdset);
+ if (ex)
+ r += ex->fd_count;
+ break;
+ }
+ else {
+ struct timeval *dowait = &wait;
- fd_set orig_rd;
- fd_set orig_wr;
- fd_set orig_ex;
- if (rd) orig_rd = *rd;
- if (wr) orig_wr = *wr;
- if (ex) orig_ex = *ex;
- r = do_select(nfds, rd, wr, ex, &zero); // polling
- if (r != 0) break; // signaled or error
- if (rd) *rd = orig_rd;
- if (wr) *wr = orig_wr;
- if (ex) *ex = orig_ex;
+ fd_set orig_rd;
+ fd_set orig_wr;
+ fd_set orig_ex;
+ if (rd) orig_rd = *rd;
+ if (wr) orig_wr = *wr;
+ if (ex) orig_ex = *ex;
+ r = do_select(nfds, rd, wr, ex, &zero); // polling
+ if (r != 0) break; // signaled or error
+ if (rd) *rd = orig_rd;
+ if (wr) *wr = orig_wr;
+ if (ex) *ex = orig_ex;
- if (timeout) {
- struct timeval now;
- gettimeofday(&now, NULL);
- rest = limit;
- if (!subtract(&rest, &now)) break;
- if (compare(&rest, &wait) < 0) dowait = &rest;
- }
- Sleep(dowait->tv_sec * 1000 + dowait->tv_usec / 1000);
- }
- }
+ if (timeout) {
+ struct timeval now;
+ gettimeofday(&now, NULL);
+ rest = limit;
+ if (!subtract(&rest, &now)) break;
+ if (compare(&rest, &wait) < 0) dowait = &rest;
+ }
+ Sleep(dowait->tv_sec * 1000 + dowait->tv_usec / 1000);
+ }
}
+ }
rb_fd_term(&except);
rb_fd_term(&else_wr);
rb_fd_term(&cons_rd);
rb_fd_term(&pipe_rd);
@@ -2716,32 +2858,32 @@
#else
SOCKET r;
int fd;
if (!NtSocketsInitialized) {
- StartSockets();
+ StartSockets();
}
RUBY_CRITICAL({
- HANDLE h = CreateFile("NUL", 0, 0, NULL, OPEN_ALWAYS, 0, NULL);
- fd = rb_w32_open_osfhandle((intptr_t)h, O_RDWR|O_BINARY|O_NOINHERIT);
- if (fd != -1) {
- r = accept(TO_SOCKET(s), addr, addrlen);
- if (r != INVALID_SOCKET) {
- MTHREAD_ONLY(EnterCriticalSection(&(_pioinfo(fd)->lock)));
- _set_osfhnd(fd, r);
- MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
- CloseHandle(h);
- st_insert(socklist, (st_data_t)r, (st_data_t)0);
- }
- else {
- errno = map_errno(WSAGetLastError());
- close(fd);
- fd = -1;
- }
- }
- else
- CloseHandle(h);
+ HANDLE h = CreateFile("NUL", 0, 0, NULL, OPEN_ALWAYS, 0, NULL);
+ fd = rb_w32_open_osfhandle((intptr_t)h, O_RDWR|O_BINARY|O_NOINHERIT);
+ if (fd != -1) {
+ r = accept(TO_SOCKET(s), addr, addrlen);
+ if (r != INVALID_SOCKET) {
+ MTHREAD_ONLY(EnterCriticalSection(&(_pioinfo(fd)->lock)));
+ _set_osfhnd(fd, r);
+ MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
+ CloseHandle(h);
+ st_insert(socklist, (st_data_t)r, (st_data_t)0);
+ }
+ else {
+ errno = map_errno(WSAGetLastError());
+ close(fd);
+ fd = -1;
+ }
+ }
+ else
+ CloseHandle(h);
});
return fd;
#endif //_WIN32_WCE
}
@@ -2751,16 +2893,16 @@
rb_w32_bind(int s, const struct sockaddr *addr, int addrlen)
{
int r;
if (!NtSocketsInitialized) {
- StartSockets();
+ StartSockets();
}
RUBY_CRITICAL({
- r = bind(TO_SOCKET(s), addr, addrlen);
- if (r == SOCKET_ERROR)
- errno = map_errno(WSAGetLastError());
+ r = bind(TO_SOCKET(s), addr, addrlen);
+ if (r == SOCKET_ERROR)
+ errno = map_errno(WSAGetLastError());
});
return r;
}
#undef connect
@@ -2768,21 +2910,21 @@
int WSAAPI
rb_w32_connect(int s, const struct sockaddr *addr, int addrlen)
{
int r;
if (!NtSocketsInitialized) {
- StartSockets();
+ StartSockets();
}
RUBY_CRITICAL({
- r = connect(TO_SOCKET(s), addr, addrlen);
- if (r == SOCKET_ERROR) {
- int err = WSAGetLastError();
- if (err != WSAEWOULDBLOCK)
- errno = map_errno(err);
- else
- errno = EINPROGRESS;
- }
+ r = connect(TO_SOCKET(s), addr, addrlen);
+ if (r == SOCKET_ERROR) {
+ int err = WSAGetLastError();
+ if (err != WSAEWOULDBLOCK)
+ errno = map_errno(err);
+ else
+ errno = EINPROGRESS;
+ }
});
return r;
}
@@ -2791,16 +2933,16 @@
int WSAAPI
rb_w32_getpeername(int s, struct sockaddr *addr, int *addrlen)
{
int r;
if (!NtSocketsInitialized) {
- StartSockets();
+ StartSockets();
}
RUBY_CRITICAL({
- r = getpeername(TO_SOCKET(s), addr, addrlen);
- if (r == SOCKET_ERROR)
- errno = map_errno(WSAGetLastError());
+ r = getpeername(TO_SOCKET(s), addr, addrlen);
+ if (r == SOCKET_ERROR)
+ errno = map_errno(WSAGetLastError());
});
return r;
}
#undef getsockname
@@ -2808,31 +2950,31 @@
int WSAAPI
rb_w32_getsockname(int s, struct sockaddr *addr, int *addrlen)
{
int r;
if (!NtSocketsInitialized) {
- StartSockets();
+ StartSockets();
}
RUBY_CRITICAL({
- r = getsockname(TO_SOCKET(s), addr, addrlen);
- if (r == SOCKET_ERROR)
- errno = map_errno(WSAGetLastError());
+ r = getsockname(TO_SOCKET(s), addr, addrlen);
+ if (r == SOCKET_ERROR)
+ errno = map_errno(WSAGetLastError());
});
return r;
}
int WSAAPI
rb_w32_getsockopt(int s, int level, int optname, char *optval, int *optlen)
{
int r;
if (!NtSocketsInitialized) {
- StartSockets();
+ StartSockets();
}
RUBY_CRITICAL({
- r = getsockopt(TO_SOCKET(s), level, optname, optval, optlen);
- if (r == SOCKET_ERROR)
- errno = map_errno(WSAGetLastError());
+ r = getsockopt(TO_SOCKET(s), level, optname, optval, optlen);
+ if (r == SOCKET_ERROR)
+ errno = map_errno(WSAGetLastError());
});
return r;
}
#undef ioctlsocket
@@ -2840,16 +2982,16 @@
int WSAAPI
rb_w32_ioctlsocket(int s, long cmd, u_long *argp)
{
int r;
if (!NtSocketsInitialized) {
- StartSockets();
+ StartSockets();
}
RUBY_CRITICAL({
- r = ioctlsocket(TO_SOCKET(s), cmd, argp);
- if (r == SOCKET_ERROR)
- errno = map_errno(WSAGetLastError());
+ r = ioctlsocket(TO_SOCKET(s), cmd, argp);
+ if (r == SOCKET_ERROR)
+ errno = map_errno(WSAGetLastError());
});
return r;
}
#undef listen
@@ -2857,16 +2999,16 @@
int WSAAPI
rb_w32_listen(int s, int backlog)
{
int r;
if (!NtSocketsInitialized) {
- StartSockets();
+ StartSockets();
}
RUBY_CRITICAL({
- r = listen(TO_SOCKET(s), backlog);
- if (r == SOCKET_ERROR)
- errno = map_errno(WSAGetLastError());
+ r = listen(TO_SOCKET(s), backlog);
+ if (r == SOCKET_ERROR)
+ errno = map_errno(WSAGetLastError());
});
return r;
}
#undef recv
@@ -2874,11 +3016,11 @@
#undef send
#undef sendto
static int
overlapped_socket_io(BOOL input, int fd, char *buf, int len, int flags,
- struct sockaddr *addr, int *addrlen)
+ struct sockaddr *addr, int *addrlen)
{
int r;
int ret;
int mode;
st_data_t data;
@@ -2887,87 +3029,87 @@
WSABUF wbuf;
int err;
SOCKET s;
if (!NtSocketsInitialized)
- StartSockets();
+ StartSockets();
s = TO_SOCKET(fd);
st_lookup(socklist, (st_data_t)s, &data);
mode = (int)data;
if (!cancel_io || (mode & O_NONBLOCK)) {
- RUBY_CRITICAL({
- if (input) {
- if (addr && addrlen)
- r = recvfrom(s, buf, len, flags, addr, addrlen);
- else
- r = recv(s, buf, len, flags);
- }
- else {
- if (addr && addrlen)
- r = sendto(s, buf, len, flags, addr, *addrlen);
- else
- r = send(s, buf, len, flags);
- }
- if (r == SOCKET_ERROR)
- errno = map_errno(WSAGetLastError());
- });
+ RUBY_CRITICAL({
+ if (input) {
+ if (addr && addrlen)
+ r = recvfrom(s, buf, len, flags, addr, addrlen);
+ else
+ r = recv(s, buf, len, flags);
+ }
+ else {
+ if (addr && addrlen)
+ r = sendto(s, buf, len, flags, addr, *addrlen);
+ else
+ r = send(s, buf, len, flags);
+ }
+ if (r == SOCKET_ERROR)
+ errno = map_errno(WSAGetLastError());
+ });
}
else {
- DWORD size;
- wbuf.len = len;
- wbuf.buf = buf;
- memset(&wol, 0, sizeof(wol));
- RUBY_CRITICAL({
- wol.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
- if (input) {
- flg = flags;
- if (addr && addrlen)
- ret = WSARecvFrom(s, &wbuf, 1, &size, &flg, addr, addrlen,
- &wol, NULL);
- else
- ret = WSARecv(s, &wbuf, 1, &size, &flg, &wol, NULL);
- }
- else {
- if (addr && addrlen)
- ret = WSASendTo(s, &wbuf, 1, &size, flags, addr, *addrlen,
- &wol, NULL);
- else
- ret = WSASend(s, &wbuf, 1, &size, flags, &wol, NULL);
- }
- });
+ DWORD size;
+ wbuf.len = len;
+ wbuf.buf = buf;
+ memset(&wol, 0, sizeof(wol));
+ RUBY_CRITICAL({
+ wol.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
+ if (input) {
+ flg = flags;
+ if (addr && addrlen)
+ ret = WSARecvFrom(s, &wbuf, 1, &size, &flg, addr, addrlen,
+ &wol, NULL);
+ else
+ ret = WSARecv(s, &wbuf, 1, &size, &flg, &wol, NULL);
+ }
+ else {
+ if (addr && addrlen)
+ ret = WSASendTo(s, &wbuf, 1, &size, flags, addr, *addrlen,
+ &wol, NULL);
+ else
+ ret = WSASend(s, &wbuf, 1, &size, flags, &wol, NULL);
+ }
+ });
- if (ret != SOCKET_ERROR) {
- r = size;
- }
- else if ((err = WSAGetLastError()) == WSA_IO_PENDING) {
- switch (rb_w32_wait_events_blocking(&wol.hEvent, 1, INFINITE)) {
- case WAIT_OBJECT_0:
- RUBY_CRITICAL(
- ret = WSAGetOverlappedResult(s, &wol, &size, TRUE, &flg)
- );
- if (ret) {
- r = size;
- break;
- }
- /* thru */
- default:
- errno = map_errno(WSAGetLastError());
- /* thru */
- case WAIT_OBJECT_0 + 1:
- /* interrupted */
- r = -1;
- cancel_io((HANDLE)s);
- break;
- }
- }
- else {
- errno = map_errno(err);
- r = -1;
- }
- CloseHandle(wol.hEvent);
+ if (ret != SOCKET_ERROR) {
+ r = size;
}
+ else if ((err = WSAGetLastError()) == WSA_IO_PENDING) {
+ switch (rb_w32_wait_events_blocking(&wol.hEvent, 1, INFINITE)) {
+ case WAIT_OBJECT_0:
+ RUBY_CRITICAL(
+ ret = WSAGetOverlappedResult(s, &wol, &size, TRUE, &flg)
+ );
+ if (ret) {
+ r = size;
+ break;
+ }
+ /* thru */
+ default:
+ errno = map_errno(WSAGetLastError());
+ /* thru */
+ case WAIT_OBJECT_0 + 1:
+ /* interrupted */
+ r = -1;
+ cancel_io((HANDLE)s);
+ break;
+ }
+ }
+ else {
+ errno = map_errno(err);
+ r = -1;
+ }
+ CloseHandle(wol.hEvent);
+ }
return r;
}
int WSAAPI
@@ -2976,11 +3118,11 @@
return overlapped_socket_io(TRUE, fd, buf, len, flags, NULL, NULL);
}
int WSAAPI
rb_w32_recvfrom(int fd, char *buf, int len, int flags,
- struct sockaddr *from, int *fromlen)
+ struct sockaddr *from, int *fromlen)
{
return overlapped_socket_io(TRUE, fd, buf, len, flags, from, fromlen);
}
int WSAAPI
@@ -2988,15 +3130,15 @@
{
return overlapped_socket_io(FALSE, fd, (char *)buf, len, flags, NULL, NULL);
}
int WSAAPI
-rb_w32_sendto(int fd, const char *buf, int len, int flags,
- const struct sockaddr *to, int tolen)
+rb_w32_sendto(int fd, const char *buf, int len, int flags,
+ const struct sockaddr *to, int tolen)
{
return overlapped_socket_io(FALSE, fd, (char *)buf, len, flags,
- (struct sockaddr *)to, &tolen);
+ (struct sockaddr *)to, &tolen);
}
#if !defined(MSG_TRUNC) && !defined(__MINGW32__)
typedef struct {
SOCKADDR *name;
@@ -3014,22 +3156,22 @@
#define WSAID_WSASENDMSG {0xa441e712,0x754f,0x43ca,{0x84,0xa7,0x0d,0xee,0x44,0xcf,0x60,0x6d}}
#endif
#define msghdr_to_wsamsg(msg, wsamsg) \
do { \
- int i; \
- (wsamsg)->name = (msg)->msg_name; \
- (wsamsg)->namelen = (msg)->msg_namelen; \
- (wsamsg)->lpBuffers = ALLOCA_N(WSABUF, (msg)->msg_iovlen); \
- (wsamsg)->dwBufferCount = (msg)->msg_iovlen; \
- for (i = 0; i < (msg)->msg_iovlen; ++i) { \
- (wsamsg)->lpBuffers[i].buf = (msg)->msg_iov[i].iov_base; \
- (wsamsg)->lpBuffers[i].len = (msg)->msg_iov[i].iov_len; \
- } \
- (wsamsg)->Control.buf = (msg)->msg_control; \
- (wsamsg)->Control.len = (msg)->msg_controllen; \
- (wsamsg)->dwFlags = (msg)->msg_flags; \
+ int i; \
+ (wsamsg)->name = (msg)->msg_name; \
+ (wsamsg)->namelen = (msg)->msg_namelen; \
+ (wsamsg)->lpBuffers = ALLOCA_N(WSABUF, (msg)->msg_iovlen); \
+ (wsamsg)->dwBufferCount = (msg)->msg_iovlen; \
+ for (i = 0; i < (msg)->msg_iovlen; ++i) { \
+ (wsamsg)->lpBuffers[i].buf = (msg)->msg_iov[i].iov_base; \
+ (wsamsg)->lpBuffers[i].len = (msg)->msg_iov[i].iov_len; \
+ } \
+ (wsamsg)->Control.buf = (msg)->msg_control; \
+ (wsamsg)->Control.len = (msg)->msg_controllen; \
+ (wsamsg)->dwFlags = (msg)->msg_flags; \
} while (0)
int
recvmsg(int fd, struct msghdr *msg, int flags)
{
@@ -3041,81 +3183,81 @@
int mode;
DWORD len;
int ret;
if (!NtSocketsInitialized)
- StartSockets();
+ StartSockets();
s = TO_SOCKET(fd);
if (!pWSARecvMsg) {
- static GUID guid = WSAID_WSARECVMSG;
- DWORD dmy;
- WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, &guid, sizeof(guid),
- &pWSARecvMsg, sizeof(pWSARecvMsg), &dmy, NULL, NULL);
- if (!pWSARecvMsg) {
- errno = ENOSYS;
- return -1;
- }
+ static GUID guid = WSAID_WSARECVMSG;
+ DWORD dmy;
+ WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, &guid, sizeof(guid),
+ &pWSARecvMsg, sizeof(pWSARecvMsg), &dmy, NULL, NULL);
+ if (!pWSARecvMsg) {
+ errno = ENOSYS;
+ return -1;
}
+ }
msghdr_to_wsamsg(msg, &wsamsg);
wsamsg.dwFlags |= flags;
st_lookup(socklist, (st_data_t)s, &data);
mode = (int)data;
if (!cancel_io || (mode & O_NONBLOCK)) {
- RUBY_CRITICAL({
- if ((ret = pWSARecvMsg(s, &wsamsg, &len, NULL, NULL)) == SOCKET_ERROR) {
- errno = map_errno(WSAGetLastError());
- len = -1;
- }
- });
+ RUBY_CRITICAL({
+ if ((ret = pWSARecvMsg(s, &wsamsg, &len, NULL, NULL)) == SOCKET_ERROR) {
+ errno = map_errno(WSAGetLastError());
+ len = -1;
+ }
+ });
}
else {
- DWORD size;
- int err;
- WSAOVERLAPPED wol;
- memset(&wol, 0, sizeof(wol));
- RUBY_CRITICAL({
- wol.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
- ret = pWSARecvMsg(s, &wsamsg, &len, &wol, NULL);
- });
+ DWORD size;
+ int err;
+ WSAOVERLAPPED wol;
+ memset(&wol, 0, sizeof(wol));
+ RUBY_CRITICAL({
+ wol.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
+ ret = pWSARecvMsg(s, &wsamsg, &len, &wol, NULL);
+ });
- if (ret != SOCKET_ERROR) {
- /* nothing to do */
- }
- else if ((err = WSAGetLastError()) == WSA_IO_PENDING) {
- DWORD flg;
- switch (rb_w32_wait_events_blocking(&wol.hEvent, 1, INFINITE)) {
- case WAIT_OBJECT_0:
- RUBY_CRITICAL(
- ret = WSAGetOverlappedResult(s, &wol, &size, TRUE, &flg)
- );
- if (ret) {
- len = size;
- break;
- }
- /* thru */
- default:
- errno = map_errno(WSAGetLastError());
- /* thru */
- case WAIT_OBJECT_0 + 1:
- /* interrupted */
- len = -1;
- cancel_io((HANDLE)s);
- break;
- }
- }
- else {
- errno = map_errno(err);
- len = -1;
- }
- CloseHandle(wol.hEvent);
+ if (ret != SOCKET_ERROR) {
+ /* nothing to do */
}
+ else if ((err = WSAGetLastError()) == WSA_IO_PENDING) {
+ DWORD flg;
+ switch (rb_w32_wait_events_blocking(&wol.hEvent, 1, INFINITE)) {
+ case WAIT_OBJECT_0:
+ RUBY_CRITICAL(
+ ret = WSAGetOverlappedResult(s, &wol, &size, TRUE, &flg)
+ );
+ if (ret) {
+ len = size;
+ break;
+ }
+ /* thru */
+ default:
+ errno = map_errno(WSAGetLastError());
+ /* thru */
+ case WAIT_OBJECT_0 + 1:
+ /* interrupted */
+ len = -1;
+ cancel_io((HANDLE)s);
+ break;
+ }
+ }
+ else {
+ errno = map_errno(err);
+ len = -1;
+ }
+ CloseHandle(wol.hEvent);
+ }
if (ret == SOCKET_ERROR)
- return -1;
+ return -1;
/* WSAMSG to msghdr */
msg->msg_name = wsamsg.name;
msg->msg_namelen = wsamsg.namelen;
msg->msg_flags = wsamsg.dwFlags;
@@ -3134,78 +3276,78 @@
int mode;
DWORD len;
int ret;
if (!NtSocketsInitialized)
- StartSockets();
+ StartSockets();
s = TO_SOCKET(fd);
if (!pWSASendMsg) {
- static GUID guid = WSAID_WSASENDMSG;
- DWORD dmy;
- WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, &guid, sizeof(guid),
- &pWSASendMsg, sizeof(pWSASendMsg), &dmy, NULL, NULL);
- if (!pWSASendMsg) {
- errno = ENOSYS;
- return -1;
- }
+ static GUID guid = WSAID_WSASENDMSG;
+ DWORD dmy;
+ WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, &guid, sizeof(guid),
+ &pWSASendMsg, sizeof(pWSASendMsg), &dmy, NULL, NULL);
+ if (!pWSASendMsg) {
+ errno = ENOSYS;
+ return -1;
}
+ }
msghdr_to_wsamsg(msg, &wsamsg);
st_lookup(socklist, (st_data_t)s, &data);
mode = (int)data;
if (!cancel_io || (mode & O_NONBLOCK)) {
- RUBY_CRITICAL({
- if ((ret = pWSASendMsg(s, &wsamsg, flags, &len, NULL, NULL)) == SOCKET_ERROR) {
- errno = map_errno(WSAGetLastError());
- len = -1;
- }
- });
+ RUBY_CRITICAL({
+ if ((ret = pWSASendMsg(s, &wsamsg, flags, &len, NULL, NULL)) == SOCKET_ERROR) {
+ errno = map_errno(WSAGetLastError());
+ len = -1;
+ }
+ });
}
else {
- DWORD size;
- int err;
- WSAOVERLAPPED wol;
- memset(&wol, 0, sizeof(wol));
- RUBY_CRITICAL({
- wol.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
- ret = pWSASendMsg(s, &wsamsg, flags, &len, &wol, NULL);
- });
+ DWORD size;
+ int err;
+ WSAOVERLAPPED wol;
+ memset(&wol, 0, sizeof(wol));
+ RUBY_CRITICAL({
+ wol.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
+ ret = pWSASendMsg(s, &wsamsg, flags, &len, &wol, NULL);
+ });
- if (ret != SOCKET_ERROR) {
- /* nothing to do */
- }
- else if ((err = WSAGetLastError()) == WSA_IO_PENDING) {
- DWORD flg;
- switch (rb_w32_wait_events_blocking(&wol.hEvent, 1, INFINITE)) {
- case WAIT_OBJECT_0:
- RUBY_CRITICAL(
- ret = WSAGetOverlappedResult(s, &wol, &size, TRUE, &flg)
- );
- if (ret) {
- len = size;
- break;
- }
- /* thru */
- default:
- errno = map_errno(WSAGetLastError());
- /* thru */
- case WAIT_OBJECT_0 + 1:
- /* interrupted */
- len = -1;
- cancel_io((HANDLE)s);
- break;
- }
- }
- else {
- errno = map_errno(err);
- len = -1;
- }
- CloseHandle(wol.hEvent);
+ if (ret != SOCKET_ERROR) {
+ /* nothing to do */
}
+ else if ((err = WSAGetLastError()) == WSA_IO_PENDING) {
+ DWORD flg;
+ switch (rb_w32_wait_events_blocking(&wol.hEvent, 1, INFINITE)) {
+ case WAIT_OBJECT_0:
+ RUBY_CRITICAL(
+ ret = WSAGetOverlappedResult(s, &wol, &size, TRUE, &flg)
+ );
+ if (ret) {
+ len = size;
+ break;
+ }
+ /* thru */
+ default:
+ errno = map_errno(WSAGetLastError());
+ /* thru */
+ case WAIT_OBJECT_0 + 1:
+ /* interrupted */
+ len = -1;
+ cancel_io((HANDLE)s);
+ break;
+ }
+ }
+ else {
+ errno = map_errno(err);
+ len = -1;
+ }
+ CloseHandle(wol.hEvent);
+ }
return len;
}
#undef setsockopt
@@ -3213,33 +3355,33 @@
int WSAAPI
rb_w32_setsockopt(int s, int level, int optname, const char *optval, int optlen)
{
int r;
if (!NtSocketsInitialized) {
- StartSockets();
+ StartSockets();
}
RUBY_CRITICAL({
- r = setsockopt(TO_SOCKET(s), level, optname, optval, optlen);
- if (r == SOCKET_ERROR)
- errno = map_errno(WSAGetLastError());
+ r = setsockopt(TO_SOCKET(s), level, optname, optval, optlen);
+ if (r == SOCKET_ERROR)
+ errno = map_errno(WSAGetLastError());
});
return r;
}
-
+
#undef shutdown
int WSAAPI
rb_w32_shutdown(int s, int how)
{
int r;
if (!NtSocketsInitialized) {
- StartSockets();
+ StartSockets();
}
RUBY_CRITICAL({
- r = shutdown(TO_SOCKET(s), how);
- if (r == SOCKET_ERROR)
- errno = map_errno(WSAGetLastError());
+ r = shutdown(TO_SOCKET(s), how);
+ if (r == SOCKET_ERROR)
+ errno = map_errno(WSAGetLastError());
});
return r;
}
static SOCKET
@@ -3248,45 +3390,45 @@
unsigned long proto_buffers_len = 0;
int error_code;
SOCKET out = INVALID_SOCKET;
if (WSAEnumProtocols(NULL, NULL, &proto_buffers_len) == SOCKET_ERROR) {
- error_code = WSAGetLastError();
- if (error_code == WSAENOBUFS) {
- WSAPROTOCOL_INFO *proto_buffers;
- int protocols_available = 0;
+ error_code = WSAGetLastError();
+ if (error_code == WSAENOBUFS) {
+ WSAPROTOCOL_INFO *proto_buffers;
+ int protocols_available = 0;
- proto_buffers = (WSAPROTOCOL_INFO *)malloc(proto_buffers_len);
- if (!proto_buffers) {
- WSASetLastError(WSA_NOT_ENOUGH_MEMORY);
- return INVALID_SOCKET;
- }
+ proto_buffers = (WSAPROTOCOL_INFO *)malloc(proto_buffers_len);
+ if (!proto_buffers) {
+ WSASetLastError(WSA_NOT_ENOUGH_MEMORY);
+ return INVALID_SOCKET;
+ }
- protocols_available =
- WSAEnumProtocols(NULL, proto_buffers, &proto_buffers_len);
- if (protocols_available != SOCKET_ERROR) {
- int i;
- for (i = 0; i < protocols_available; i++) {
- if ((af != AF_UNSPEC && af != proto_buffers[i].iAddressFamily) ||
- (type != proto_buffers[i].iSocketType) ||
- (protocol != 0 && protocol != proto_buffers[i].iProtocol))
- continue;
+ protocols_available =
+ WSAEnumProtocols(NULL, proto_buffers, &proto_buffers_len);
+ if (protocols_available != SOCKET_ERROR) {
+ int i;
+ for (i = 0; i < protocols_available; i++) {
+ if ((af != AF_UNSPEC && af != proto_buffers[i].iAddressFamily) ||
+ (type != proto_buffers[i].iSocketType) ||
+ (protocol != 0 && protocol != proto_buffers[i].iProtocol))
+ continue;
- if ((proto_buffers[i].dwServiceFlags1 & XP1_IFS_HANDLES) == 0)
- continue;
+ if ((proto_buffers[i].dwServiceFlags1 & XP1_IFS_HANDLES) == 0)
+ continue;
- out = WSASocket(af, type, protocol, &(proto_buffers[i]), 0,
- WSA_FLAG_OVERLAPPED);
- break;
- }
- if (out == INVALID_SOCKET)
- out = WSASocket(af, type, protocol, NULL, 0, 0);
- }
+ out = WSASocket(af, type, protocol, &(proto_buffers[i]), 0,
+ WSA_FLAG_OVERLAPPED);
+ break;
+ }
+ if (out == INVALID_SOCKET)
+ out = WSASocket(af, type, protocol, NULL, 0, 0);
+ }
- free(proto_buffers);
- }
+ free(proto_buffers);
}
+ }
return out;
}
#undef socket
@@ -3296,25 +3438,25 @@
{
SOCKET s;
int fd;
if (!NtSocketsInitialized) {
- StartSockets();
+ StartSockets();
}
RUBY_CRITICAL({
- s = open_ifs_socket(af, type, protocol);
- if (s == INVALID_SOCKET) {
- errno = map_errno(WSAGetLastError());
- fd = -1;
- }
- else {
- fd = rb_w32_open_osfhandle(s, O_RDWR|O_BINARY|O_NOINHERIT);
- if (fd != -1)
- st_insert(socklist, (st_data_t)s, (st_data_t)0);
- else
- closesocket(s);
- }
+ s = open_ifs_socket(af, type, protocol);
+ if (s == INVALID_SOCKET) {
+ errno = map_errno(WSAGetLastError());
+ fd = -1;
+ }
+ else {
+ fd = rb_w32_open_osfhandle(s, O_RDWR|O_BINARY|O_NOINHERIT);
+ if (fd != -1)
+ st_insert(socklist, (st_data_t)s, (st_data_t)0);
+ else
+ closesocket(s);
+ }
});
return fd;
}
#undef gethostbyaddr
@@ -3322,16 +3464,16 @@
struct hostent * WSAAPI
rb_w32_gethostbyaddr(const char *addr, int len, int type)
{
struct hostent *r;
if (!NtSocketsInitialized) {
- StartSockets();
+ StartSockets();
}
RUBY_CRITICAL({
- r = gethostbyaddr(addr, len, type);
- if (r == NULL)
- errno = map_errno(WSAGetLastError());
+ r = gethostbyaddr(addr, len, type);
+ if (r == NULL)
+ errno = map_errno(WSAGetLastError());
});
return r;
}
#undef gethostbyname
@@ -3339,16 +3481,16 @@
struct hostent * WSAAPI
rb_w32_gethostbyname(const char *name)
{
struct hostent *r;
if (!NtSocketsInitialized) {
- StartSockets();
+ StartSockets();
}
RUBY_CRITICAL({
- r = gethostbyname(name);
- if (r == NULL)
- errno = map_errno(WSAGetLastError());
+ r = gethostbyname(name);
+ if (r == NULL)
+ errno = map_errno(WSAGetLastError());
});
return r;
}
#undef gethostname
@@ -3356,16 +3498,16 @@
int WSAAPI
rb_w32_gethostname(char *name, int len)
{
int r;
if (!NtSocketsInitialized) {
- StartSockets();
+ StartSockets();
}
RUBY_CRITICAL({
- r = gethostname(name, len);
- if (r == SOCKET_ERROR)
- errno = map_errno(WSAGetLastError());
+ r = gethostname(name, len);
+ if (r == SOCKET_ERROR)
+ errno = map_errno(WSAGetLastError());
});
return r;
}
#undef getprotobyname
@@ -3373,16 +3515,16 @@
struct protoent * WSAAPI
rb_w32_getprotobyname(const char *name)
{
struct protoent *r;
if (!NtSocketsInitialized) {
- StartSockets();
+ StartSockets();
}
RUBY_CRITICAL({
- r = getprotobyname(name);
- if (r == NULL)
- errno = map_errno(WSAGetLastError());
+ r = getprotobyname(name);
+ if (r == NULL)
+ errno = map_errno(WSAGetLastError());
});
return r;
}
#undef getprotobynumber
@@ -3390,16 +3532,16 @@
struct protoent * WSAAPI
rb_w32_getprotobynumber(int num)
{
struct protoent *r;
if (!NtSocketsInitialized) {
- StartSockets();
+ StartSockets();
}
RUBY_CRITICAL({
- r = getprotobynumber(num);
- if (r == NULL)
- errno = map_errno(WSAGetLastError());
+ r = getprotobynumber(num);
+ if (r == NULL)
+ errno = map_errno(WSAGetLastError());
});
return r;
}
#undef getservbyname
@@ -3407,16 +3549,16 @@
struct servent * WSAAPI
rb_w32_getservbyname(const char *name, const char *proto)
{
struct servent *r;
if (!NtSocketsInitialized) {
- StartSockets();
+ StartSockets();
}
RUBY_CRITICAL({
- r = getservbyname(name, proto);
- if (r == NULL)
- errno = map_errno(WSAGetLastError());
+ r = getservbyname(name, proto);
+ if (r == NULL)
+ errno = map_errno(WSAGetLastError());
});
return r;
}
#undef getservbyport
@@ -3424,16 +3566,16 @@
struct servent * WSAAPI
rb_w32_getservbyport(int port, const char *proto)
{
struct servent *r;
if (!NtSocketsInitialized) {
- StartSockets();
+ StartSockets();
}
RUBY_CRITICAL({
- r = getservbyport(port, proto);
- if (r == NULL)
- errno = map_errno(WSAGetLastError());
+ r = getservbyport(port, proto);
+ if (r == NULL)
+ errno = map_errno(WSAGetLastError());
});
return r;
}
static int
@@ -3447,82 +3589,82 @@
struct sockaddr *addr;
int ret = -1;
int len;
if (!NtSocketsInitialized) {
- StartSockets();
+ StartSockets();
}
switch (af) {
case AF_INET:
#if defined PF_INET && PF_INET != AF_INET
case PF_INET:
#endif
- sock_in4.sin_family = AF_INET;
- sock_in4.sin_port = 0;
- sock_in4.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
- addr = (struct sockaddr *)&sock_in4;
- len = sizeof(sock_in4);
- break;
+ sock_in4.sin_family = AF_INET;
+ sock_in4.sin_port = 0;
+ sock_in4.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+ addr = (struct sockaddr *)&sock_in4;
+ len = sizeof(sock_in4);
+ break;
#ifdef INET6
case AF_INET6:
- memset(&sock_in6, 0, sizeof(sock_in6));
- sock_in6.sin6_family = AF_INET6;
- sock_in6.sin6_addr = IN6ADDR_LOOPBACK_INIT;
- addr = (struct sockaddr *)&sock_in6;
- len = sizeof(sock_in6);
- break;
+ memset(&sock_in6, 0, sizeof(sock_in6));
+ sock_in6.sin6_family = AF_INET6;
+ sock_in6.sin6_addr = IN6ADDR_LOOPBACK_INIT;
+ addr = (struct sockaddr *)&sock_in6;
+ len = sizeof(sock_in6);
+ break;
#endif
default:
- errno = EAFNOSUPPORT;
- return -1;
+ errno = EAFNOSUPPORT;
+ return -1;
}
if (type != SOCK_STREAM) {
- errno = EPROTOTYPE;
- return -1;
+ errno = EPROTOTYPE;
+ return -1;
}
sv[0] = (SOCKET)INVALID_HANDLE_VALUE;
sv[1] = (SOCKET)INVALID_HANDLE_VALUE;
RUBY_CRITICAL({
- do {
- svr = open_ifs_socket(af, type, protocol);
- if (svr == INVALID_SOCKET)
- break;
- if (bind(svr, addr, len) < 0)
- break;
- if (getsockname(svr, addr, &len) < 0)
- break;
- if (type == SOCK_STREAM)
- listen(svr, 5);
+ do {
+ svr = open_ifs_socket(af, type, protocol);
+ if (svr == INVALID_SOCKET)
+ break;
+ if (bind(svr, addr, len) < 0)
+ break;
+ if (getsockname(svr, addr, &len) < 0)
+ break;
+ if (type == SOCK_STREAM)
+ listen(svr, 5);
- w = open_ifs_socket(af, type, protocol);
- if (w == INVALID_SOCKET)
- break;
- if (connect(w, addr, len) < 0)
- break;
+ w = open_ifs_socket(af, type, protocol);
+ if (w == INVALID_SOCKET)
+ break;
+ if (connect(w, addr, len) < 0)
+ break;
- r = accept(svr, addr, &len);
- if (r == INVALID_SOCKET)
- break;
+ r = accept(svr, addr, &len);
+ if (r == INVALID_SOCKET)
+ break;
- ret = 0;
- } while (0);
+ ret = 0;
+ } while (0);
- if (ret < 0) {
- errno = map_errno(WSAGetLastError());
- if (r != INVALID_SOCKET)
- closesocket(r);
- if (w != INVALID_SOCKET)
- closesocket(w);
- }
- else {
- sv[0] = r;
- sv[1] = w;
- }
- if (svr != INVALID_SOCKET)
- closesocket(svr);
+ if (ret < 0) {
+ errno = map_errno(WSAGetLastError());
+ if (r != INVALID_SOCKET)
+ closesocket(r);
+ if (w != INVALID_SOCKET)
+ closesocket(w);
+ }
+ else {
+ sv[0] = r;
+ sv[1] = w;
+ }
+ if (svr != INVALID_SOCKET)
+ closesocket(svr);
});
return ret;
}
@@ -3530,22 +3672,22 @@
rb_w32_socketpair(int af, int type, int protocol, int *sv)
{
SOCKET pair[2];
if (socketpair_internal(af, type, protocol, pair) < 0)
- return -1;
+ return -1;
sv[0] = rb_w32_open_osfhandle(pair[0], O_RDWR|O_BINARY|O_NOINHERIT);
if (sv[0] == -1) {
- closesocket(pair[0]);
- closesocket(pair[1]);
- return -1;
+ closesocket(pair[0]);
+ closesocket(pair[1]);
+ return -1;
}
sv[1] = rb_w32_open_osfhandle(pair[1], O_RDWR|O_BINARY|O_NOINHERIT);
if (sv[1] == -1) {
- rb_w32_close(sv[0]);
- closesocket(pair[1]);
- return -1;
+ rb_w32_close(sv[0]);
+ closesocket(pair[1]);
+ return -1;
}
st_insert(socklist, (st_data_t)pair[0], (st_data_t)0);
st_insert(socklist, (st_data_t)pair[1], (st_data_t)0);
return 0;
@@ -3588,37 +3730,37 @@
int flag = 0;
st_data_t data;
u_long ioctlArg;
if (!is_socket(sock)) {
- errno = EBADF;
- return -1;
+ errno = EBADF;
+ return -1;
}
if (cmd != F_SETFL) {
- errno = EINVAL;
- return -1;
+ errno = EINVAL;
+ return -1;
}
va_start(va, cmd);
arg = va_arg(va, int);
va_end(va);
st_lookup(socklist, (st_data_t)sock, &data);
flag = (int)data;
if (arg & O_NONBLOCK) {
- flag |= O_NONBLOCK;
- ioctlArg = 1;
+ flag |= O_NONBLOCK;
+ ioctlArg = 1;
}
else {
- flag &= ~O_NONBLOCK;
- ioctlArg = 0;
+ flag &= ~O_NONBLOCK;
+ ioctlArg = 0;
}
RUBY_CRITICAL({
- ret = ioctlsocket(sock, FIONBIO, &ioctlArg);
- if (ret == 0)
- st_insert(socklist, (st_data_t)sock, (st_data_t)flag);
- else
- errno = map_errno(WSAGetLastError());
+ ret = ioctlsocket(sock, FIONBIO, &ioctlArg);
+ if (ret == 0)
+ st_insert(socklist, (st_data_t)sock, (st_data_t)flag);
+ else
+ errno = map_errno(WSAGetLastError());
});
return ret;
}
@@ -3631,92 +3773,92 @@
{
DWORD exitcode;
DWORD err;
if (!GetExitCodeProcess(child->hProcess, &exitcode)) {
- /* If an error occured, return immediatly. */
+ /* If an error occured, return immediatly. */
error_exit:
- err = GetLastError();
- if (err == ERROR_INVALID_PARAMETER)
- errno = ECHILD;
- else {
- if (GetLastError() == ERROR_INVALID_HANDLE)
- errno = EINVAL;
- else
- errno = map_errno(GetLastError());
- }
- CloseChildHandle(child);
- return -1;
+ err = GetLastError();
+ if (err == ERROR_INVALID_PARAMETER)
+ errno = ECHILD;
+ else {
+ if (GetLastError() == ERROR_INVALID_HANDLE)
+ errno = EINVAL;
+ else
+ errno = map_errno(GetLastError());
}
+ CloseChildHandle(child);
+ return -1;
+ }
if (exitcode != STILL_ACTIVE) {
rb_pid_t pid;
- /* If already died, wait process's real termination. */
+ /* If already died, wait process's real termination. */
if (rb_w32_wait_events_blocking(&child->hProcess, 1, INFINITE) != WAIT_OBJECT_0) {
- goto error_exit;
+ goto error_exit;
}
- pid = child->pid;
- CloseChildHandle(child);
- if (stat_loc) *stat_loc = exitcode << 8;
- return pid;
+ pid = child->pid;
+ CloseChildHandle(child);
+ if (stat_loc) *stat_loc = exitcode << 8;
+ return pid;
}
return 0;
}
rb_pid_t
waitpid(rb_pid_t pid, int *stat_loc, int options)
{
DWORD timeout;
if (options == WNOHANG) {
- timeout = 0;
+ timeout = 0;
} else {
- timeout = INFINITE;
+ timeout = INFINITE;
}
if (pid == -1) {
- int count = 0;
- int ret;
- HANDLE events[MAXCHILDNUM];
+ int count = 0;
+ int ret;
+ HANDLE events[MAXCHILDNUM];
- FOREACH_CHILD(child) {
- if (!child->pid || child->pid < 0) continue;
- if ((pid = poll_child_status(child, stat_loc))) return pid;
- events[count++] = child->hProcess;
- } END_FOREACH_CHILD;
- if (!count) {
- errno = ECHILD;
- return -1;
- }
+ FOREACH_CHILD(child) {
+ if (!child->pid || child->pid < 0) continue;
+ if ((pid = poll_child_status(child, stat_loc))) return pid;
+ events[count++] = child->hProcess;
+ } END_FOREACH_CHILD;
+ if (!count) {
+ errno = ECHILD;
+ return -1;
+ }
- ret = rb_w32_wait_events_blocking(events, count, timeout);
- if (ret == WAIT_TIMEOUT) return 0;
- if ((ret -= WAIT_OBJECT_0) == count) {
- return -1;
- }
- if (ret > count) {
- errno = map_errno(GetLastError());
- return -1;
- }
+ ret = rb_w32_wait_events_blocking(events, count, timeout);
+ if (ret == WAIT_TIMEOUT) return 0;
+ if ((ret -= WAIT_OBJECT_0) == count) {
+ return -1;
+ }
+ if (ret > count) {
+ errno = map_errno(GetLastError());
+ return -1;
+ }
- return poll_child_status(FindChildSlotByHandle(events[ret]), stat_loc);
+ return poll_child_status(FindChildSlotByHandle(events[ret]), stat_loc);
}
else {
- struct ChildRecord* child = FindChildSlot(pid);
- if (!child) {
- errno = ECHILD;
- return -1;
- }
+ struct ChildRecord* child = FindChildSlot(pid);
+ if (!child) {
+ errno = ECHILD;
+ return -1;
+ }
- while (!(pid = poll_child_status(child, stat_loc))) {
- /* wait... */
- if (rb_w32_wait_events_blocking(&child->hProcess, 1, timeout) != WAIT_OBJECT_0) {
- /* still active */
- pid = 0;
- break;
- }
- }
+ while (!(pid = poll_child_status(child, stat_loc))) {
+ /* wait... */
+ if (rb_w32_wait_events_blocking(&child->hProcess, 1, timeout) != WAIT_OBJECT_0) {
+ /* still active */
+ pid = 0;
+ break;
+ }
}
+ }
return pid;
}
#include <sys/timeb.h>
@@ -3762,35 +3904,35 @@
int len;
//RHO
len = GetCurrentDirectoryA(0, NULL);
//RHO
if (!len) {
- errno = map_errno(GetLastError());
- return NULL;
+ errno = map_errno(GetLastError());
+ return NULL;
}
if (p) {
- if (size < len) {
- errno = ERANGE;
- return NULL;
- }
+ if (size < len) {
+ errno = ERANGE;
+ return NULL;
}
+ }
else {
- p = malloc(len);
- size = len;
- if (!p) {
- errno = ENOMEM;
- return NULL;
- }
+ p = malloc(len);
+ size = len;
+ if (!p) {
+ errno = ENOMEM;
+ return NULL;
}
+ }
//RHO
if (!GetCurrentDirectoryA(size, p)) {
//RHO
- errno = map_errno(GetLastError());
- if (!buffer)
- free(p);
+ errno = map_errno(GetLastError());
+ if (!buffer)
+ free(p);
return NULL;
}
translate_char(p, '\\', '/');
@@ -3815,82 +3957,82 @@
{
int ret = 0;
DWORD err;
if (pid < 0 || pid == 0 && sig != SIGINT) {
- errno = EINVAL;
- return -1;
+ errno = EINVAL;
+ return -1;
}
(void)IfWin95(pid = -pid, 0);
if ((unsigned int)pid == GetCurrentProcessId() &&
- (sig != 0 && sig != SIGKILL)) {
- if ((ret = raise(sig)) != 0) {
- /* MSVCRT doesn't set errno... */
- errno = EINVAL;
- }
- return ret;
+ (sig != 0 && sig != SIGKILL)) {
+ if ((ret = raise(sig)) != 0) {
+ /* MSVCRT doesn't set errno... */
+ errno = EINVAL;
}
+ return ret;
+ }
switch (sig) {
case 0:
- RUBY_CRITICAL({
- HANDLE hProc =
- OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, (DWORD)pid);
- if (hProc == NULL || hProc == INVALID_HANDLE_VALUE) {
- if (GetLastError() == ERROR_INVALID_PARAMETER) {
- errno = ESRCH;
- }
- else {
- errno = EPERM;
- }
- ret = -1;
- }
- else {
- CloseHandle(hProc);
- }
- });
- break;
+ RUBY_CRITICAL({
+ HANDLE hProc =
+ OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, (DWORD)pid);
+ if (hProc == NULL || hProc == INVALID_HANDLE_VALUE) {
+ if (GetLastError() == ERROR_INVALID_PARAMETER) {
+ errno = ESRCH;
+ }
+ else {
+ errno = EPERM;
+ }
+ ret = -1;
+ }
+ else {
+ CloseHandle(hProc);
+ }
+ });
+ break;
case SIGINT:
- RUBY_CRITICAL({
- if (!GenerateConsoleCtrlEvent(CTRL_C_EVENT, (DWORD)pid)) {
- if ((err = GetLastError()) == 0)
- errno = EPERM;
- else
- errno = map_errno(GetLastError());
- ret = -1;
- }
- });
- break;
+ RUBY_CRITICAL({
+ if (!GenerateConsoleCtrlEvent(CTRL_C_EVENT, (DWORD)pid)) {
+ if ((err = GetLastError()) == 0)
+ errno = EPERM;
+ else
+ errno = map_errno(GetLastError());
+ ret = -1;
+ }
+ });
+ break;
case SIGKILL:
- RUBY_CRITICAL({
- HANDLE hProc = OpenProcess(PROCESS_TERMINATE, FALSE, (DWORD)pid);
- if (hProc == NULL || hProc == INVALID_HANDLE_VALUE) {
- if (GetLastError() == ERROR_INVALID_PARAMETER) {
- errno = ESRCH;
- }
- else {
- errno = EPERM;
- }
- ret = -1;
- }
- else {
- if (!TerminateProcess(hProc, 0)) {
- errno = EPERM;
- ret = -1;
- }
- CloseHandle(hProc);
- }
- });
- break;
+ RUBY_CRITICAL({
+ HANDLE hProc = OpenProcess(PROCESS_TERMINATE, FALSE, (DWORD)pid);
+ if (hProc == NULL || hProc == INVALID_HANDLE_VALUE) {
+ if (GetLastError() == ERROR_INVALID_PARAMETER) {
+ errno = ESRCH;
+ }
+ else {
+ errno = EPERM;
+ }
+ ret = -1;
+ }
+ else {
+ if (!TerminateProcess(hProc, 0)) {
+ errno = EPERM;
+ ret = -1;
+ }
+ CloseHandle(hProc);
+ }
+ });
+ break;
default:
- errno = EINVAL;
- ret = -1;
- break;
+ errno = EINVAL;
+ ret = -1;
+ break;
}
return ret;
}
@@ -3899,31 +4041,31 @@
{
static BOOL (WINAPI *pCreateHardLinkW)(LPCWSTR, LPCWSTR, LPSECURITY_ATTRIBUTES) = NULL;
static int myerrno = 0;
if (!pCreateHardLinkW && !myerrno) {
- HANDLE hKernel;
+ HANDLE hKernel;
- hKernel = GetModuleHandle("kernel32.dll");
- if (hKernel) {
- pCreateHardLinkW = (BOOL (WINAPI *)(LPCWSTR, LPCWSTR, LPSECURITY_ATTRIBUTES))GetProcAddress(hKernel, "CreateHardLinkW");
- if (!pCreateHardLinkW) {
- myerrno = ENOSYS;
- }
- }
- else {
- myerrno = map_errno(GetLastError());
- }
+ hKernel = GetModuleHandle("kernel32.dll");
+ if (hKernel) {
+ pCreateHardLinkW = (BOOL (WINAPI *)(LPCWSTR, LPCWSTR, LPSECURITY_ATTRIBUTES))GetProcAddress(hKernel, "CreateHardLinkW");
+ if (!pCreateHardLinkW) {
+ myerrno = ENOSYS;
+ }
}
+ else {
+ myerrno = map_errno(GetLastError());
+ }
+ }
if (!pCreateHardLinkW) {
- errno = myerrno;
- return -1;
+ errno = myerrno;
+ return -1;
}
if (!pCreateHardLinkW(to, from, NULL)) {
- errno = map_errno(GetLastError());
- return -1;
+ errno = map_errno(GetLastError());
+ return -1;
}
return 0;
}
@@ -3933,14 +4075,14 @@
WCHAR *wfrom;
WCHAR *wto;
int ret;
if (!(wfrom = utf8_to_wstr(from, NULL)))
- return -1;
+ return -1;
if (!(wto = utf8_to_wstr(to, NULL))) {
- free(wfrom);
- return -1;
+ free(wfrom);
+ return -1;
}
ret = wlink(wfrom, wto);
free(wto);
free(wfrom);
return ret;
@@ -3952,14 +4094,14 @@
WCHAR *wfrom;
WCHAR *wto;
int ret;
if (!(wfrom = filecp_to_wstr(from, NULL)))
- return -1;
+ return -1;
if (!(wto = filecp_to_wstr(to, NULL))) {
- free(wfrom);
- return -1;
+ free(wfrom);
+ return -1;
}
ret = wlink(wfrom, wto);
free(wto);
free(wfrom);
return ret;
@@ -3979,17 +4121,17 @@
if (len == 0) return NULL;
if (envarea) FreeEnvironmentStrings(envarea);
envarea = GetEnvironmentStrings();
if (!envarea) {
- map_errno(GetLastError());
- return NULL;
+ map_errno(GetLastError());
+ return NULL;
}
for (env = envarea; *env; env += strlen(env) + 1)
- if (strncasecmp(env, name, len) == 0 && *(env + len) == '=')
- return env + len + 1;
+ if (strncasecmp(env, name, len) == 0 && *(env + len) == '=')
+ return env + len + 1;
return NULL;
}
static int
@@ -4001,77 +4143,77 @@
oldatts = GetFileAttributesW(oldpath);
newatts = GetFileAttributesW(newpath);
if (oldatts == -1) {
- errno = map_errno(GetLastError());
- return -1;
+ errno = map_errno(GetLastError());
+ return -1;
}
#ifndef _WIN32_WCE
RUBY_CRITICAL({
- if (newatts != -1 && newatts & FILE_ATTRIBUTE_READONLY)
- SetFileAttributesW(newpath, newatts & ~ FILE_ATTRIBUTE_READONLY);
+ if (newatts != -1 && newatts & FILE_ATTRIBUTE_READONLY)
+ SetFileAttributesW(newpath, newatts & ~ FILE_ATTRIBUTE_READONLY);
- if (!MoveFileW(oldpath, newpath))
- res = -1;
+ if (!MoveFileW(oldpath, newpath))
+ res = -1;
- if (res) {
- switch (GetLastError()) {
- case ERROR_ALREADY_EXISTS:
- case ERROR_FILE_EXISTS:
- if (IsWinNT()) {
- if (MoveFileExW(oldpath, newpath, MOVEFILE_REPLACE_EXISTING))
- res = 0;
- } else
+ if (res) {
+ switch (GetLastError()) {
+ case ERROR_ALREADY_EXISTS:
+ case ERROR_FILE_EXISTS:
+ if (IsWinNT()) {
+ if (MoveFileExW(oldpath, newpath, MOVEFILE_REPLACE_EXISTING))
+ res = 0;
+ } else
{
- for (;;) {
- if (!DeleteFileW(newpath) && GetLastError() != ERROR_FILE_NOT_FOUND)
- break;
- else if (MoveFileW(oldpath, newpath)) {
- res = 0;
- break;
- }
- }
- }
- }
- }
+ for (;;) {
+ if (!DeleteFileW(newpath) && GetLastError() != ERROR_FILE_NOT_FOUND)
+ break;
+ else if (MoveFileW(oldpath, newpath)) {
+ res = 0;
+ break;
+ }
+ }
+ }
+ }
+ }
- if (res)
- errno = map_errno(GetLastError());
- else
- SetFileAttributesW(newpath, oldatts);
+ if (res)
+ errno = map_errno(GetLastError());
+ else
+ SetFileAttributesW(newpath, oldatts);
});
#else
RUBY_CRITICAL({
- if (newatts != -1 && newatts & FILE_ATTRIBUTE_READONLY)
- SetFileAttributesW(newpath, newatts & ~ FILE_ATTRIBUTE_READONLY);
+ if (newatts != -1 && newatts & FILE_ATTRIBUTE_READONLY)
+ SetFileAttributesW(newpath, newatts & ~ FILE_ATTRIBUTE_READONLY);
- if (!MoveFileW(oldpath, newpath))
- res = -1;
+ if (!MoveFileW(oldpath, newpath))
+ res = -1;
- if (res) {
- switch (GetLastError()) {
- case ERROR_ALREADY_EXISTS:
- case ERROR_FILE_EXISTS:
+ if (res) {
+ switch (GetLastError()) {
+ case ERROR_ALREADY_EXISTS:
+ case ERROR_FILE_EXISTS:
{
- for (;;) {
- if (!DeleteFileW(newpath) && GetLastError() != ERROR_FILE_NOT_FOUND)
- break;
- else if (MoveFileW(oldpath, newpath)) {
- res = 0;
- break;
- }
- }
- }
- }
- }
+ for (;;) {
+ if (!DeleteFileW(newpath) && GetLastError() != ERROR_FILE_NOT_FOUND)
+ break;
+ else if (MoveFileW(oldpath, newpath)) {
+ res = 0;
+ break;
+ }
+ }
+ }
+ }
+ }
- if (res)
- errno = map_errno(GetLastError());
- else
- SetFileAttributesW(newpath, oldatts);
+ if (res)
+ errno = map_errno(GetLastError());
+ else
+ SetFileAttributesW(newpath, oldatts);
});
#endif
return res;
}
@@ -4081,14 +4223,14 @@
WCHAR *wfrom;
WCHAR *wto;
int ret = -1;
if (!(wfrom = utf8_to_wstr(from, NULL)))
- return -1;
+ return -1;
if (!(wto = utf8_to_wstr(to, NULL))) {
- free(wfrom);
- return -1;
+ free(wfrom);
+ return -1;
}
ret = wrename(wfrom, wto);
free(wto);
free(wfrom);
return ret;
@@ -4099,14 +4241,14 @@
WCHAR *wfrom;
WCHAR *wto;
int ret = -1;
if (!(wfrom = filecp_to_wstr(from, NULL)))
- return -1;
+ return -1;
if (!(wto = filecp_to_wstr(to, NULL))) {
- free(wfrom);
- return -1;
+ free(wfrom);
+ return -1;
}
ret = wrename(wfrom, wto);
free(wto);
free(wfrom);
return ret;
@@ -4114,39 +4256,39 @@
static int
isUNCRoot(const WCHAR *path)
{
if (path[0] == L'\\' && path[1] == L'\\') {
- const WCHAR *p;
- for (p = path + 2; *p; p++) {
- if (*p == L'\\')
- break;
- }
- if (p[0] && p[1]) {
- for (p++; *p; p++) {
- if (*p == L'\\')
- break;
- }
- if (!p[0] || !p[1] || (p[1] == L'.' && !p[2]))
- return 1;
- }
+ const WCHAR *p;
+ for (p = path + 2; *p; p++) {
+ if (*p == L'\\')
+ break;
}
+ if (p[0] && p[1]) {
+ for (p++; *p; p++) {
+ if (*p == L'\\')
+ break;
+ }
+ if (!p[0] || !p[1] || (p[1] == L'.' && !p[2]))
+ return 1;
+ }
+ }
return 0;
}
#define COPY_STAT(src, dest, size_cast) do { \
- (dest).st_dev = (src).st_dev; \
- (dest).st_ino = (src).st_ino; \
- (dest).st_mode = (src).st_mode; \
- (dest).st_nlink = (src).st_nlink; \
- (dest).st_uid = (src).st_uid; \
- (dest).st_gid = (src).st_gid; \
- (dest).st_rdev = (src).st_rdev; \
- (dest).st_size = size_cast(src).st_size; \
- (dest).st_atime = (src).st_atime; \
- (dest).st_mtime = (src).st_mtime; \
- (dest).st_ctime = (src).st_ctime; \
+ (dest).st_dev = (src).st_dev; \
+ (dest).st_ino = (src).st_ino; \
+ (dest).st_mode = (src).st_mode; \
+ (dest).st_nlink = (src).st_nlink; \
+ (dest).st_uid = (src).st_uid; \
+ (dest).st_gid = (src).st_gid; \
+ (dest).st_rdev = (src).st_rdev; \
+ (dest).st_size = size_cast(src).st_size; \
+ (dest).st_atime = (src).st_atime; \
+ (dest).st_mtime = (src).st_mtime; \
+ (dest).st_ctime = (src).st_ctime; \
} while (0)
#if defined __BORLANDC__ || defined _WIN32_WCE
#undef fstat
int
@@ -4156,12 +4298,12 @@
int ret = fstat(fd, st);
if (ret) return ret;
st->st_mode &= ~(S_IWGRP | S_IWOTH);
if (GetFileInformationByHandle((HANDLE)_get_osfhandle(fd), &info) &&
- !(info.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) {
- st->st_mode |= S_IWUSR;
+ !(info.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) {
+ st->st_mode |= S_IWUSR;
}
return ret;
}
int
@@ -4173,64 +4315,64 @@
if (ret) return ret;
tmp.st_mode &= ~(S_IWGRP | S_IWOTH);
COPY_STAT(tmp, *st, +);
if (GetFileInformationByHandle((HANDLE)_get_osfhandle(fd), &info)) {
- if (!(info.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) {
- st->st_mode |= S_IWUSR;
- }
- st->st_size = ((__int64)info.nFileSizeHigh << 32) | info.nFileSizeLow;
+ if (!(info.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) {
+ st->st_mode |= S_IWUSR;
}
+ st->st_size = ((__int64)info.nFileSizeHigh << 32) | info.nFileSizeLow;
+ }
return ret;
}
#endif
static time_t
filetime_to_unixtime(const FILETIME *ft)
{
struct timeval tv;
if (filetime_to_timeval(ft, &tv) == (time_t)-1)
- return 0;
+ return 0;
else
- return tv.tv_sec;
+ return tv.tv_sec;
}
static unsigned
fileattr_to_unixmode(DWORD attr, const WCHAR *path)
{
unsigned mode = 0;
if (attr & FILE_ATTRIBUTE_READONLY) {
- mode |= S_IREAD;
+ mode |= S_IREAD;
}
else {
- mode |= S_IREAD | S_IWRITE | S_IWUSR;
+ mode |= S_IREAD | S_IWRITE | S_IWUSR;
}
if (attr & FILE_ATTRIBUTE_DIRECTORY) {
- mode |= S_IFDIR | S_IEXEC;
+ mode |= S_IFDIR | S_IEXEC;
}
else {
- mode |= S_IFREG;
+ mode |= S_IFREG;
}
if (path && (mode & S_IFREG)) {
- const WCHAR *end = path + lstrlenW(path);
- while (path < end) {
- end = CharPrevW(path, end);
- if (*end == L'.') {
- if ((_wcsicmp(end, L".bat") == 0) ||
- (_wcsicmp(end, L".cmd") == 0) ||
- (_wcsicmp(end, L".com") == 0) ||
- (_wcsicmp(end, L".exe") == 0)) {
- mode |= S_IEXEC;
- }
- break;
- }
- }
+ const WCHAR *end = path + lstrlenW(path);
+ while (path < end) {
+ end = CharPrevW(path, end);
+ if (*end == L'.') {
+ if ((_wcsicmp(end, L".bat") == 0) ||
+ (_wcsicmp(end, L".cmd") == 0) ||
+ (_wcsicmp(end, L".com") == 0) ||
+ (_wcsicmp(end, L".exe") == 0)) {
+ mode |= S_IEXEC;
+ }
+ break;
+ }
}
+ }
mode |= (mode & 0700) >> 3;
mode |= (mode & 0700) >> 6;
return mode;
@@ -4240,11 +4382,11 @@
check_valid_dir(const WCHAR *path)
{
WIN32_FIND_DATAW fd = {0};
HANDLE fh = open_dir_handle(path, &fd);
if (fh == INVALID_HANDLE_VALUE)
- return -1;
+ return -1;
FindClose(fh);
return 0;
}
static int
@@ -4255,38 +4397,38 @@
memset(st, 0, sizeof(*st));
st->st_nlink = 1;
if (wcspbrk(path, L"?*")) {
- errno = ENOENT;
- return -1;
+ errno = ENOENT;
+ return -1;
}
h = FindFirstFileW(path, &wfd);
if (h != INVALID_HANDLE_VALUE) {
- FindClose(h);
- st->st_mode = fileattr_to_unixmode(wfd.dwFileAttributes, path);
- st->st_atime = filetime_to_unixtime(&wfd.ftLastAccessTime);
- st->st_mtime = filetime_to_unixtime(&wfd.ftLastWriteTime);
- st->st_ctime = filetime_to_unixtime(&wfd.ftCreationTime);
- st->st_size = ((__int64)wfd.nFileSizeHigh << 32) | wfd.nFileSizeLow;
+ FindClose(h);
+ st->st_mode = fileattr_to_unixmode(wfd.dwFileAttributes, path);
+ st->st_atime = filetime_to_unixtime(&wfd.ftLastAccessTime);
+ st->st_mtime = filetime_to_unixtime(&wfd.ftLastWriteTime);
+ st->st_ctime = filetime_to_unixtime(&wfd.ftCreationTime);
+ st->st_size = ((__int64)wfd.nFileSizeHigh << 32) | wfd.nFileSizeLow;
}
else {
- // If runtime stat(2) is called for network shares, it fails on WinNT.
- // Because GetDriveType returns 1 for network shares. (Win98 returns 4)
- DWORD attr = GetFileAttributesW(path);
- if (attr == (DWORD)-1L) {
- errno = map_errno(GetLastError());
- return -1;
- }
- if (attr & FILE_ATTRIBUTE_DIRECTORY) {
- if (check_valid_dir(path)) return -1;
- }
- st->st_mode = fileattr_to_unixmode(attr, path);
+ // If runtime stat(2) is called for network shares, it fails on WinNT.
+ // Because GetDriveType returns 1 for network shares. (Win98 returns 4)
+ DWORD attr = GetFileAttributesW(path);
+ if (attr == (DWORD)-1L) {
+ errno = map_errno(GetLastError());
+ return -1;
}
+ if (attr & FILE_ATTRIBUTE_DIRECTORY) {
+ if (check_valid_dir(path)) return -1;
+ }
+ st->st_mode = fileattr_to_unixmode(attr, path);
+ }
st->st_dev = st->st_rdev = (iswalpha(path[0]) && path[1] == L':') ?
- towupper(path[0]) - L'A' : _getdrive() - 1;
+ towupper(path[0]) - L'A' : _getdrive() - 1;
return 0;
}
#ifdef WIN95
@@ -4294,11 +4436,11 @@
win95_stat(const WCHAR *path, struct stati64 *st)
{
int ret = _wstati64(path, st);
if (ret) return ret;
if (st->st_mode & S_IFDIR) {
- return check_valid_dir(path);
+ return check_valid_dir(path);
}
return 0;
}
#else
#define win95_stat(path, st) -1
@@ -4321,41 +4463,41 @@
WCHAR *buf1, *s, *end;
int len, size;
int ret;
if (!path || !st) {
- errno = EFAULT;
- return -1;
+ errno = EFAULT;
+ return -1;
}
size = lstrlenW(path) + 2;
buf1 = ALLOCA_N(WCHAR, size);
for (p = path, s = buf1; *p; p++, s++) {
- if (*p == L'/')
- *s = L'\\';
- else
- *s = *p;
+ if (*p == L'/')
+ *s = L'\\';
+ else
+ *s = *p;
}
*s = '\0';
len = s - buf1;
if (!len || L'\"' == *(--s)) {
- errno = ENOENT;
- return -1;
+ errno = ENOENT;
+ return -1;
}
end = buf1 + len - 1;
if (isUNCRoot(buf1)) {
- if (*end == L'.')
- *end = L'\0';
- else if (*end != L'\\')
- lstrcatW(buf1, L"\\");
+ if (*end == L'.')
+ *end = L'\0';
+ else if (*end != L'\\')
+ lstrcatW(buf1, L"\\");
}
else if (*end == L'\\' || (buf1 + 1 == end && *end == L':'))
- lstrcatW(buf1, L".");
+ lstrcatW(buf1, L".");
ret = IsWinNT() ? winnt_stat(buf1, st) : win95_stat(buf1, st);
if (ret == 0) {
- st->st_mode &= ~(S_IWGRP | S_IWOTH);
+ st->st_mode &= ~(S_IWGRP | S_IWOTH);
}
return ret;
}
int
@@ -4363,11 +4505,11 @@
{
WCHAR *wpath;
int ret;
if (!(wpath = utf8_to_wstr(path, NULL)))
- return -1;
+ return -1;
ret = wstati64(wpath, st);
free(wpath);
return ret;
}
@@ -4376,40 +4518,40 @@
{
WCHAR *wpath;
int ret;
if (!(wpath = filecp_to_wstr(path, NULL)))
- return -1;
+ return -1;
ret = wstati64(wpath, st);
free(wpath);
return ret;
}
int
rb_w32_access(const char *path, int mode)
{
struct stati64 stat;
if (rb_w32_stati64(path, &stat) != 0)
- return -1;
+ return -1;
mode <<= 6;
if ((stat.st_mode & mode) != mode) {
- errno = EACCES;
- return -1;
+ errno = EACCES;
+ return -1;
}
return 0;
}
int
rb_w32_uaccess(const char *path, int mode)
{
struct stati64 stat;
if (rb_w32_ustati64(path, &stat) != 0)
- return -1;
+ return -1;
mode <<= 6;
if ((stat.st_mode & mode) != mode) {
- errno = EACCES;
- return -1;
+ errno = EACCES;
+ return -1;
}
return 0;
}
static int
@@ -4419,27 +4561,27 @@
off_t end;
int ret = -1;
DWORD e;
if (((lpos = SetFilePointer(h, 0, (upos = 0, &upos), SEEK_CUR)) == -1L &&
- (e = GetLastError())) ||
- ((lend = GetFileSize(h, (DWORD *)&uend)) == -1L && (e = GetLastError()))) {
- errno = map_errno(e);
- return -1;
+ (e = GetLastError())) ||
+ ((lend = GetFileSize(h, (DWORD *)&uend)) == -1L && (e = GetLastError()))) {
+ errno = map_errno(e);
+ return -1;
}
end = ((off_t)uend << 32) | (unsigned long)lend;
usize = (long)(size >> 32);
lsize = (long)size;
if (SetFilePointer(h, lsize, &usize, SEEK_SET) == (DWORD)-1L &&
- (e = GetLastError())) {
- errno = map_errno(e);
+ (e = GetLastError())) {
+ errno = map_errno(e);
}
else if (!SetEndOfFile(h)) {
- errno = map_errno(GetLastError());
+ errno = map_errno(GetLastError());
}
else {
- ret = 0;
+ ret = 0;
}
SetFilePointer(h, lpos, &upos, SEEK_SET);
return ret;
}
@@ -4448,23 +4590,23 @@
{
HANDLE h;
int ret;
#ifdef WIN95
if (IsWin95()) {
- int fd = open(path, O_WRONLY), e = 0;
- if (fd == -1) return -1;
- ret = chsize(fd, (unsigned long)length);
- if (ret == -1) e = errno;
- close(fd);
- if (ret == -1) errno = e;
- return ret;
+ int fd = open(path, O_WRONLY), e = 0;
+ if (fd == -1) return -1;
+ ret = chsize(fd, (unsigned long)length);
+ if (ret == -1) e = errno;
+ close(fd);
+ if (ret == -1) errno = e;
+ return ret;
}
#endif
h = CreateFile(path, GENERIC_WRITE, 0, 0, OPEN_EXISTING, 0, 0);
if (h == INVALID_HANDLE_VALUE) {
- errno = map_errno(GetLastError());
- return -1;
+ errno = map_errno(GetLastError());
+ return -1;
}
ret = rb_chsize(h, length);
CloseHandle(h);
return ret;
}
@@ -4474,11 +4616,11 @@
{
HANDLE h;
#ifdef WIN95
if (IsWin95()) {
- return chsize(fd, (unsigned long)length);
+ return chsize(fd, (unsigned long)length);
}
#endif
h = (HANDLE)_get_osfhandle(fd);
if (h == (HANDLE)-1) return -1;
return rb_chsize(h, length);
@@ -4491,12 +4633,12 @@
DWORD u, l;
int e;
l = GetFileSize((HANDLE)_get_osfhandle(fd), &u);
if (l == (DWORD)-1L && (e = GetLastError())) {
- errno = map_errno(e);
- return (off_t)-1;
+ errno = map_errno(e);
+ return (off_t)-1;
}
return ((off_t)u << 32) | l;
}
#if !defined(APP_BUILD_CAPABILITY_WINXPE)
@@ -4506,18 +4648,18 @@
long u, l;
int e;
HANDLE h = (HANDLE)_get_osfhandle(fd);
if (!h) {
- errno = EBADF;
- return -1;
+ errno = EBADF;
+ return -1;
}
u = (long)(offset >> 32);
if ((l = SetFilePointer(h, (long)offset, &u, whence)) == -1L &&
- (e = GetLastError())) {
- errno = map_errno(e);
- return -1;
+ (e = GetLastError())) {
+ errno = map_errno(e);
+ return -1;
}
return ((off_t)u << 32) | l;
}
#endif //APP_BUILD_CAPABILITY_WINXPE
#endif
@@ -4526,22 +4668,22 @@
fseeko(FILE *stream, off_t offset, int whence)
{
off_t pos;
switch (whence) {
case SEEK_CUR:
- if (fgetpos(stream, (fpos_t *)&pos))
- return -1;
- pos += offset;
- break;
+ if (fgetpos(stream, (fpos_t *)&pos))
+ return -1;
+ pos += offset;
+ break;
case SEEK_END:
- if ((pos = _filelengthi64(fileno(stream))) == (off_t)-1)
- return -1;
- pos += offset;
- break;
+ if ((pos = _filelengthi64(fileno(stream))) == (off_t)-1)
+ return -1;
+ pos += offset;
+ break;
default:
- pos = offset;
- break;
+ pos = offset;
+ break;
}
return fsetpos(stream, (fpos_t *)&pos);
}
off_t
@@ -4566,20 +4708,20 @@
rb_w32_times(struct tms *tmbuf)
{
FILETIME create, exit, kernel, user;
if (GetProcessTimes(GetCurrentProcess(),&create, &exit, &kernel, &user)) {
- tmbuf->tms_utime = filetime_to_clock(&user);
- tmbuf->tms_stime = filetime_to_clock(&kernel);
- tmbuf->tms_cutime = 0;
- tmbuf->tms_cstime = 0;
+ tmbuf->tms_utime = filetime_to_clock(&user);
+ tmbuf->tms_stime = filetime_to_clock(&kernel);
+ tmbuf->tms_cutime = 0;
+ tmbuf->tms_cstime = 0;
}
else {
- tmbuf->tms_utime = clock();
- tmbuf->tms_stime = 0;
- tmbuf->tms_cutime = 0;
- tmbuf->tms_cstime = 0;
+ tmbuf->tms_utime = clock();
+ tmbuf->tms_stime = 0;
+ tmbuf->tms_cutime = 0;
+ tmbuf->tms_cstime = 0;
}
return 0;
}
#define yield_once() Sleep(0)
@@ -4597,12 +4739,12 @@
int
read(int fd, void *buf, size_t size)
{
int ret = _read(fd, buf, size);
if ((ret < 0) && (errno == EPIPE)) {
- errno = 0;
- ret = 0;
+ errno = 0;
+ ret = 0;
}
catch_interrupt();
return ret;
}
#endif
@@ -4610,41 +4752,54 @@
#undef fgetc
int
rb_w32_getc(FILE* stream)
{
int c;
+
#ifndef _WIN32_WCE
+#ifdef CPP_ELEVEN
+ if (enough_to_get(GET_STREAM_PTR(stream)->FILE_COUNT)) {
+ c = (unsigned char)*GET_STREAM_PTR(stream)->FILE_READPTR++;
+#else
if (enough_to_get(stream->FILE_COUNT)) {
- c = (unsigned char)*stream->FILE_READPTR++;
+ c = (unsigned char)*stream->FILE_READPTR++;
+
+#endif
+
}
- else
+ else
#endif
{
- c = _filbuf(stream);
+ c = _filbuf(stream);
#if defined __BORLANDC__ || defined _WIN32_WCE
if ((c == EOF) && (errno == EPIPE)) {
- clearerr(stream);
+ clearerr(stream);
}
#endif
- catch_interrupt();
+ catch_interrupt();
}
return c;
}
#undef fputc
int
rb_w32_putc(int c, FILE* stream)
{
#ifndef _WIN32_WCE
+#ifdef CPP_ELEVEN
+ if (enough_to_put(GET_STREAM_PTR(stream)->FILE_COUNT)) {
+ c = (unsigned char)(*GET_STREAM_PTR(stream)->FILE_READPTR++ = (char)c);
+#else
if (enough_to_put(stream->FILE_COUNT)) {
- c = (unsigned char)(*stream->FILE_READPTR++ = (char)c);
+ c = (unsigned char)(*stream->FILE_READPTR++ = (char)c);
+#endif
}
- else
+ else
#endif
{
- c = _flsbuf(c, stream);
- catch_interrupt();
+ c = _flsbuf(c, stream);
+ catch_interrupt();
}
return c;
}
struct asynchronous_arg_t {
@@ -4670,72 +4825,71 @@
return ret;
}
uintptr_t
rb_w32_asynchronize(asynchronous_func_t func, uintptr_t self,
- int argc, uintptr_t* argv, uintptr_t intrval)
+ int argc, uintptr_t* argv, uintptr_t intrval)
{
DWORD val;
BOOL interrupted = FALSE;
HANDLE thr;
RUBY_CRITICAL({
- struct asynchronous_arg_t arg;
+ struct asynchronous_arg_t arg;
- arg.stackaddr = NULL;
- arg.errnum = 0;
- arg.func = func;
- arg.self = self;
- arg.argc = argc;
- arg.argv = argv;
+ arg.stackaddr = NULL;
+ arg.errnum = 0;
+ arg.func = func;
+ arg.self = self;
+ arg.argc = argc;
+ arg.argv = argv;
- thr = CreateThread(NULL, 0, call_asynchronous, &arg, 0, &val);
+ thr = CreateThread(NULL, 0, call_asynchronous, &arg, 0, &val);
- if (thr) {
- yield_until(arg.stackaddr);
+ if (thr) {
+ yield_until(arg.stackaddr);
- if (rb_w32_wait_events_blocking(&thr, 1, INFINITE) != WAIT_OBJECT_0) {
- interrupted = TRUE;
+ if (rb_w32_wait_events_blocking(&thr, 1, INFINITE) != WAIT_OBJECT_0) {
+ interrupted = TRUE;
- if (TerminateThread(thr, intrval)) {
- yield_once();
- }
- }
+ if (TerminateThread(thr, intrval)) {
+ yield_once();
+ }
+ }
- GetExitCodeThread(thr, &val);
- CloseHandle(thr);
+ GetExitCodeThread(thr, &val);
+ CloseHandle(thr);
- if (interrupted) {
- /* must release stack of killed thread, why doesn't Windows? */
- MEMORY_BASIC_INFORMATION m;
+ if (interrupted) {
+ /* must release stack of killed thread, why doesn't Windows? */
+ MEMORY_BASIC_INFORMATION m;
- memset(&m, 0, sizeof(m));
- if (!VirtualQuery(arg.stackaddr, &m, sizeof(m))) {
- Debug(fprintf(stderr, "couldn't get stack base:%p:%d\n",
- arg.stackaddr, GetLastError()));
- }
- else if (!VirtualFree(m.AllocationBase, 0, MEM_RELEASE)) {
- Debug(fprintf(stderr, "couldn't release stack:%p:%d\n",
- m.AllocationBase, GetLastError()));
- }
- errno = EINTR;
- }
- else {
- errno = arg.errnum;
- }
- }
+ memset(&m, 0, sizeof(m));
+ if (!VirtualQuery(arg.stackaddr, &m, sizeof(m))) {
+ Debug(fprintf(stderr, "couldn't get stack base:%p:%d\n",
+ arg.stackaddr, GetLastError()));
+ }
+ else if (!VirtualFree(m.AllocationBase, 0, MEM_RELEASE)) {
+ Debug(fprintf(stderr, "couldn't release stack:%p:%d\n",
+ m.AllocationBase, GetLastError()));
+ }
+ errno = EINTR;
+ }
+ else {
+ errno = arg.errnum;
+ }
+ }
});
if (!thr) {
- rb_fatal("failed to launch waiter thread:%ld", GetLastError());
+ rb_fatal("failed to launch waiter thread:%ld", GetLastError());
}
return val;
}
-char **
-rb_w32_get_environ(void)
+char ** rb_w32_get_environ(void)
{
char *envtop, *env;
char **myenvtop, **myenv;
int num;
@@ -4748,39 +4902,37 @@
* values.
* (U.N. 2001-11-15)
*/
envtop = GetEnvironmentStrings();
for (env = envtop, num = 0; *env; env += strlen(env) + 1)
- if (*env != '=') num++;
+ if (*env != '=') num++;
myenvtop = (char **)malloc(sizeof(char *) * (num + 1));
for (env = envtop, myenv = myenvtop; *env; env += strlen(env) + 1) {
- if (*env != '=') {
- if (!(*myenv = strdup(env))) {
- break;
- }
- myenv++;
- }
+ if (*env != '=') {
+ if (!(*myenv = strdup(env))) {
+ break;
+ }
+ myenv++;
}
+ }
*myenv = NULL;
FreeEnvironmentStrings(envtop);
return myenvtop;
}
-void
-rb_w32_free_environ(char **env)
+void rb_w32_free_environ(char **env)
{
char **t = env;
while (*t) free(*t++);
free(env);
}
#ifndef _WIN32_WCE
-rb_pid_t
-rb_w32_getpid(void)
+rb_pid_t rb_w32_getpid(void)
{
rb_pid_t pid;
pid = GetCurrentProcessId();
@@ -4788,45 +4940,43 @@
return pid;
}
-rb_pid_t
-rb_w32_getppid(void)
+rb_pid_t rb_w32_getppid(void)
{
static long (WINAPI *pNtQueryInformationProcess)(HANDLE, int, void *, ULONG, ULONG *) = NULL;
rb_pid_t ppid = 0;
if (!IsWin95() && rb_w32_osver() >= 5) {
- if (!pNtQueryInformationProcess) {
- HANDLE hNtDll = GetModuleHandle("ntdll.dll");
- if (hNtDll) {
- pNtQueryInformationProcess = (long (WINAPI *)(HANDLE, int, void *, ULONG, ULONG *))GetProcAddress(hNtDll, "NtQueryInformationProcess");
- }
- }
- if (pNtQueryInformationProcess) {
- struct {
- long ExitStatus;
- void* PebBaseAddress;
- ULONG AffinityMask;
- ULONG BasePriority;
- ULONG UniqueProcessId;
- ULONG ParentProcessId;
- } pbi;
- ULONG len;
- long ret = pNtQueryInformationProcess(GetCurrentProcess(), 0, &pbi, sizeof(pbi), &len);
- if (!ret) {
- ppid = pbi.ParentProcessId;
- }
- }
+ if (!pNtQueryInformationProcess) {
+ HANDLE hNtDll = GetModuleHandle("ntdll.dll");
+ if (hNtDll) {
+ pNtQueryInformationProcess = (long (WINAPI *)(HANDLE, int, void *, ULONG, ULONG *))GetProcAddress(hNtDll, "NtQueryInformationProcess");
+ }
}
+ if (pNtQueryInformationProcess) {
+ struct {
+ long ExitStatus;
+ void* PebBaseAddress;
+ ULONG AffinityMask;
+ ULONG BasePriority;
+ ULONG UniqueProcessId;
+ ULONG ParentProcessId;
+ } pbi;
+ ULONG len;
+ long ret = pNtQueryInformationProcess(GetCurrentProcess(), 0, &pbi, sizeof(pbi), &len);
+ if (!ret) {
+ ppid = pbi.ParentProcessId;
+ }
+ }
+ }
return ppid;
}
#endif
-int
-rb_w32_uopen(const char *file, int oflag, ...)
+int rb_w32_uopen(const char *file, int oflag, ...)
{
WCHAR *wfile;
int ret;
int pmode;
@@ -4834,18 +4984,17 @@
va_start(arg, oflag);
pmode = va_arg(arg, int);
va_end(arg);
if (!(wfile = utf8_to_wstr(file, NULL)))
- return -1;
+ return -1;
ret = rb_w32_wopen(wfile, oflag, pmode);
- free(wfile);
+ free(wfile);
return ret;
}
#ifndef _WIN32_WCE
-int
-rb_w32_open(const char *file, int oflag, ...)
+int rb_w32_open(const char *file, int oflag, ...)
{
WCHAR *wfile;
int ret;
int pmode;
@@ -4853,181 +5002,180 @@
va_start(arg, oflag);
pmode = va_arg(arg, int);
va_end(arg);
if ((oflag & O_TEXT) || !(oflag & O_BINARY))
- return _open(file, oflag, pmode);
+ return _open(file, oflag, pmode);
if (!(wfile = filecp_to_wstr(file, NULL)))
- return -1;
+ return -1;
ret = rb_w32_wopen(wfile, oflag, pmode);
free(wfile);
return ret;
}
-int
-rb_w32_wopen(const WCHAR *file, int oflag, ...)
+int rb_w32_wopen(const WCHAR *file, int oflag, ...)
{
char flags = 0;
int fd;
DWORD access;
DWORD create;
DWORD attr = FILE_ATTRIBUTE_NORMAL;
SECURITY_ATTRIBUTES sec;
HANDLE h;
if ((oflag & O_TEXT) || !(oflag & O_BINARY)) {
- va_list arg;
- int pmode;
- va_start(arg, oflag);
- pmode = va_arg(arg, int);
- va_end(arg);
- return _wopen(file, oflag, pmode);
+ va_list arg;
+ int pmode;
+ va_start(arg, oflag);
+ pmode = va_arg(arg, int);
+ va_end(arg);
+ return _wopen(file, oflag, pmode);
}
sec.nLength = sizeof(sec);
sec.lpSecurityDescriptor = NULL;
if (oflag & O_NOINHERIT) {
- sec.bInheritHandle = FALSE;
- flags |= FNOINHERIT;
+ sec.bInheritHandle = FALSE;
+ flags |= FNOINHERIT;
}
else {
- sec.bInheritHandle = TRUE;
+ sec.bInheritHandle = TRUE;
}
oflag &= ~O_NOINHERIT;
/* always open with binary mode */
oflag &= ~(O_BINARY | O_TEXT);
switch (oflag & (O_RDWR | O_RDONLY | O_WRONLY)) {
case O_RDWR:
- access = GENERIC_READ | GENERIC_WRITE;
- break;
+ access = GENERIC_READ | GENERIC_WRITE;
+ break;
case O_RDONLY:
- access = GENERIC_READ;
- break;
+ access = GENERIC_READ;
+ break;
case O_WRONLY:
- access = GENERIC_WRITE;
- break;
+ access = GENERIC_WRITE;
+ break;
default:
- errno = EINVAL;
- return -1;
+ errno = EINVAL;
+ return -1;
}
oflag &= ~(O_RDWR | O_RDONLY | O_WRONLY);
switch (oflag & (O_CREAT | O_EXCL | O_TRUNC)) {
case O_CREAT:
- create = OPEN_ALWAYS;
- break;
+ create = OPEN_ALWAYS;
+ break;
case 0:
case O_EXCL:
- create = OPEN_EXISTING;
- break;
+ create = OPEN_EXISTING;
+ break;
case O_CREAT | O_EXCL:
case O_CREAT | O_EXCL | O_TRUNC:
- create = CREATE_NEW;
- break;
+ create = CREATE_NEW;
+ break;
case O_TRUNC:
case O_TRUNC | O_EXCL:
- create = TRUNCATE_EXISTING;
- break;
+ create = TRUNCATE_EXISTING;
+ break;
case O_CREAT | O_TRUNC:
- create = CREATE_ALWAYS;
- break;
+ create = CREATE_ALWAYS;
+ break;
default:
- errno = EINVAL;
- return -1;
+ errno = EINVAL;
+ return -1;
}
if (oflag & O_CREAT) {
- va_list arg;
- int pmode;
- va_start(arg, oflag);
- pmode = va_arg(arg, int);
- va_end(arg);
- /* TODO: we need to check umask here, but it's not exported... */
- if (!(pmode & S_IWRITE))
- attr = FILE_ATTRIBUTE_READONLY;
+ va_list arg;
+ int pmode;
+ va_start(arg, oflag);
+ pmode = va_arg(arg, int);
+ va_end(arg);
+ /* TODO: we need to check umask here, but it's not exported... */
+ if (!(pmode & S_IWRITE))
+ attr = FILE_ATTRIBUTE_READONLY;
}
oflag &= ~(O_CREAT | O_EXCL | O_TRUNC);
if (oflag & O_TEMPORARY) {
- attr |= FILE_FLAG_DELETE_ON_CLOSE;
- access |= DELETE;
+ attr |= FILE_FLAG_DELETE_ON_CLOSE;
+ access |= DELETE;
}
oflag &= ~O_TEMPORARY;
if (oflag & _O_SHORT_LIVED)
- attr |= FILE_ATTRIBUTE_TEMPORARY;
+ attr |= FILE_ATTRIBUTE_TEMPORARY;
oflag &= ~_O_SHORT_LIVED;
switch (oflag & (O_SEQUENTIAL | O_RANDOM)) {
case 0:
- break;
+ break;
case O_SEQUENTIAL:
- attr |= FILE_FLAG_SEQUENTIAL_SCAN;
- break;
+ attr |= FILE_FLAG_SEQUENTIAL_SCAN;
+ break;
case O_RANDOM:
- attr |= FILE_FLAG_RANDOM_ACCESS;
- break;
+ attr |= FILE_FLAG_RANDOM_ACCESS;
+ break;
default:
- errno = EINVAL;
- return -1;
+ errno = EINVAL;
+ return -1;
}
oflag &= ~(O_SEQUENTIAL | O_RANDOM);
if (oflag & ~O_APPEND) {
- errno = EINVAL;
- return -1;
+ errno = EINVAL;
+ return -1;
}
/* allocate a C Runtime file handle */
RUBY_CRITICAL({
- h = CreateFile("NUL", 0, 0, NULL, OPEN_ALWAYS, 0, NULL);
- fd = _open_osfhandle((intptr_t)h, 0);
- CloseHandle(h);
+ h = CreateFile("NUL", 0, 0, NULL, OPEN_ALWAYS, 0, NULL);
+ fd = _open_osfhandle((intptr_t)h, 0);
+ CloseHandle(h);
});
if (fd == -1) {
- errno = EMFILE;
- return -1;
+ errno = EMFILE;
+ return -1;
}
RUBY_CRITICAL({
- MTHREAD_ONLY(EnterCriticalSection(&(_pioinfo(fd)->lock)));
- _set_osfhnd(fd, (intptr_t)INVALID_HANDLE_VALUE);
- _set_osflags(fd, 0);
+ MTHREAD_ONLY(EnterCriticalSection(&(_pioinfo(fd)->lock)));
+ _set_osfhnd(fd, (intptr_t)INVALID_HANDLE_VALUE);
+ _set_osflags(fd, 0);
- h = CreateFileW(file, access, FILE_SHARE_READ | FILE_SHARE_WRITE, &sec,
- create, attr, NULL);
- if (h == INVALID_HANDLE_VALUE) {
- errno = map_errno(GetLastError());
- MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
- fd = -1;
- goto quit;
- }
+ h = CreateFileW(file, access, FILE_SHARE_READ | FILE_SHARE_WRITE, &sec,
+ create, attr, NULL);
+ if (h == INVALID_HANDLE_VALUE) {
+ errno = map_errno(GetLastError());
+ MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
+ fd = -1;
+ goto quit;
+ }
- switch (GetFileType(h)) {
- case FILE_TYPE_CHAR:
- flags |= FDEV;
- break;
- case FILE_TYPE_PIPE:
- flags |= FPIPE;
- break;
- case FILE_TYPE_UNKNOWN:
- errno = map_errno(GetLastError());
- CloseHandle(h);
- MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
- fd = -1;
- goto quit;
- }
- if (!(flags & (FDEV | FPIPE)) && (oflag & O_APPEND))
- flags |= FAPPEND;
+ switch (GetFileType(h)) {
+ case FILE_TYPE_CHAR:
+ flags |= FDEV;
+ break;
+ case FILE_TYPE_PIPE:
+ flags |= FPIPE;
+ break;
+ case FILE_TYPE_UNKNOWN:
+ errno = map_errno(GetLastError());
+ CloseHandle(h);
+ MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
+ fd = -1;
+ goto quit;
+ }
+ if (!(flags & (FDEV | FPIPE)) && (oflag & O_APPEND))
+ flags |= FAPPEND;
- _set_osfhnd(fd, (intptr_t)h);
- _osfile(fd) = flags | FOPEN;
+ _set_osfhnd(fd, (intptr_t)h);
+ _osfile(fd) = flags | FOPEN;
- MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
+ MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
quit:
- ;
+ ;
});
return fd;
}
@@ -5038,19 +5186,19 @@
SOCKET sock = TO_SOCKET(fd);
int save_errno = errno;
if (fflush(fp)) return -1;
if (!is_socket(sock)) {
- UnlockFile((HANDLE)sock, 0, 0, LK_LEN, LK_LEN);
- return fclose(fp);
+ UnlockFile((HANDLE)sock, 0, 0, LK_LEN, LK_LEN);
+ return fclose(fp);
}
_set_osfhnd(fd, (SOCKET)INVALID_HANDLE_VALUE);
fclose(fp);
errno = save_errno;
if (closesocket(sock) == SOCKET_ERROR) {
- errno = map_errno(WSAGetLastError());
- return -1;
+ errno = map_errno(WSAGetLastError());
+ return -1;
}
return 0;
}
int
@@ -5064,118 +5212,116 @@
int fdRead, fdWrite;
int ret;
/* if doesn't have CancelIo, use default pipe function */
if (!cancel_io)
- return _pipe(fds, 65536L, _O_NOINHERIT);
+ return _pipe(fds, 65536L, _O_NOINHERIT);
p = strchr(name, '0');
snprintf(p, strlen(p) + 1, "%x-%lx", rb_w32_getpid(), serial++);
sec.nLength = sizeof(sec);
sec.lpSecurityDescriptor = NULL;
sec.bInheritHandle = FALSE;
RUBY_CRITICAL({
- hRead = CreateNamedPipe(name, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,
- 0, 2, 65536, 65536, 0, &sec);
+ hRead = CreateNamedPipe(name, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,
+ 0, 2, 65536, 65536, 0, &sec);
});
if (hRead == INVALID_HANDLE_VALUE) {
- DWORD err = GetLastError();
- if (err == ERROR_PIPE_BUSY)
- errno = EMFILE;
- else
- errno = map_errno(GetLastError());
- return -1;
+ DWORD err = GetLastError();
+ if (err == ERROR_PIPE_BUSY)
+ errno = EMFILE;
+ else
+ errno = map_errno(GetLastError());
+ return -1;
}
RUBY_CRITICAL({
- hWrite = CreateFile(name, GENERIC_READ | GENERIC_WRITE, 0, &sec,
- OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL);
+ hWrite = CreateFile(name, GENERIC_READ | GENERIC_WRITE, 0, &sec,
+ OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL);
});
if (hWrite == INVALID_HANDLE_VALUE) {
- errno = map_errno(GetLastError());
- CloseHandle(hRead);
- return -1;
+ errno = map_errno(GetLastError());
+ CloseHandle(hRead);
+ return -1;
}
RUBY_CRITICAL(do {
- ret = 0;
- h = CreateFile("NUL", 0, 0, NULL, OPEN_ALWAYS, 0, NULL);
- fdRead = _open_osfhandle((intptr_t)h, 0);
- CloseHandle(h);
- if (fdRead == -1) {
- errno = EMFILE;
- CloseHandle(hWrite);
- CloseHandle(hRead);
- ret = -1;
- break;
- }
+ ret = 0;
+ h = CreateFile("NUL", 0, 0, NULL, OPEN_ALWAYS, 0, NULL);
+ fdRead = _open_osfhandle((intptr_t)h, 0);
+ CloseHandle(h);
+ if (fdRead == -1) {
+ errno = EMFILE;
+ CloseHandle(hWrite);
+ CloseHandle(hRead);
+ ret = -1;
+ break;
+ }
- MTHREAD_ONLY(EnterCriticalSection(&(_pioinfo(fdRead)->lock)));
- _set_osfhnd(fdRead, (intptr_t)hRead);
- _set_osflags(fdRead, FOPEN | FPIPE | FNOINHERIT);
- MTHREAD_ONLY(LeaveCriticalSection(&(_pioinfo(fdRead)->lock)));
+ MTHREAD_ONLY(EnterCriticalSection(&(_pioinfo(fdRead)->lock)));
+ _set_osfhnd(fdRead, (intptr_t)hRead);
+ _set_osflags(fdRead, FOPEN | FPIPE | FNOINHERIT);
+ MTHREAD_ONLY(LeaveCriticalSection(&(_pioinfo(fdRead)->lock)));
} while (0));
if (ret)
- return ret;
+ return ret;
RUBY_CRITICAL(do {
- h = CreateFile("NUL", 0, 0, NULL, OPEN_ALWAYS, 0, NULL);
- fdWrite = _open_osfhandle((intptr_t)h, 0);
- CloseHandle(h);
- if (fdWrite == -1) {
- errno = EMFILE;
- CloseHandle(hWrite);
- ret = -1;
- break;
- }
- MTHREAD_ONLY(EnterCriticalSection(&(_pioinfo(fdWrite)->lock)));
- _set_osfhnd(fdWrite, (intptr_t)hWrite);
- _set_osflags(fdWrite, FOPEN | FPIPE | FNOINHERIT);
- MTHREAD_ONLY(LeaveCriticalSection(&(_pioinfo(fdWrite)->lock)));
+ h = CreateFile("NUL", 0, 0, NULL, OPEN_ALWAYS, 0, NULL);
+ fdWrite = _open_osfhandle((intptr_t)h, 0);
+ CloseHandle(h);
+ if (fdWrite == -1) {
+ errno = EMFILE;
+ CloseHandle(hWrite);
+ ret = -1;
+ break;
+ }
+ MTHREAD_ONLY(EnterCriticalSection(&(_pioinfo(fdWrite)->lock)));
+ _set_osfhnd(fdWrite, (intptr_t)hWrite);
+ _set_osflags(fdWrite, FOPEN | FPIPE | FNOINHERIT);
+ MTHREAD_ONLY(LeaveCriticalSection(&(_pioinfo(fdWrite)->lock)));
} while (0));
if (ret) {
- rb_w32_close(fdRead);
- return ret;
+ rb_w32_close(fdRead);
+ return ret;
}
fds[0] = fdRead;
fds[1] = fdWrite;
return 0;
}
#endif
-int
-rb_w32_close(int fd)
+int rb_w32_close(int fd)
{
SOCKET sock = TO_SOCKET(fd);
int save_errno = errno;
st_data_t key;
if (!is_socket(sock)) {
- UnlockFile((HANDLE)sock, 0, 0, LK_LEN, LK_LEN);
- return _close(fd);
+ UnlockFile((HANDLE)sock, 0, 0, LK_LEN, LK_LEN);
+ return _close(fd);
}
_set_osfhnd(fd, (SOCKET)INVALID_HANDLE_VALUE);
key = (st_data_t)sock;
st_delete(socklist, &key, NULL);
sock = (SOCKET)key;
//_close(fd);
errno = save_errno;
if (closesocket(sock) == SOCKET_ERROR) {
- errno = map_errno(WSAGetLastError());
- return -1;
+ errno = map_errno(WSAGetLastError());
+ return -1;
}
return 0;
}
#ifndef _WIN32_WCE
#undef read
-size_t
-rb_w32_read(int fd, void *buf, size_t size)
+size_t rb_w32_read(int fd, void *buf, size_t size)
{
SOCKET sock = TO_SOCKET(fd);
DWORD read;
DWORD wait;
DWORD err;
@@ -5185,279 +5331,277 @@
BOOL isconsole;
BOOL islineinput;
int start = 0;
if (is_socket(sock))
- return rb_w32_recv(fd, buf, size, 0);
+ return rb_w32_recv(fd, buf, size, 0);
// validate fd by using _get_osfhandle() because we cannot access _nhandle
if (_get_osfhandle(fd) == -1) {
- return -1;
+ return -1;
}
if (_osfile(fd) & FTEXT) {
- return _read(fd, buf, size);
+ return _read(fd, buf, size);
}
MTHREAD_ONLY(EnterCriticalSection(&(_pioinfo(fd)->lock)));
if (!size || _osfile(fd) & FEOFLAG) {
- _set_osflags(fd, _osfile(fd) & ~FEOFLAG);
- MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
- return 0;
+ _set_osflags(fd, _osfile(fd) & ~FEOFLAG);
+ MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
+ return 0;
}
ret = 0;
isconsole = is_console(_osfhnd(fd));
if(isconsole){
- DWORD mode;
- GetConsoleMode((HANDLE)_osfhnd(fd),&mode);
- islineinput = (mode & ENABLE_LINE_INPUT) != 0;
+ DWORD mode;
+ GetConsoleMode((HANDLE)_osfhnd(fd),&mode);
+ islineinput = (mode & ENABLE_LINE_INPUT) != 0;
}
retry:
/* get rid of console reading bug */
if (isconsole) {
- if (start)
- len = 1;
- else {
- len = 0;
- start = 1;
- }
+ if (start)
+ len = 1;
+ else {
+ len = 0;
+ start = 1;
}
+ }
else
- len = size;
+ len = size;
size -= len;
/* if have cancel_io, use Overlapped I/O */
if (cancel_io) {
- memset(&ol, 0, sizeof(ol));
- if (!(_osfile(fd) & (FDEV | FPIPE))) {
- LONG high = 0;
- DWORD low = SetFilePointer((HANDLE)_osfhnd(fd), 0, &high,
- FILE_CURRENT);
+ memset(&ol, 0, sizeof(ol));
+ if (!(_osfile(fd) & (FDEV | FPIPE))) {
+ LONG high = 0;
+ DWORD low = SetFilePointer((HANDLE)_osfhnd(fd), 0, &high,
+ FILE_CURRENT);
#ifndef INVALID_SET_FILE_POINTER
#define INVALID_SET_FILE_POINTER ((DWORD)-1)
#endif
- if (low == INVALID_SET_FILE_POINTER) {
- errno = map_errno(GetLastError());
- MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
- return -1;
- }
- ol.Offset = low;
- ol.OffsetHigh = high;
- }
- ol.hEvent = CreateEvent(NULL, TRUE, TRUE, NULL);
- if (!ol.hEvent) {
- errno = map_errno(GetLastError());
- MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
- return -1;
- }
+ if (low == INVALID_SET_FILE_POINTER) {
+ errno = map_errno(GetLastError());
+ MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
+ return -1;
+ }
+ ol.Offset = low;
+ ol.OffsetHigh = high;
+ }
+ ol.hEvent = CreateEvent(NULL, TRUE, TRUE, NULL);
+ if (!ol.hEvent) {
+ errno = map_errno(GetLastError());
+ MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
+ return -1;
+ }
- pol = &ol;
+ pol = &ol;
}
if (!ReadFile((HANDLE)_osfhnd(fd), buf, len, &read, pol)) {
- err = GetLastError();
- if (err != ERROR_IO_PENDING) {
- if (pol) CloseHandle(ol.hEvent);
- if (err == ERROR_ACCESS_DENIED)
- errno = EBADF;
- else if (err == ERROR_BROKEN_PIPE || err == ERROR_HANDLE_EOF) {
- MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
- return 0;
- }
- else
- errno = map_errno(err);
+ err = GetLastError();
+ if (err != ERROR_IO_PENDING) {
+ if (pol) CloseHandle(ol.hEvent);
+ if (err == ERROR_ACCESS_DENIED)
+ errno = EBADF;
+ else if (err == ERROR_BROKEN_PIPE || err == ERROR_HANDLE_EOF) {
+ MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
+ return 0;
+ }
+ else
+ errno = map_errno(err);
- MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
- return -1;
- }
+ MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
+ return -1;
+ }
- if (pol) {
- wait = rb_w32_wait_events_blocking(&ol.hEvent, 1, INFINITE);
- if (wait != WAIT_OBJECT_0) {
- if (wait == WAIT_OBJECT_0 + 1)
- errno = EINTR;
- else
- errno = map_errno(GetLastError());
- CloseHandle(ol.hEvent);
- cancel_io((HANDLE)_osfhnd(fd));
- MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
- return -1;
- }
+ if (pol) {
+ wait = rb_w32_wait_events_blocking(&ol.hEvent, 1, INFINITE);
+ if (wait != WAIT_OBJECT_0) {
+ if (wait == WAIT_OBJECT_0 + 1)
+ errno = EINTR;
+ else
+ errno = map_errno(GetLastError());
+ CloseHandle(ol.hEvent);
+ cancel_io((HANDLE)_osfhnd(fd));
+ MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
+ return -1;
+ }
- if (!GetOverlappedResult((HANDLE)_osfhnd(fd), &ol, &read, TRUE) &&
- (err = GetLastError()) != ERROR_HANDLE_EOF) {
- int ret = 0;
- if (err != ERROR_BROKEN_PIPE) {
- errno = map_errno(err);
- ret = -1;
- }
- CloseHandle(ol.hEvent);
- cancel_io((HANDLE)_osfhnd(fd));
- MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
- return ret;
- }
- }
+ if (!GetOverlappedResult((HANDLE)_osfhnd(fd), &ol, &read, TRUE) &&
+ (err = GetLastError()) != ERROR_HANDLE_EOF) {
+ int ret = 0;
+ if (err != ERROR_BROKEN_PIPE) {
+ errno = map_errno(err);
+ ret = -1;
+ }
+ CloseHandle(ol.hEvent);
+ cancel_io((HANDLE)_osfhnd(fd));
+ MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
+ return ret;
+ }
}
+ }
if (pol) {
- CloseHandle(ol.hEvent);
+ CloseHandle(ol.hEvent);
- if (!(_osfile(fd) & (FDEV | FPIPE))) {
- LONG high = ol.OffsetHigh;
- DWORD low = ol.Offset + read;
- if (low < ol.Offset)
- ++high;
- SetFilePointer((HANDLE)_osfhnd(fd), low, &high, FILE_BEGIN);
- }
+ if (!(_osfile(fd) & (FDEV | FPIPE))) {
+ LONG high = ol.OffsetHigh;
+ DWORD low = ol.Offset + read;
+ if (low < ol.Offset)
+ ++high;
+ SetFilePointer((HANDLE)_osfhnd(fd), low, &high, FILE_BEGIN);
}
+ }
ret += read;
if (read >= len) {
- buf = (char *)buf + read;
- if (!(isconsole && len == 1 && (!islineinput || *((char *)buf - 1) == '\n')) && size > 0)
- goto retry;
+ buf = (char *)buf + read;
+ if (!(isconsole && len == 1 && (!islineinput || *((char *)buf - 1) == '\n')) && size > 0)
+ goto retry;
}
if (read == 0)
- _set_osflags(fd, _osfile(fd) | FEOFLAG);
+ _set_osflags(fd, _osfile(fd) | FEOFLAG);
MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
return ret;
}
#undef write
-size_t
-rb_w32_write(int fd, const void *buf, size_t size)
+size_t rb_w32_write(int fd, const void *buf, size_t size)
{
SOCKET sock = TO_SOCKET(fd);
DWORD written;
DWORD wait;
DWORD err;
size_t len;
size_t ret;
OVERLAPPED ol, *pol = NULL;
if (is_socket(sock))
- return rb_w32_send(fd, buf, size, 0);
+ return rb_w32_send(fd, buf, size, 0);
// validate fd by using _get_osfhandle() because we cannot access _nhandle
if (_get_osfhandle(fd) == -1) {
- return -1;
+ return -1;
}
if (_osfile(fd) & FTEXT) {
- return _write(fd, buf, size);
+ return _write(fd, buf, size);
}
MTHREAD_ONLY(EnterCriticalSection(&(_pioinfo(fd)->lock)));
if (!size || _osfile(fd) & FEOFLAG) {
- MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
- return 0;
+ MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
+ return 0;
}
ret = 0;
retry:
/* get rid of console writing bug */
len = (_osfile(fd) & FDEV) ? min(32 * 1024, size) : size;
size -= len;
/* if have cancel_io, use Overlapped I/O */
if (cancel_io) {
- memset(&ol, 0, sizeof(ol));
- if (!(_osfile(fd) & (FDEV | FPIPE))) {
- LONG high = 0;
- DWORD method = _osfile(fd) & FAPPEND ? FILE_END : FILE_CURRENT;
- DWORD low = SetFilePointer((HANDLE)_osfhnd(fd), 0, &high, method);
+ memset(&ol, 0, sizeof(ol));
+ if (!(_osfile(fd) & (FDEV | FPIPE))) {
+ LONG high = 0;
+ DWORD method = _osfile(fd) & FAPPEND ? FILE_END : FILE_CURRENT;
+ DWORD low = SetFilePointer((HANDLE)_osfhnd(fd), 0, &high, method);
#ifndef INVALID_SET_FILE_POINTER
#define INVALID_SET_FILE_POINTER ((DWORD)-1)
#endif
- if (low == INVALID_SET_FILE_POINTER) {
- errno = map_errno(GetLastError());
- MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
- return -1;
- }
- ol.Offset = low;
- ol.OffsetHigh = high;
- }
- ol.hEvent = CreateEvent(NULL, TRUE, TRUE, NULL);
- if (!ol.hEvent) {
- errno = map_errno(GetLastError());
- MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
- return -1;
- }
+ if (low == INVALID_SET_FILE_POINTER) {
+ errno = map_errno(GetLastError());
+ MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
+ return -1;
+ }
+ ol.Offset = low;
+ ol.OffsetHigh = high;
+ }
+ ol.hEvent = CreateEvent(NULL, TRUE, TRUE, NULL);
+ if (!ol.hEvent) {
+ errno = map_errno(GetLastError());
+ MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
+ return -1;
+ }
- pol = &ol;
+ pol = &ol;
}
if (!WriteFile((HANDLE)_osfhnd(fd), buf, len, &written, pol)) {
- err = GetLastError();
- if (err != ERROR_IO_PENDING) {
- if (pol) CloseHandle(ol.hEvent);
- if (err == ERROR_ACCESS_DENIED)
- errno = EBADF;
- else
- errno = map_errno(err);
+ err = GetLastError();
+ if (err != ERROR_IO_PENDING) {
+ if (pol) CloseHandle(ol.hEvent);
+ if (err == ERROR_ACCESS_DENIED)
+ errno = EBADF;
+ else
+ errno = map_errno(err);
- MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
- return -1;
- }
+ MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
+ return -1;
+ }
- if (pol) {
- wait = rb_w32_wait_events_blocking(&ol.hEvent, 1, INFINITE);
- if (wait != WAIT_OBJECT_0) {
- if (wait == WAIT_OBJECT_0 + 1)
- errno = EINTR;
- else
- errno = map_errno(GetLastError());
- CloseHandle(ol.hEvent);
- cancel_io((HANDLE)_osfhnd(fd));
- MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
- return -1;
- }
+ if (pol) {
+ wait = rb_w32_wait_events_blocking(&ol.hEvent, 1, INFINITE);
+ if (wait != WAIT_OBJECT_0) {
+ if (wait == WAIT_OBJECT_0 + 1)
+ errno = EINTR;
+ else
+ errno = map_errno(GetLastError());
+ CloseHandle(ol.hEvent);
+ cancel_io((HANDLE)_osfhnd(fd));
+ MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
+ return -1;
+ }
- if (!GetOverlappedResult((HANDLE)_osfhnd(fd), &ol, &written,
- TRUE)) {
- errno = map_errno(err);
- CloseHandle(ol.hEvent);
- cancel_io((HANDLE)_osfhnd(fd));
- MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
- return -1;
- }
- }
+ if (!GetOverlappedResult((HANDLE)_osfhnd(fd), &ol, &written,
+ TRUE)) {
+ errno = map_errno(err);
+ CloseHandle(ol.hEvent);
+ cancel_io((HANDLE)_osfhnd(fd));
+ MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
+ return -1;
+ }
}
+ }
if (pol) {
- CloseHandle(ol.hEvent);
+ CloseHandle(ol.hEvent);
- if (!(_osfile(fd) & (FDEV | FPIPE))) {
- LONG high = ol.OffsetHigh;
- DWORD low = ol.Offset + written;
- if (low < ol.Offset)
- ++high;
- SetFilePointer((HANDLE)_osfhnd(fd), low, &high, FILE_BEGIN);
- }
+ if (!(_osfile(fd) & (FDEV | FPIPE))) {
+ LONG high = ol.OffsetHigh;
+ DWORD low = ol.Offset + written;
+ if (low < ol.Offset)
+ ++high;
+ SetFilePointer((HANDLE)_osfhnd(fd), low, &high, FILE_BEGIN);
}
+ }
ret += written;
if (written == len) {
- buf = (const char *)buf + len;
- if (size > 0)
- goto retry;
+ buf = (const char *)buf + len;
+ if (size > 0)
+ goto retry;
}
MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
return ret;
}
#endif //WINCE
-static int
-unixtime_to_filetime(time_t time, FILETIME *ft)
+static int unixtime_to_filetime(time_t time, FILETIME *ft)
{
struct tm *tm;
SYSTEMTIME st;
FILETIME lt;
@@ -5469,61 +5613,60 @@
st.wHour = tm->tm_hour;
st.wMinute = tm->tm_min;
st.wSecond = tm->tm_sec;
st.wMilliseconds = 0;
if (!SystemTimeToFileTime(&st, <) ||
- !LocalFileTimeToFileTime(<, ft)) {
- errno = map_errno(GetLastError());
- return -1;
+ !LocalFileTimeToFileTime(<, ft)) {
+ errno = map_errno(GetLastError());
+ return -1;
}
return 0;
}
-static int
-wutime(const WCHAR *path, const struct utimbuf *times)
+static int wutime(const WCHAR *path, const struct utimbuf *times)
{
HANDLE hFile;
FILETIME atime, mtime;
struct stati64 stat;
int ret = 0;
if (wstati64(path, &stat)) {
- return -1;
+ return -1;
}
if (times) {
- if (unixtime_to_filetime(times->actime, &atime)) {
- return -1;
- }
- if (unixtime_to_filetime(times->modtime, &mtime)) {
- return -1;
- }
+ if (unixtime_to_filetime(times->actime, &atime)) {
+ return -1;
}
+ if (unixtime_to_filetime(times->modtime, &mtime)) {
+ return -1;
+ }
+ }
else {
- GetSystemTimeAsFileTime(&atime);
- mtime = atime;
+ GetSystemTimeAsFileTime(&atime);
+ mtime = atime;
}
RUBY_CRITICAL({
- const DWORD attr = GetFileAttributesW(path);
- if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY))
- SetFileAttributesW(path, attr & ~FILE_ATTRIBUTE_READONLY);
- hFile = CreateFileW(path, GENERIC_WRITE, 0, 0, OPEN_EXISTING,
- IsWin95() ? 0 : FILE_FLAG_BACKUP_SEMANTICS, 0);
- if (hFile == INVALID_HANDLE_VALUE) {
- errno = map_errno(GetLastError());
- ret = -1;
- }
- else {
- if (!SetFileTime(hFile, NULL, &atime, &mtime)) {
- errno = map_errno(GetLastError());
- ret = -1;
- }
- CloseHandle(hFile);
- }
- if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY))
- SetFileAttributesW(path, attr);
+ const DWORD attr = GetFileAttributesW(path);
+ if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY))
+ SetFileAttributesW(path, attr & ~FILE_ATTRIBUTE_READONLY);
+ hFile = CreateFileW(path, GENERIC_WRITE, 0, 0, OPEN_EXISTING,
+ IsWin95() ? 0 : FILE_FLAG_BACKUP_SEMANTICS, 0);
+ if (hFile == INVALID_HANDLE_VALUE) {
+ errno = map_errno(GetLastError());
+ ret = -1;
+ }
+ else {
+ if (!SetFileTime(hFile, NULL, &atime, &mtime)) {
+ errno = map_errno(GetLastError());
+ ret = -1;
+ }
+ CloseHandle(hFile);
+ }
+ if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY))
+ SetFileAttributesW(path, attr);
});
return ret;
}
@@ -5532,276 +5675,256 @@
{
WCHAR *wpath;
int ret;
if (!(wpath = utf8_to_wstr(path, NULL)))
- return -1;
+ return -1;
ret = wutime(wpath, times);
free(wpath);
return ret;
}
-int
-rb_w32_utime(const char *path, const struct utimbuf *times)
+int rb_w32_utime(const char *path, const struct utimbuf *times)
{
WCHAR *wpath;
int ret;
if (!(wpath = filecp_to_wstr(path, NULL)))
- return -1;
+ return -1;
ret = wutime(wpath, times);
free(wpath);
return ret;
}
-int
-rb_w32_uchdir(const char *path)
+int rb_w32_uchdir(const char *path)
{
WCHAR *wpath;
int ret;
if (!(wpath = utf8_to_wstr(path, NULL)))
- return -1;
+ return -1;
ret = _wchdir(wpath);
free(wpath);
return ret;
}
-static int
-wmkdir(const WCHAR *wpath, int mode)
+static int wmkdir(const WCHAR *wpath, int mode)
{
int ret = -1;
RUBY_CRITICAL(do {
- if (CreateDirectoryW(wpath, NULL) == FALSE) {
- errno = map_errno(GetLastError());
- break;
- }
- if (_wchmod(wpath, mode) == -1) {
- RemoveDirectoryW(wpath);
- break;
- }
- ret = 0;
+ if (CreateDirectoryW(wpath, NULL) == FALSE) {
+ errno = map_errno(GetLastError());
+ break;
+ }
+ if (_wchmod(wpath, mode) == -1) {
+ RemoveDirectoryW(wpath);
+ break;
+ }
+ ret = 0;
} while (0));
return ret;
}
-int
-rb_w32_umkdir(const char *path, int mode)
+int rb_w32_umkdir(const char *path, int mode)
{
WCHAR *wpath;
int ret;
if (!(wpath = utf8_to_wstr(path, NULL)))
- return -1;
+ return -1;
ret = wmkdir(wpath, mode);
free(wpath);
return ret;
}
-int
-rb_w32_mkdir(const char *path, int mode)
+int rb_w32_mkdir(const char *path, int mode)
{
WCHAR *wpath;
int ret;
if (!(wpath = filecp_to_wstr(path, NULL)))
- return -1;
+ return -1;
ret = wmkdir(wpath, mode);
free(wpath);
return ret;
}
-static int
-wrmdir(const WCHAR *wpath)
+static int wrmdir(const WCHAR *wpath)
{
int ret = 0;
RUBY_CRITICAL({
- const DWORD attr = GetFileAttributesW(wpath);
- if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY)) {
- SetFileAttributesW(wpath, attr & ~FILE_ATTRIBUTE_READONLY);
- }
- if (RemoveDirectoryW(wpath) == FALSE) {
- errno = map_errno(GetLastError());
- ret = -1;
- if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY)) {
- SetFileAttributesW(wpath, attr);
- }
- }
+ const DWORD attr = GetFileAttributesW(wpath);
+ if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY)) {
+ SetFileAttributesW(wpath, attr & ~FILE_ATTRIBUTE_READONLY);
+ }
+ if (RemoveDirectoryW(wpath) == FALSE) {
+ errno = map_errno(GetLastError());
+ ret = -1;
+ if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY)) {
+ SetFileAttributesW(wpath, attr);
+ }
+ }
});
return ret;
}
-int
-rb_w32_rmdir(const char *path)
+int rb_w32_rmdir(const char *path)
{
WCHAR *wpath;
int ret;
if (!(wpath = filecp_to_wstr(path, NULL)))
- return -1;
+ return -1;
ret = wrmdir(wpath);
free(wpath);
return ret;
}
-int
-rb_w32_urmdir(const char *path)
+int rb_w32_urmdir(const char *path)
{
WCHAR *wpath;
int ret;
if (!(wpath = utf8_to_wstr(path, NULL)))
- return -1;
+ return -1;
ret = wrmdir(wpath);
free(wpath);
return ret;
}
-static int
-wunlink(const WCHAR *path)
+static int wunlink(const WCHAR *path)
{
int ret = 0;
RUBY_CRITICAL({
- const DWORD attr = GetFileAttributesW(path);
- if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY)) {
- SetFileAttributesW(path, attr & ~FILE_ATTRIBUTE_READONLY);
- }
- if (DeleteFileW(path) == FALSE) {
- errno = map_errno(GetLastError());
- ret = -1;
- if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY)) {
- SetFileAttributesW(path, attr);
- }
- }
+ const DWORD attr = GetFileAttributesW(path);
+ if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY)) {
+ SetFileAttributesW(path, attr & ~FILE_ATTRIBUTE_READONLY);
+ }
+ if (DeleteFileW(path) == FALSE) {
+ errno = map_errno(GetLastError());
+ ret = -1;
+ if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY)) {
+ SetFileAttributesW(path, attr);
+ }
+ }
});
return ret;
}
-int
-rb_w32_uunlink(const char *path)
+int rb_w32_uunlink(const char *path)
{
WCHAR *wpath;
int ret;
if (!(wpath = utf8_to_wstr(path, NULL)))
- return -1;
+ return -1;
ret = wunlink(wpath);
free(wpath);
return ret;
}
-int
-rb_w32_unlink(const char *path)
+int rb_w32_unlink(const char *path)
{
WCHAR *wpath;
int ret;
if (!(wpath = filecp_to_wstr(path, NULL)))
- return -1;
+ return -1;
ret = wunlink(wpath);
free(wpath);
return ret;
}
-int
-rb_w32_uchmod(const char *path, int mode)
+int rb_w32_uchmod(const char *path, int mode)
{
WCHAR *wpath;
int ret;
if (!(wpath = filecp_to_wstr(path, NULL)))
- return -1;
+ return -1;
ret = _wchmod(wpath, mode);
free(wpath);
return ret;
}
#if !defined(__BORLANDC__)&& !defined(_WIN32_WCE)
-int
-rb_w32_isatty(int fd)
+int rb_w32_isatty(int fd)
{
// validate fd by using _get_osfhandle() because we cannot access _nhandle
/* if (_get_osfhandle(fd) == -1) {
- return 0;
+ return 0;
}
if (!(_osfile(fd) & FDEV)) {
- errno = ENOTTY;
- return 0;
+ errno = ENOTTY;
+ return 0;
}*/
return 0;
}
#endif
//
// Fix bcc32's stdio bug
//
#ifdef __BORLANDC__
-static int
-too_many_files(void)
+static int too_many_files(void)
{
FILE *f;
for (f = _streams; f < _streams + _nfile; f++) {
- if (f->fd < 0) return 0;
+ if (f->fd < 0) return 0;
}
return 1;
}
#undef fopen
-FILE *
-rb_w32_fopen(const char *path, const char *mode)
+FILE * rb_w32_fopen(const char *path, const char *mode)
{
FILE *f = (errno = 0, fopen(path, mode));
if (f == NULL && errno == 0) {
- if (too_many_files())
- errno = EMFILE;
+ if (too_many_files())
+ errno = EMFILE;
}
return f;
}
-FILE *
-rb_w32_fdopen(int handle, const char *type)
+FILE * rb_w32_fdopen(int handle, const char *type)
{
FILE *f = (errno = 0, _fdopen(handle, (char *)type));
if (f == NULL && errno == 0) {
- if (handle < 0)
- errno = EBADF;
- else if (too_many_files())
- errno = EMFILE;
+ if (handle < 0)
+ errno = EBADF;
+ else if (too_many_files())
+ errno = EMFILE;
}
return f;
}
-FILE *
-rb_w32_fsopen(const char *path, const char *mode, int shflags)
+FILE * rb_w32_fsopen(const char *path, const char *mode, int shflags)
{
FILE *f = (errno = 0, _fsopen(path, mode, shflags));
if (f == NULL && errno == 0) {
- if (too_many_files())
- errno = EMFILE;
+ if (too_many_files())
+ errno = EMFILE;
}
return f;
}
#endif
#if defined(_MSC_VER) && RT_VER <= 60
extern long _ftol(double);
-long
-_ftol2(double d)
+long _ftol2(double d)
{
return _ftol(d);
}
-long
-_ftol2_sse(double d)
+long _ftol2_sse(double d)
{
return _ftol(d);
}
#endif
#ifndef signbit
-int
-signbit(double x)
+int signbit(double x)
{
int *ip = (int *)(&x + 1) - 1;
return *ip < 0;
}
#endif