mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-08-23 09:28:54 +02:00
gio: Add private API to create win32 streams from fds
This will be used by GSubprocess. https://bugzilla.gnome.org/show_bug.cgi?id=672102
This commit is contained in:
committed by
Ryan Lortie
parent
aaddd823bc
commit
c515c3ed11
@@ -59,6 +59,7 @@ enum {
|
||||
struct _GWin32InputStreamPrivate {
|
||||
HANDLE handle;
|
||||
gboolean close_handle;
|
||||
gint fd;
|
||||
};
|
||||
|
||||
G_DEFINE_TYPE_WITH_PRIVATE (GWin32InputStream, g_win32_input_stream, G_TYPE_INPUT_STREAM)
|
||||
@@ -175,6 +176,7 @@ g_win32_input_stream_init (GWin32InputStream *win32_stream)
|
||||
win32_stream->priv = g_win32_input_stream_get_instance_private (win32_stream);
|
||||
win32_stream->priv->handle = NULL;
|
||||
win32_stream->priv->close_handle = TRUE;
|
||||
win32_stream->priv->fd = -1;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -364,19 +366,44 @@ g_win32_input_stream_close (GInputStream *stream,
|
||||
if (!win32_stream->priv->close_handle)
|
||||
return TRUE;
|
||||
|
||||
res = CloseHandle (win32_stream->priv->handle);
|
||||
if (!res)
|
||||
if (win32_stream->priv->fd != -1)
|
||||
{
|
||||
int errsv = GetLastError ();
|
||||
gchar *emsg = g_win32_error_message (errsv);
|
||||
if (close (win32_stream->priv->fd) < 0)
|
||||
{
|
||||
g_set_error_literal (error, G_IO_ERROR,
|
||||
g_io_error_from_errno (errno),
|
||||
g_strerror (errno));
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
res = CloseHandle (win32_stream->priv->handle);
|
||||
if (!res)
|
||||
{
|
||||
int errsv = GetLastError ();
|
||||
gchar *emsg = g_win32_error_message (errsv);
|
||||
|
||||
g_set_error (error, G_IO_ERROR,
|
||||
g_io_error_from_win32_error (errsv),
|
||||
_("Error closing handle: %s"),
|
||||
emsg);
|
||||
g_free (emsg);
|
||||
return FALSE;
|
||||
g_set_error (error, G_IO_ERROR,
|
||||
g_io_error_from_win32_error (errsv),
|
||||
_("Error closing handle: %s"),
|
||||
emsg);
|
||||
g_free (emsg);
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
GInputStream *
|
||||
g_win32_input_stream_new_from_fd (gint fd,
|
||||
gboolean close_fd)
|
||||
{
|
||||
GWin32InputStream *win32_stream;
|
||||
|
||||
win32_stream = G_WIN32_INPUT_STREAM (g_win32_input_stream_new ((HANDLE) _get_osfhandle (fd), close_fd));
|
||||
win32_stream->priv->fd = fd;
|
||||
|
||||
return (GInputStream*)win32_stream;
|
||||
}
|
||||
|
Reference in New Issue
Block a user