2007-11-26 17:13:05 +01:00
|
|
|
/* GIO - GLib Input, Output and Streaming Library
|
|
|
|
*
|
|
|
|
* Copyright (C) 2006-2007 Red Hat, Inc.
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General
|
|
|
|
* Public License along with this library; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
|
|
* Boston, MA 02111-1307, USA.
|
|
|
|
*
|
|
|
|
* Author: Alexander Larsson <alexl@redhat.com>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <poll.h>
|
|
|
|
|
|
|
|
#include <glib.h>
|
|
|
|
#include <glib/gstdio.h>
|
|
|
|
#include "gioerror.h"
|
|
|
|
#include "gsimpleasyncresult.h"
|
2007-11-27 16:08:03 +01:00
|
|
|
#include "gunixinputstream.h"
|
2007-11-26 17:13:05 +01:00
|
|
|
#include "gcancellable.h"
|
|
|
|
#include "gasynchelper.h"
|
|
|
|
#include "glibintl.h"
|
|
|
|
|
2007-11-28 13:39:07 +01:00
|
|
|
#include "gioalias.h"
|
|
|
|
|
2007-11-27 15:00:13 +01:00
|
|
|
/**
|
2007-11-27 16:08:03 +01:00
|
|
|
* SECTION:gunixinputstream
|
2007-12-01 05:38:29 +01:00
|
|
|
* @short_description: Streaming input operations for Unix file descriptors
|
2007-12-18 03:52:11 +01:00
|
|
|
* @include: gio/gunixinputstream.h
|
2007-11-28 07:43:33 +01:00
|
|
|
* @see_also: #GInputStream
|
2007-11-27 15:00:13 +01:00
|
|
|
*
|
2007-11-27 16:08:03 +01:00
|
|
|
* #GUnixInputStream implements #GInputStream for reading from a
|
|
|
|
* unix file descriptor, including asynchronous operations. The file
|
2008-02-06 17:02:20 +01:00
|
|
|
* descriptor must be selectable, so it doesn't work with opened files.
|
2007-11-27 15:00:13 +01:00
|
|
|
**/
|
|
|
|
|
2007-11-27 16:08:03 +01:00
|
|
|
G_DEFINE_TYPE (GUnixInputStream, g_unix_input_stream, G_TYPE_INPUT_STREAM);
|
2007-11-26 17:13:05 +01:00
|
|
|
|
2007-11-27 16:08:03 +01:00
|
|
|
struct _GUnixInputStreamPrivate {
|
2007-11-26 17:13:05 +01:00
|
|
|
int fd;
|
|
|
|
gboolean close_fd_at_close;
|
|
|
|
};
|
|
|
|
|
2007-11-27 16:08:03 +01:00
|
|
|
static gssize g_unix_input_stream_read (GInputStream *stream,
|
|
|
|
void *buffer,
|
|
|
|
gsize count,
|
|
|
|
GCancellable *cancellable,
|
|
|
|
GError **error);
|
|
|
|
static gboolean g_unix_input_stream_close (GInputStream *stream,
|
|
|
|
GCancellable *cancellable,
|
|
|
|
GError **error);
|
|
|
|
static void g_unix_input_stream_read_async (GInputStream *stream,
|
|
|
|
void *buffer,
|
|
|
|
gsize count,
|
|
|
|
int io_priority,
|
|
|
|
GCancellable *cancellable,
|
|
|
|
GAsyncReadyCallback callback,
|
|
|
|
gpointer data);
|
|
|
|
static gssize g_unix_input_stream_read_finish (GInputStream *stream,
|
|
|
|
GAsyncResult *result,
|
|
|
|
GError **error);
|
|
|
|
static void g_unix_input_stream_skip_async (GInputStream *stream,
|
|
|
|
gsize count,
|
|
|
|
int io_priority,
|
|
|
|
GCancellable *cancellable,
|
|
|
|
GAsyncReadyCallback callback,
|
|
|
|
gpointer data);
|
|
|
|
static gssize g_unix_input_stream_skip_finish (GInputStream *stream,
|
|
|
|
GAsyncResult *result,
|
|
|
|
GError **error);
|
|
|
|
static void g_unix_input_stream_close_async (GInputStream *stream,
|
|
|
|
int io_priority,
|
|
|
|
GCancellable *cancellable,
|
|
|
|
GAsyncReadyCallback callback,
|
|
|
|
gpointer data);
|
|
|
|
static gboolean g_unix_input_stream_close_finish (GInputStream *stream,
|
|
|
|
GAsyncResult *result,
|
|
|
|
GError **error);
|
|
|
|
|
2007-11-26 17:13:05 +01:00
|
|
|
|
|
|
|
static void
|
2007-11-27 16:08:03 +01:00
|
|
|
g_unix_input_stream_finalize (GObject *object)
|
2007-11-26 17:13:05 +01:00
|
|
|
{
|
2007-11-27 16:08:03 +01:00
|
|
|
GUnixInputStream *stream;
|
2007-11-26 17:13:05 +01:00
|
|
|
|
2007-11-27 16:08:03 +01:00
|
|
|
stream = G_UNIX_INPUT_STREAM (object);
|
2007-11-26 17:13:05 +01:00
|
|
|
|
2007-11-27 16:08:03 +01:00
|
|
|
if (G_OBJECT_CLASS (g_unix_input_stream_parent_class)->finalize)
|
|
|
|
(*G_OBJECT_CLASS (g_unix_input_stream_parent_class)->finalize) (object);
|
2007-11-26 17:13:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2007-11-27 16:08:03 +01:00
|
|
|
g_unix_input_stream_class_init (GUnixInputStreamClass *klass)
|
2007-11-26 17:13:05 +01:00
|
|
|
{
|
|
|
|
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
|
|
|
|
GInputStreamClass *stream_class = G_INPUT_STREAM_CLASS (klass);
|
|
|
|
|
2007-11-27 16:08:03 +01:00
|
|
|
g_type_class_add_private (klass, sizeof (GUnixInputStreamPrivate));
|
2007-11-26 17:13:05 +01:00
|
|
|
|
2007-11-27 16:08:03 +01:00
|
|
|
gobject_class->finalize = g_unix_input_stream_finalize;
|
2007-11-26 17:13:05 +01:00
|
|
|
|
2007-12-05 11:38:03 +01:00
|
|
|
stream_class->read_fn = g_unix_input_stream_read;
|
|
|
|
stream_class->close_fn = g_unix_input_stream_close;
|
2007-11-27 16:08:03 +01:00
|
|
|
stream_class->read_async = g_unix_input_stream_read_async;
|
|
|
|
stream_class->read_finish = g_unix_input_stream_read_finish;
|
2007-11-26 17:13:05 +01:00
|
|
|
if (0)
|
|
|
|
{
|
|
|
|
/* TODO: Implement instead of using fallbacks */
|
2007-11-27 16:08:03 +01:00
|
|
|
stream_class->skip_async = g_unix_input_stream_skip_async;
|
|
|
|
stream_class->skip_finish = g_unix_input_stream_skip_finish;
|
2007-11-26 17:13:05 +01:00
|
|
|
}
|
2007-11-27 16:08:03 +01:00
|
|
|
stream_class->close_async = g_unix_input_stream_close_async;
|
|
|
|
stream_class->close_finish = g_unix_input_stream_close_finish;
|
2007-11-26 17:13:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2007-11-27 16:08:03 +01:00
|
|
|
g_unix_input_stream_init (GUnixInputStream *unix_stream)
|
2007-11-26 17:13:05 +01:00
|
|
|
{
|
2007-11-27 16:08:03 +01:00
|
|
|
unix_stream->priv = G_TYPE_INSTANCE_GET_PRIVATE (unix_stream,
|
|
|
|
G_TYPE_UNIX_INPUT_STREAM,
|
|
|
|
GUnixInputStreamPrivate);
|
2007-11-26 17:13:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2007-11-27 16:08:03 +01:00
|
|
|
* g_unix_input_stream_new:
|
|
|
|
* @fd: unix file descriptor.
|
2007-11-27 15:00:13 +01:00
|
|
|
* @close_fd_at_close: a #gboolean.
|
2007-11-26 17:13:05 +01:00
|
|
|
*
|
2007-11-27 16:08:03 +01:00
|
|
|
* Creates a new #GUnixInputStream for the given @fd. If @close_fd_at_close
|
|
|
|
* is %TRUE, the file descriptor will be closed when the stream is closed.
|
2007-11-26 17:13:05 +01:00
|
|
|
*
|
2007-11-27 16:08:03 +01:00
|
|
|
* Returns: a #GUnixInputStream.
|
2007-11-26 17:13:05 +01:00
|
|
|
**/
|
|
|
|
GInputStream *
|
2007-11-30 06:11:25 +01:00
|
|
|
g_unix_input_stream_new (int fd,
|
2007-11-27 16:08:03 +01:00
|
|
|
gboolean close_fd_at_close)
|
2007-11-26 17:13:05 +01:00
|
|
|
{
|
2007-11-27 16:08:03 +01:00
|
|
|
GUnixInputStream *stream;
|
2007-11-26 17:13:05 +01:00
|
|
|
|
|
|
|
g_return_val_if_fail (fd != -1, NULL);
|
|
|
|
|
2007-11-27 16:08:03 +01:00
|
|
|
stream = g_object_new (G_TYPE_UNIX_INPUT_STREAM, NULL);
|
2007-11-26 17:13:05 +01:00
|
|
|
|
|
|
|
stream->priv->fd = fd;
|
|
|
|
stream->priv->close_fd_at_close = close_fd_at_close;
|
|
|
|
|
|
|
|
return G_INPUT_STREAM (stream);
|
|
|
|
}
|
|
|
|
|
|
|
|
static gssize
|
2007-11-30 06:11:25 +01:00
|
|
|
g_unix_input_stream_read (GInputStream *stream,
|
|
|
|
void *buffer,
|
|
|
|
gsize count,
|
|
|
|
GCancellable *cancellable,
|
|
|
|
GError **error)
|
2007-11-26 17:13:05 +01:00
|
|
|
{
|
2007-11-27 16:08:03 +01:00
|
|
|
GUnixInputStream *unix_stream;
|
2007-11-26 17:13:05 +01:00
|
|
|
gssize res;
|
|
|
|
struct pollfd poll_fds[2];
|
|
|
|
int poll_ret;
|
|
|
|
int cancel_fd;
|
|
|
|
|
2007-11-27 16:08:03 +01:00
|
|
|
unix_stream = G_UNIX_INPUT_STREAM (stream);
|
2007-11-26 17:13:05 +01:00
|
|
|
|
|
|
|
cancel_fd = g_cancellable_get_fd (cancellable);
|
|
|
|
if (cancel_fd != -1)
|
|
|
|
{
|
|
|
|
do
|
|
|
|
{
|
|
|
|
poll_fds[0].events = POLLIN;
|
2007-11-27 16:08:03 +01:00
|
|
|
poll_fds[0].fd = unix_stream->priv->fd;
|
2007-11-26 17:13:05 +01:00
|
|
|
poll_fds[1].events = POLLIN;
|
|
|
|
poll_fds[1].fd = cancel_fd;
|
|
|
|
poll_ret = poll (poll_fds, 2, -1);
|
|
|
|
}
|
|
|
|
while (poll_ret == -1 && errno == EINTR);
|
|
|
|
|
|
|
|
if (poll_ret == -1)
|
|
|
|
{
|
Save errno before calling other funcs that potentially alter it. Bug
* gio/gdesktopappinfo.c: (ensure_dir):
* gio/glocalfile.c: (g_local_file_query_filesystem_info),
(g_local_file_read), (g_local_file_delete), (g_local_file_trash),
(g_local_file_move):
* gio/glocalfileinfo.c: (set_xattr), (_g_local_file_info_get),
(_g_local_file_info_get_from_fd), (set_unix_mode),
(set_unix_uid_gid), (set_symlink), (set_mtime_atime):
* gio/glocalfileinputstream.c: (g_local_file_input_stream_read),
(g_local_file_input_stream_skip),
(g_local_file_input_stream_close),
(g_local_file_input_stream_seek):
* gio/glocalfileoutputstream.c:
(g_local_file_output_stream_write),
(g_local_file_output_stream_close),
(g_local_file_output_stream_seek),
(g_local_file_output_stream_truncate), (copy_file_data),
(handle_overwrite_open):
* gio/gunixinputstream.c: (g_unix_input_stream_read),
(g_unix_input_stream_close), (read_async_cb), (close_async_cb):
* gio/gunixoutputstream.c: (g_unix_output_stream_write),
(g_unix_output_stream_close), (write_async_cb), (close_async_cb):
Save
errno before calling other funcs that potentially alter it. Bug
#514766.
svn path=/trunk/; revision=6466
2008-02-06 16:10:08 +01:00
|
|
|
int errsv = errno;
|
|
|
|
|
2007-11-26 17:13:05 +01:00
|
|
|
g_set_error (error, G_IO_ERROR,
|
Save errno before calling other funcs that potentially alter it. Bug
* gio/gdesktopappinfo.c: (ensure_dir):
* gio/glocalfile.c: (g_local_file_query_filesystem_info),
(g_local_file_read), (g_local_file_delete), (g_local_file_trash),
(g_local_file_move):
* gio/glocalfileinfo.c: (set_xattr), (_g_local_file_info_get),
(_g_local_file_info_get_from_fd), (set_unix_mode),
(set_unix_uid_gid), (set_symlink), (set_mtime_atime):
* gio/glocalfileinputstream.c: (g_local_file_input_stream_read),
(g_local_file_input_stream_skip),
(g_local_file_input_stream_close),
(g_local_file_input_stream_seek):
* gio/glocalfileoutputstream.c:
(g_local_file_output_stream_write),
(g_local_file_output_stream_close),
(g_local_file_output_stream_seek),
(g_local_file_output_stream_truncate), (copy_file_data),
(handle_overwrite_open):
* gio/gunixinputstream.c: (g_unix_input_stream_read),
(g_unix_input_stream_close), (read_async_cb), (close_async_cb):
* gio/gunixoutputstream.c: (g_unix_output_stream_write),
(g_unix_output_stream_close), (write_async_cb), (close_async_cb):
Save
errno before calling other funcs that potentially alter it. Bug
#514766.
svn path=/trunk/; revision=6466
2008-02-06 16:10:08 +01:00
|
|
|
g_io_error_from_errno (errsv),
|
2007-11-27 16:08:03 +01:00
|
|
|
_("Error reading from unix: %s"),
|
Save errno before calling other funcs that potentially alter it. Bug
* gio/gdesktopappinfo.c: (ensure_dir):
* gio/glocalfile.c: (g_local_file_query_filesystem_info),
(g_local_file_read), (g_local_file_delete), (g_local_file_trash),
(g_local_file_move):
* gio/glocalfileinfo.c: (set_xattr), (_g_local_file_info_get),
(_g_local_file_info_get_from_fd), (set_unix_mode),
(set_unix_uid_gid), (set_symlink), (set_mtime_atime):
* gio/glocalfileinputstream.c: (g_local_file_input_stream_read),
(g_local_file_input_stream_skip),
(g_local_file_input_stream_close),
(g_local_file_input_stream_seek):
* gio/glocalfileoutputstream.c:
(g_local_file_output_stream_write),
(g_local_file_output_stream_close),
(g_local_file_output_stream_seek),
(g_local_file_output_stream_truncate), (copy_file_data),
(handle_overwrite_open):
* gio/gunixinputstream.c: (g_unix_input_stream_read),
(g_unix_input_stream_close), (read_async_cb), (close_async_cb):
* gio/gunixoutputstream.c: (g_unix_output_stream_write),
(g_unix_output_stream_close), (write_async_cb), (close_async_cb):
Save
errno before calling other funcs that potentially alter it. Bug
#514766.
svn path=/trunk/; revision=6466
2008-02-06 16:10:08 +01:00
|
|
|
g_strerror (errsv));
|
2007-11-26 17:13:05 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
if (g_cancellable_set_error_if_cancelled (cancellable, error))
|
|
|
|
break;
|
2007-11-27 16:08:03 +01:00
|
|
|
res = read (unix_stream->priv->fd, buffer, count);
|
2007-11-26 17:13:05 +01:00
|
|
|
if (res == -1)
|
|
|
|
{
|
Save errno before calling other funcs that potentially alter it. Bug
* gio/gdesktopappinfo.c: (ensure_dir):
* gio/glocalfile.c: (g_local_file_query_filesystem_info),
(g_local_file_read), (g_local_file_delete), (g_local_file_trash),
(g_local_file_move):
* gio/glocalfileinfo.c: (set_xattr), (_g_local_file_info_get),
(_g_local_file_info_get_from_fd), (set_unix_mode),
(set_unix_uid_gid), (set_symlink), (set_mtime_atime):
* gio/glocalfileinputstream.c: (g_local_file_input_stream_read),
(g_local_file_input_stream_skip),
(g_local_file_input_stream_close),
(g_local_file_input_stream_seek):
* gio/glocalfileoutputstream.c:
(g_local_file_output_stream_write),
(g_local_file_output_stream_close),
(g_local_file_output_stream_seek),
(g_local_file_output_stream_truncate), (copy_file_data),
(handle_overwrite_open):
* gio/gunixinputstream.c: (g_unix_input_stream_read),
(g_unix_input_stream_close), (read_async_cb), (close_async_cb):
* gio/gunixoutputstream.c: (g_unix_output_stream_write),
(g_unix_output_stream_close), (write_async_cb), (close_async_cb):
Save
errno before calling other funcs that potentially alter it. Bug
#514766.
svn path=/trunk/; revision=6466
2008-02-06 16:10:08 +01:00
|
|
|
int errsv = errno;
|
|
|
|
|
|
|
|
if (errsv == EINTR)
|
2007-11-26 17:13:05 +01:00
|
|
|
continue;
|
|
|
|
|
|
|
|
g_set_error (error, G_IO_ERROR,
|
Save errno before calling other funcs that potentially alter it. Bug
* gio/gdesktopappinfo.c: (ensure_dir):
* gio/glocalfile.c: (g_local_file_query_filesystem_info),
(g_local_file_read), (g_local_file_delete), (g_local_file_trash),
(g_local_file_move):
* gio/glocalfileinfo.c: (set_xattr), (_g_local_file_info_get),
(_g_local_file_info_get_from_fd), (set_unix_mode),
(set_unix_uid_gid), (set_symlink), (set_mtime_atime):
* gio/glocalfileinputstream.c: (g_local_file_input_stream_read),
(g_local_file_input_stream_skip),
(g_local_file_input_stream_close),
(g_local_file_input_stream_seek):
* gio/glocalfileoutputstream.c:
(g_local_file_output_stream_write),
(g_local_file_output_stream_close),
(g_local_file_output_stream_seek),
(g_local_file_output_stream_truncate), (copy_file_data),
(handle_overwrite_open):
* gio/gunixinputstream.c: (g_unix_input_stream_read),
(g_unix_input_stream_close), (read_async_cb), (close_async_cb):
* gio/gunixoutputstream.c: (g_unix_output_stream_write),
(g_unix_output_stream_close), (write_async_cb), (close_async_cb):
Save
errno before calling other funcs that potentially alter it. Bug
#514766.
svn path=/trunk/; revision=6466
2008-02-06 16:10:08 +01:00
|
|
|
g_io_error_from_errno (errsv),
|
2007-11-27 16:08:03 +01:00
|
|
|
_("Error reading from unix: %s"),
|
Save errno before calling other funcs that potentially alter it. Bug
* gio/gdesktopappinfo.c: (ensure_dir):
* gio/glocalfile.c: (g_local_file_query_filesystem_info),
(g_local_file_read), (g_local_file_delete), (g_local_file_trash),
(g_local_file_move):
* gio/glocalfileinfo.c: (set_xattr), (_g_local_file_info_get),
(_g_local_file_info_get_from_fd), (set_unix_mode),
(set_unix_uid_gid), (set_symlink), (set_mtime_atime):
* gio/glocalfileinputstream.c: (g_local_file_input_stream_read),
(g_local_file_input_stream_skip),
(g_local_file_input_stream_close),
(g_local_file_input_stream_seek):
* gio/glocalfileoutputstream.c:
(g_local_file_output_stream_write),
(g_local_file_output_stream_close),
(g_local_file_output_stream_seek),
(g_local_file_output_stream_truncate), (copy_file_data),
(handle_overwrite_open):
* gio/gunixinputstream.c: (g_unix_input_stream_read),
(g_unix_input_stream_close), (read_async_cb), (close_async_cb):
* gio/gunixoutputstream.c: (g_unix_output_stream_write),
(g_unix_output_stream_close), (write_async_cb), (close_async_cb):
Save
errno before calling other funcs that potentially alter it. Bug
#514766.
svn path=/trunk/; revision=6466
2008-02-06 16:10:08 +01:00
|
|
|
g_strerror (errsv));
|
2007-11-26 17:13:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2007-11-30 06:11:25 +01:00
|
|
|
g_unix_input_stream_close (GInputStream *stream,
|
|
|
|
GCancellable *cancellable,
|
|
|
|
GError **error)
|
2007-11-26 17:13:05 +01:00
|
|
|
{
|
2007-11-27 16:08:03 +01:00
|
|
|
GUnixInputStream *unix_stream;
|
2007-11-26 17:13:05 +01:00
|
|
|
int res;
|
|
|
|
|
2007-11-27 16:08:03 +01:00
|
|
|
unix_stream = G_UNIX_INPUT_STREAM (stream);
|
2007-11-26 17:13:05 +01:00
|
|
|
|
2007-11-27 16:08:03 +01:00
|
|
|
if (!unix_stream->priv->close_fd_at_close)
|
2007-11-26 17:13:05 +01:00
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
/* This might block during the close. Doesn't seem to be a way to avoid it though. */
|
2007-11-27 16:08:03 +01:00
|
|
|
res = close (unix_stream->priv->fd);
|
2007-11-26 17:13:05 +01:00
|
|
|
if (res == -1)
|
Save errno before calling other funcs that potentially alter it. Bug
* gio/gdesktopappinfo.c: (ensure_dir):
* gio/glocalfile.c: (g_local_file_query_filesystem_info),
(g_local_file_read), (g_local_file_delete), (g_local_file_trash),
(g_local_file_move):
* gio/glocalfileinfo.c: (set_xattr), (_g_local_file_info_get),
(_g_local_file_info_get_from_fd), (set_unix_mode),
(set_unix_uid_gid), (set_symlink), (set_mtime_atime):
* gio/glocalfileinputstream.c: (g_local_file_input_stream_read),
(g_local_file_input_stream_skip),
(g_local_file_input_stream_close),
(g_local_file_input_stream_seek):
* gio/glocalfileoutputstream.c:
(g_local_file_output_stream_write),
(g_local_file_output_stream_close),
(g_local_file_output_stream_seek),
(g_local_file_output_stream_truncate), (copy_file_data),
(handle_overwrite_open):
* gio/gunixinputstream.c: (g_unix_input_stream_read),
(g_unix_input_stream_close), (read_async_cb), (close_async_cb):
* gio/gunixoutputstream.c: (g_unix_output_stream_write),
(g_unix_output_stream_close), (write_async_cb), (close_async_cb):
Save
errno before calling other funcs that potentially alter it. Bug
#514766.
svn path=/trunk/; revision=6466
2008-02-06 16:10:08 +01:00
|
|
|
{
|
|
|
|
int errsv = errno;
|
|
|
|
|
|
|
|
g_set_error (error, G_IO_ERROR,
|
|
|
|
g_io_error_from_errno (errsv),
|
|
|
|
_("Error closing unix: %s"),
|
|
|
|
g_strerror (errsv));
|
|
|
|
}
|
2007-11-26 17:13:05 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return res != -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
gsize count;
|
|
|
|
void *buffer;
|
|
|
|
GAsyncReadyCallback callback;
|
|
|
|
gpointer user_data;
|
|
|
|
GCancellable *cancellable;
|
2007-11-27 16:08:03 +01:00
|
|
|
GUnixInputStream *stream;
|
2007-11-26 17:13:05 +01:00
|
|
|
} ReadAsyncData;
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
read_async_cb (ReadAsyncData *data,
|
2007-11-30 06:11:25 +01:00
|
|
|
GIOCondition condition,
|
|
|
|
int fd)
|
2007-11-26 17:13:05 +01:00
|
|
|
{
|
|
|
|
GSimpleAsyncResult *simple;
|
|
|
|
GError *error = NULL;
|
|
|
|
gssize count_read;
|
|
|
|
|
|
|
|
/* We know that we can read from fd once without blocking */
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
if (g_cancellable_set_error_if_cancelled (data->cancellable, &error))
|
|
|
|
{
|
|
|
|
count_read = -1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
count_read = read (data->stream->priv->fd, data->buffer, data->count);
|
|
|
|
if (count_read == -1)
|
|
|
|
{
|
Save errno before calling other funcs that potentially alter it. Bug
* gio/gdesktopappinfo.c: (ensure_dir):
* gio/glocalfile.c: (g_local_file_query_filesystem_info),
(g_local_file_read), (g_local_file_delete), (g_local_file_trash),
(g_local_file_move):
* gio/glocalfileinfo.c: (set_xattr), (_g_local_file_info_get),
(_g_local_file_info_get_from_fd), (set_unix_mode),
(set_unix_uid_gid), (set_symlink), (set_mtime_atime):
* gio/glocalfileinputstream.c: (g_local_file_input_stream_read),
(g_local_file_input_stream_skip),
(g_local_file_input_stream_close),
(g_local_file_input_stream_seek):
* gio/glocalfileoutputstream.c:
(g_local_file_output_stream_write),
(g_local_file_output_stream_close),
(g_local_file_output_stream_seek),
(g_local_file_output_stream_truncate), (copy_file_data),
(handle_overwrite_open):
* gio/gunixinputstream.c: (g_unix_input_stream_read),
(g_unix_input_stream_close), (read_async_cb), (close_async_cb):
* gio/gunixoutputstream.c: (g_unix_output_stream_write),
(g_unix_output_stream_close), (write_async_cb), (close_async_cb):
Save
errno before calling other funcs that potentially alter it. Bug
#514766.
svn path=/trunk/; revision=6466
2008-02-06 16:10:08 +01:00
|
|
|
int errsv = errno;
|
|
|
|
|
|
|
|
if (errsv == EINTR)
|
2007-11-26 17:13:05 +01:00
|
|
|
continue;
|
|
|
|
|
|
|
|
g_set_error (&error, G_IO_ERROR,
|
Save errno before calling other funcs that potentially alter it. Bug
* gio/gdesktopappinfo.c: (ensure_dir):
* gio/glocalfile.c: (g_local_file_query_filesystem_info),
(g_local_file_read), (g_local_file_delete), (g_local_file_trash),
(g_local_file_move):
* gio/glocalfileinfo.c: (set_xattr), (_g_local_file_info_get),
(_g_local_file_info_get_from_fd), (set_unix_mode),
(set_unix_uid_gid), (set_symlink), (set_mtime_atime):
* gio/glocalfileinputstream.c: (g_local_file_input_stream_read),
(g_local_file_input_stream_skip),
(g_local_file_input_stream_close),
(g_local_file_input_stream_seek):
* gio/glocalfileoutputstream.c:
(g_local_file_output_stream_write),
(g_local_file_output_stream_close),
(g_local_file_output_stream_seek),
(g_local_file_output_stream_truncate), (copy_file_data),
(handle_overwrite_open):
* gio/gunixinputstream.c: (g_unix_input_stream_read),
(g_unix_input_stream_close), (read_async_cb), (close_async_cb):
* gio/gunixoutputstream.c: (g_unix_output_stream_write),
(g_unix_output_stream_close), (write_async_cb), (close_async_cb):
Save
errno before calling other funcs that potentially alter it. Bug
#514766.
svn path=/trunk/; revision=6466
2008-02-06 16:10:08 +01:00
|
|
|
g_io_error_from_errno (errsv),
|
2007-11-27 16:08:03 +01:00
|
|
|
_("Error reading from unix: %s"),
|
Save errno before calling other funcs that potentially alter it. Bug
* gio/gdesktopappinfo.c: (ensure_dir):
* gio/glocalfile.c: (g_local_file_query_filesystem_info),
(g_local_file_read), (g_local_file_delete), (g_local_file_trash),
(g_local_file_move):
* gio/glocalfileinfo.c: (set_xattr), (_g_local_file_info_get),
(_g_local_file_info_get_from_fd), (set_unix_mode),
(set_unix_uid_gid), (set_symlink), (set_mtime_atime):
* gio/glocalfileinputstream.c: (g_local_file_input_stream_read),
(g_local_file_input_stream_skip),
(g_local_file_input_stream_close),
(g_local_file_input_stream_seek):
* gio/glocalfileoutputstream.c:
(g_local_file_output_stream_write),
(g_local_file_output_stream_close),
(g_local_file_output_stream_seek),
(g_local_file_output_stream_truncate), (copy_file_data),
(handle_overwrite_open):
* gio/gunixinputstream.c: (g_unix_input_stream_read),
(g_unix_input_stream_close), (read_async_cb), (close_async_cb):
* gio/gunixoutputstream.c: (g_unix_output_stream_write),
(g_unix_output_stream_close), (write_async_cb), (close_async_cb):
Save
errno before calling other funcs that potentially alter it. Bug
#514766.
svn path=/trunk/; revision=6466
2008-02-06 16:10:08 +01:00
|
|
|
g_strerror (errsv));
|
2007-11-26 17:13:05 +01:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
simple = g_simple_async_result_new (G_OBJECT (data->stream),
|
|
|
|
data->callback,
|
|
|
|
data->user_data,
|
2007-11-27 16:08:03 +01:00
|
|
|
g_unix_input_stream_read_async);
|
2007-11-26 17:13:05 +01:00
|
|
|
|
|
|
|
g_simple_async_result_set_op_res_gssize (simple, count_read);
|
|
|
|
|
|
|
|
if (count_read == -1)
|
|
|
|
{
|
|
|
|
g_simple_async_result_set_from_error (simple, error);
|
|
|
|
g_error_free (error);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Complete immediately, not in idle, since we're already in a mainloop callout */
|
|
|
|
g_simple_async_result_complete (simple);
|
|
|
|
g_object_unref (simple);
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2007-11-27 16:08:03 +01:00
|
|
|
g_unix_input_stream_read_async (GInputStream *stream,
|
|
|
|
void *buffer,
|
|
|
|
gsize count,
|
|
|
|
int io_priority,
|
|
|
|
GCancellable *cancellable,
|
|
|
|
GAsyncReadyCallback callback,
|
|
|
|
gpointer user_data)
|
2007-11-26 17:13:05 +01:00
|
|
|
{
|
|
|
|
GSource *source;
|
2007-11-27 16:08:03 +01:00
|
|
|
GUnixInputStream *unix_stream;
|
2007-11-26 17:13:05 +01:00
|
|
|
ReadAsyncData *data;
|
|
|
|
|
2007-11-27 16:08:03 +01:00
|
|
|
unix_stream = G_UNIX_INPUT_STREAM (stream);
|
2007-11-26 17:13:05 +01:00
|
|
|
|
|
|
|
data = g_new0 (ReadAsyncData, 1);
|
|
|
|
data->count = count;
|
|
|
|
data->buffer = buffer;
|
|
|
|
data->callback = callback;
|
|
|
|
data->user_data = user_data;
|
|
|
|
data->cancellable = cancellable;
|
2007-11-27 16:08:03 +01:00
|
|
|
data->stream = unix_stream;
|
2007-11-26 17:13:05 +01:00
|
|
|
|
2007-11-27 16:08:03 +01:00
|
|
|
source = _g_fd_source_new (unix_stream->priv->fd,
|
2007-11-26 17:13:05 +01:00
|
|
|
POLLIN,
|
|
|
|
cancellable);
|
|
|
|
|
|
|
|
g_source_set_callback (source, (GSourceFunc)read_async_cb, data, g_free);
|
|
|
|
g_source_attach (source, NULL);
|
|
|
|
|
|
|
|
g_source_unref (source);
|
|
|
|
}
|
|
|
|
|
|
|
|
static gssize
|
2007-11-30 06:11:25 +01:00
|
|
|
g_unix_input_stream_read_finish (GInputStream *stream,
|
|
|
|
GAsyncResult *result,
|
|
|
|
GError **error)
|
2007-11-26 17:13:05 +01:00
|
|
|
{
|
|
|
|
GSimpleAsyncResult *simple;
|
|
|
|
gssize nread;
|
|
|
|
|
|
|
|
simple = G_SIMPLE_ASYNC_RESULT (result);
|
2007-12-10 15:07:42 +01:00
|
|
|
g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_unix_input_stream_read_async);
|
2007-11-26 17:13:05 +01:00
|
|
|
|
|
|
|
nread = g_simple_async_result_get_op_res_gssize (simple);
|
|
|
|
return nread;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2007-11-27 16:08:03 +01:00
|
|
|
g_unix_input_stream_skip_async (GInputStream *stream,
|
|
|
|
gsize count,
|
|
|
|
int io_priority,
|
|
|
|
GCancellable *cancellable,
|
|
|
|
GAsyncReadyCallback callback,
|
|
|
|
gpointer data)
|
2007-11-26 17:13:05 +01:00
|
|
|
{
|
2007-12-10 15:07:42 +01:00
|
|
|
g_warn_if_reached ();
|
2007-11-26 17:13:05 +01:00
|
|
|
/* TODO: Not implemented */
|
|
|
|
}
|
|
|
|
|
|
|
|
static gssize
|
2007-11-30 06:11:25 +01:00
|
|
|
g_unix_input_stream_skip_finish (GInputStream *stream,
|
|
|
|
GAsyncResult *result,
|
|
|
|
GError **error)
|
2007-11-26 17:13:05 +01:00
|
|
|
{
|
2007-12-10 15:07:42 +01:00
|
|
|
g_warn_if_reached ();
|
2008-01-07 14:58:37 +01:00
|
|
|
return 0;
|
2007-11-26 17:13:05 +01:00
|
|
|
/* TODO: Not implemented */
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
GInputStream *stream;
|
|
|
|
GAsyncReadyCallback callback;
|
|
|
|
gpointer user_data;
|
|
|
|
} CloseAsyncData;
|
|
|
|
|
|
|
|
static void
|
|
|
|
close_async_data_free (gpointer _data)
|
|
|
|
{
|
|
|
|
CloseAsyncData *data = _data;
|
|
|
|
|
|
|
|
g_free (data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
close_async_cb (CloseAsyncData *data)
|
|
|
|
{
|
2007-11-27 16:08:03 +01:00
|
|
|
GUnixInputStream *unix_stream;
|
2007-11-26 17:13:05 +01:00
|
|
|
GSimpleAsyncResult *simple;
|
|
|
|
GError *error = NULL;
|
|
|
|
gboolean result;
|
|
|
|
int res;
|
|
|
|
|
2007-11-27 16:08:03 +01:00
|
|
|
unix_stream = G_UNIX_INPUT_STREAM (data->stream);
|
2007-11-26 17:13:05 +01:00
|
|
|
|
2007-11-27 16:08:03 +01:00
|
|
|
if (!unix_stream->priv->close_fd_at_close)
|
2007-11-26 17:13:05 +01:00
|
|
|
{
|
|
|
|
result = TRUE;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
{
|
2007-11-27 16:08:03 +01:00
|
|
|
res = close (unix_stream->priv->fd);
|
2007-11-26 17:13:05 +01:00
|
|
|
if (res == -1)
|
Save errno before calling other funcs that potentially alter it. Bug
* gio/gdesktopappinfo.c: (ensure_dir):
* gio/glocalfile.c: (g_local_file_query_filesystem_info),
(g_local_file_read), (g_local_file_delete), (g_local_file_trash),
(g_local_file_move):
* gio/glocalfileinfo.c: (set_xattr), (_g_local_file_info_get),
(_g_local_file_info_get_from_fd), (set_unix_mode),
(set_unix_uid_gid), (set_symlink), (set_mtime_atime):
* gio/glocalfileinputstream.c: (g_local_file_input_stream_read),
(g_local_file_input_stream_skip),
(g_local_file_input_stream_close),
(g_local_file_input_stream_seek):
* gio/glocalfileoutputstream.c:
(g_local_file_output_stream_write),
(g_local_file_output_stream_close),
(g_local_file_output_stream_seek),
(g_local_file_output_stream_truncate), (copy_file_data),
(handle_overwrite_open):
* gio/gunixinputstream.c: (g_unix_input_stream_read),
(g_unix_input_stream_close), (read_async_cb), (close_async_cb):
* gio/gunixoutputstream.c: (g_unix_output_stream_write),
(g_unix_output_stream_close), (write_async_cb), (close_async_cb):
Save
errno before calling other funcs that potentially alter it. Bug
#514766.
svn path=/trunk/; revision=6466
2008-02-06 16:10:08 +01:00
|
|
|
{
|
|
|
|
int errsv = errno;
|
|
|
|
|
|
|
|
g_set_error (&error, G_IO_ERROR,
|
|
|
|
g_io_error_from_errno (errsv),
|
|
|
|
_("Error closing unix: %s"),
|
|
|
|
g_strerror (errsv));
|
|
|
|
}
|
2007-11-26 17:13:05 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
result = res != -1;
|
|
|
|
|
|
|
|
out:
|
|
|
|
simple = g_simple_async_result_new (G_OBJECT (data->stream),
|
|
|
|
data->callback,
|
|
|
|
data->user_data,
|
2007-11-27 16:08:03 +01:00
|
|
|
g_unix_input_stream_close_async);
|
2007-11-26 17:13:05 +01:00
|
|
|
|
|
|
|
if (!result)
|
|
|
|
{
|
|
|
|
g_simple_async_result_set_from_error (simple, error);
|
|
|
|
g_error_free (error);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Complete immediately, not in idle, since we're already in a mainloop callout */
|
|
|
|
g_simple_async_result_complete (simple);
|
|
|
|
g_object_unref (simple);
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2007-11-30 06:11:25 +01:00
|
|
|
g_unix_input_stream_close_async (GInputStream *stream,
|
|
|
|
int io_priority,
|
|
|
|
GCancellable *cancellable,
|
|
|
|
GAsyncReadyCallback callback,
|
|
|
|
gpointer user_data)
|
2007-11-26 17:13:05 +01:00
|
|
|
{
|
|
|
|
GSource *idle;
|
|
|
|
CloseAsyncData *data;
|
|
|
|
|
|
|
|
data = g_new0 (CloseAsyncData, 1);
|
|
|
|
|
|
|
|
data->stream = stream;
|
|
|
|
data->callback = callback;
|
|
|
|
data->user_data = user_data;
|
|
|
|
|
|
|
|
idle = g_idle_source_new ();
|
|
|
|
g_source_set_callback (idle, (GSourceFunc)close_async_cb, data, close_async_data_free);
|
|
|
|
g_source_attach (idle, NULL);
|
|
|
|
g_source_unref (idle);
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2007-11-30 06:11:25 +01:00
|
|
|
g_unix_input_stream_close_finish (GInputStream *stream,
|
|
|
|
GAsyncResult *result,
|
|
|
|
GError **error)
|
2007-11-26 17:13:05 +01:00
|
|
|
{
|
|
|
|
/* Failures handled in generic close_finish code */
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2007-11-28 13:39:07 +01:00
|
|
|
#define __G_UNIX_INPUT_STREAM_C__
|
|
|
|
#include "gioaliasdef.c"
|