mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-01-23 04:52:42 -08:00
Code Issues Projects Releases Packages Wiki Activity

create-descriptor: cygwin is handled like UNIX

Browse source
This commit is contained in:
Daniel Kochmanski 2017-03-20 07:21:42 +01:00
parent 26c74e39a6
commit 17f4e28249
3 changed files with 8 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/c/symbols_list.h
View file

@ -2000,7 +2000,7 @@ cl_symbols[] = {
#endif
{SYS_ "RUN-PROGRAM-INNER", SI_ORDINARY, si_run_program_inner, 3, OBJNULL},
{SYS_ "SPAWN-SUBPROCESS", SI_ORDINARY, si_spawn_subprocess, 6, OBJNULL},
#if defined(ECL_MS_WINDOWS_HOST) || defined(cygwin)
#if defined(ECL_MS_WINDOWS_HOST)
{SYS_ "CLOSE-WINDOWS-HANDLE", SI_ORDINARY, si_close_windows_handle, 1, OBJNULL},
#else
{SYS_ "CLOSE-WINDOWS-HANDLE", SI_ORDINARY, NULL, -1, OBJNULL},

2
src/c/symbols_list2.h
View file

@ -2000,7 +2000,7 @@ cl_symbols[] = {
#endif
{SYS_ "RUN-PROGRAM-INNER","si_run_program_inner"},
{SYS_ "SPAWN-SUBPROCESS","si_spawn_subprocess"},
#if defined(ECL_MS_WINDOWS_HOST) || defined(cygwin)
#if defined(ECL_MS_WINDOWS_HOST)
{SYS_ "CLOSE-WINDOWS-HANDLE","si_close_windows_handle"},
#else
{SYS_ "CLOSE-WINDOWS-HANDLE",NULL},

27
src/c/unixsys.d
View file

@ -23,10 +23,7 @@
#endif
#include <ecl/ecl.h>
#include <ecl/internal.h>
#ifdef cygwin
# include <sys/cygwin.h> /* For cygwin_attach_handle_to_fd() */
#endif
#if defined(ECL_MS_WINDOWS_HOST) || defined(cygwin)
#if defined(ECL_MS_WINDOWS_HOST)
# include <windows.h>
#endif
#ifdef HAVE_SYS_WAIT_H
@ -224,7 +221,7 @@ si_killpid(cl_object pid, cl_object signal) {
}
#endif
#if defined(ECL_MS_WINDOWS_HOST) || defined(cygwin)
#if defined(ECL_MS_WINDOWS_HOST)
cl_object
si_close_windows_handle(cl_object h)
{
@ -258,9 +255,7 @@ ecl_stream_to_HANDLE(cl_object s, bool output)
case ecl_smm_output_wsock:
case ecl_smm_io_wsock:
#endif
#if defined(ECL_MS_WINDOWS_HOST)
case ecl_smm_io_wcon:
#endif
return (HANDLE)IO_FILE_DESCRIPTOR(s);
default: {
int stream_descriptor = ecl_stream_to_handle(s, output);
@ -295,13 +290,8 @@ create_descriptor(cl_object stream, cl_object direction,
DUPLICATE_CLOSE_SOURCE |
DUPLICATE_SAME_ACCESS) == 0)
return;
#ifdef cygwin
*parent = cygwin_attach_handle_to_fd
(0, -1, tmp, S_IRWXU, GENERIC_WRITE);
#else
*parent = _open_osfhandle
((intptr_t)tmp, _O_WRONLY);
#endif
*parent = _open_osfhandle((intptr_t)tmp, _O_WRONLY);
}
else /* if (direction == @':output') */ {
if (CreatePipe(&tmp, child, &attr, 0) == 0)
@ -311,13 +301,8 @@ create_descriptor(cl_object stream, cl_object direction,
DUPLICATE_CLOSE_SOURCE |
DUPLICATE_SAME_ACCESS) == 0)
return;
#ifdef cygwin
*parent = cygwin_attach_handle_to_fd
(0, -1, tmp, S_IRWXU, GENERIC_READ);
#else
*parent = _open_osfhandle
((intptr_t)tmp, _O_RDONLY);
#endif
*parent = _open_osfhandle((intptr_t)tmp, _O_RDONLY);
}
if (*parent < 0)