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>
|
|
|
|
*/
|
|
|
|
|
2008-06-22 17:10:51 +02:00
|
|
|
#include "config.h"
|
2007-11-26 17:13:05 +01:00
|
|
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
|
|
|
|
#include <glib.h>
|
|
|
|
#include <glib/gstdio.h>
|
|
|
|
#include "gioerror.h"
|
2007-11-27 16:08:03 +01:00
|
|
|
#include "gunixoutputstream.h"
|
2007-11-26 17:13:05 +01:00
|
|
|
#include "gcancellable.h"
|
|
|
|
#include "gsimpleasyncresult.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:gunixoutputstream
|
2007-12-01 05:38:29 +01:00
|
|
|
* @short_description: Streaming output operations for Unix file descriptors
|
2007-12-18 03:52:11 +01:00
|
|
|
* @include: gio/gunixoutputstream.h
|
2007-11-28 07:43:33 +01:00
|
|
|
* @see_also: #GOutputStream
|
2007-11-27 15:00:13 +01:00
|
|
|
*
|
2008-02-06 17:02:20 +01:00
|
|
|
* #GUnixOutputStream implements #GOutputStream for writing to a
|
2007-11-27 16:08:03 +01:00
|
|
|
* 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.
|
2008-12-31 08:47:19 +01:00
|
|
|
*
|
|
|
|
* Note that <filename><gio/gunixoutputstream.h></filename> belongs
|
|
|
|
* to the UNIX-specific GIO interfaces, thus you have to use the
|
|
|
|
* <filename>gio-unix-2.0.pc</filename> pkg-config file when using it.
|
|
|
|
*/
|
2007-11-27 15:00:13 +01:00
|
|
|
|
2008-12-08 06:41:43 +01:00
|
|
|
enum {
|
|
|
|
PROP_0,
|
|
|
|
PROP_FD,
|
|
|
|
PROP_CLOSE_FD
|
|
|
|
};
|
|
|
|
|
2007-11-27 16:08:03 +01:00
|
|
|
G_DEFINE_TYPE (GUnixOutputStream, g_unix_output_stream, G_TYPE_OUTPUT_STREAM);
|
2007-11-26 17:13:05 +01:00
|
|
|
|
|
|
|
|
2007-11-27 16:08:03 +01:00
|
|
|
struct _GUnixOutputStreamPrivate {
|
2007-11-26 17:13:05 +01:00
|
|
|
int fd;
|
2008-12-08 06:41:43 +01:00
|
|
|
gboolean close_fd;
|
2007-11-26 17:13:05 +01:00
|
|
|
};
|
|
|
|
|
2008-12-08 06:41:43 +01:00
|
|
|
static void g_unix_output_stream_set_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
const GValue *value,
|
|
|
|
GParamSpec *pspec);
|
|
|
|
static void g_unix_output_stream_get_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
GValue *value,
|
|
|
|
GParamSpec *pspec);
|
2007-11-27 16:08:03 +01:00
|
|
|
static gssize g_unix_output_stream_write (GOutputStream *stream,
|
|
|
|
const void *buffer,
|
|
|
|
gsize count,
|
|
|
|
GCancellable *cancellable,
|
|
|
|
GError **error);
|
|
|
|
static gboolean g_unix_output_stream_close (GOutputStream *stream,
|
|
|
|
GCancellable *cancellable,
|
|
|
|
GError **error);
|
|
|
|
static void g_unix_output_stream_write_async (GOutputStream *stream,
|
|
|
|
const void *buffer,
|
|
|
|
gsize count,
|
|
|
|
int io_priority,
|
|
|
|
GCancellable *cancellable,
|
|
|
|
GAsyncReadyCallback callback,
|
|
|
|
gpointer data);
|
|
|
|
static gssize g_unix_output_stream_write_finish (GOutputStream *stream,
|
|
|
|
GAsyncResult *result,
|
|
|
|
GError **error);
|
|
|
|
static void g_unix_output_stream_close_async (GOutputStream *stream,
|
|
|
|
int io_priority,
|
|
|
|
GCancellable *cancellable,
|
|
|
|
GAsyncReadyCallback callback,
|
|
|
|
gpointer data);
|
|
|
|
static gboolean g_unix_output_stream_close_finish (GOutputStream *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_output_stream_finalize (GObject *object)
|
2007-11-26 17:13:05 +01:00
|
|
|
{
|
2007-11-27 16:08:03 +01:00
|
|
|
GUnixOutputStream *stream;
|
2007-11-26 17:13:05 +01:00
|
|
|
|
2007-11-27 16:08:03 +01:00
|
|
|
stream = G_UNIX_OUTPUT_STREAM (object);
|
2007-11-26 17:13:05 +01:00
|
|
|
|
2008-06-16 11:54:04 +02:00
|
|
|
G_OBJECT_CLASS (g_unix_output_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_output_stream_class_init (GUnixOutputStreamClass *klass)
|
2007-11-26 17:13:05 +01:00
|
|
|
{
|
|
|
|
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
|
|
|
|
GOutputStreamClass *stream_class = G_OUTPUT_STREAM_CLASS (klass);
|
|
|
|
|
2007-11-27 16:08:03 +01:00
|
|
|
g_type_class_add_private (klass, sizeof (GUnixOutputStreamPrivate));
|
2008-12-08 06:41:43 +01:00
|
|
|
|
|
|
|
gobject_class->get_property = g_unix_output_stream_get_property;
|
|
|
|
gobject_class->set_property = g_unix_output_stream_set_property;
|
2007-11-27 16:08:03 +01:00
|
|
|
gobject_class->finalize = g_unix_output_stream_finalize;
|
|
|
|
|
2007-12-05 11:38:03 +01:00
|
|
|
stream_class->write_fn = g_unix_output_stream_write;
|
|
|
|
stream_class->close_fn = g_unix_output_stream_close;
|
2007-11-27 16:08:03 +01:00
|
|
|
stream_class->write_async = g_unix_output_stream_write_async;
|
|
|
|
stream_class->write_finish = g_unix_output_stream_write_finish;
|
|
|
|
stream_class->close_async = g_unix_output_stream_close_async;
|
|
|
|
stream_class->close_finish = g_unix_output_stream_close_finish;
|
2008-12-08 06:41:43 +01:00
|
|
|
|
|
|
|
/**
|
|
|
|
* GUnixOutputStream:fd:
|
|
|
|
*
|
|
|
|
* The file descriptor that the stream writes to.
|
|
|
|
*
|
|
|
|
* Since: 2.20
|
|
|
|
*/
|
|
|
|
g_object_class_install_property (gobject_class,
|
|
|
|
PROP_FD,
|
|
|
|
g_param_spec_int ("fd",
|
2009-04-22 15:12:37 +02:00
|
|
|
P_("File descriptor"),
|
|
|
|
P_("The file descriptor to write to"),
|
2008-12-08 06:41:43 +01:00
|
|
|
G_MININT, G_MAXINT, -1,
|
|
|
|
G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
|
|
|
|
|
|
|
|
/**
|
|
|
|
* GUnixOutputStream:close-fd:
|
|
|
|
*
|
|
|
|
* Whether to close the file descriptor when the stream is closed.
|
|
|
|
*
|
|
|
|
* Since: 2.20
|
|
|
|
*/
|
|
|
|
g_object_class_install_property (gobject_class,
|
|
|
|
PROP_CLOSE_FD,
|
|
|
|
g_param_spec_boolean ("close-fd",
|
2009-04-22 15:12:37 +02:00
|
|
|
P_("Close file descriptor"),
|
|
|
|
P_("Whether to close the file descriptor when the stream is closed"),
|
2008-12-08 06:41:43 +01:00
|
|
|
TRUE,
|
|
|
|
G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
g_unix_output_stream_set_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
const GValue *value,
|
|
|
|
GParamSpec *pspec)
|
|
|
|
{
|
|
|
|
GUnixOutputStream *unix_stream;
|
|
|
|
|
|
|
|
unix_stream = G_UNIX_OUTPUT_STREAM (object);
|
|
|
|
|
|
|
|
switch (prop_id)
|
|
|
|
{
|
|
|
|
case PROP_FD:
|
|
|
|
unix_stream->priv->fd = g_value_get_int (value);
|
|
|
|
break;
|
|
|
|
case PROP_CLOSE_FD:
|
|
|
|
unix_stream->priv->close_fd = g_value_get_boolean (value);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
g_unix_output_stream_get_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
GValue *value,
|
|
|
|
GParamSpec *pspec)
|
|
|
|
{
|
|
|
|
GUnixOutputStream *unix_stream;
|
|
|
|
|
|
|
|
unix_stream = G_UNIX_OUTPUT_STREAM (object);
|
|
|
|
|
|
|
|
switch (prop_id)
|
|
|
|
{
|
|
|
|
case PROP_FD:
|
|
|
|
g_value_set_int (value, unix_stream->priv->fd);
|
|
|
|
break;
|
|
|
|
case PROP_CLOSE_FD:
|
|
|
|
g_value_set_boolean (value, unix_stream->priv->close_fd);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
}
|
2007-11-26 17:13:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2007-11-27 16:08:03 +01:00
|
|
|
g_unix_output_stream_init (GUnixOutputStream *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_OUTPUT_STREAM,
|
|
|
|
GUnixOutputStreamPrivate);
|
2007-11-26 17:13:05 +01:00
|
|
|
|
2008-12-08 06:41:43 +01:00
|
|
|
unix_stream->priv->fd = -1;
|
|
|
|
unix_stream->priv->close_fd = TRUE;
|
|
|
|
}
|
2007-11-26 17:13:05 +01:00
|
|
|
|
|
|
|
/**
|
2007-11-27 16:08:03 +01:00
|
|
|
* g_unix_output_stream_new:
|
2008-12-08 06:41:43 +01:00
|
|
|
* @fd: a UNIX file descriptor
|
|
|
|
* @close_fd: %TRUE to close the file descriptor when done
|
2007-11-27 15:00:13 +01:00
|
|
|
*
|
2008-12-08 06:41:43 +01:00
|
|
|
* Creates a new #GUnixOutputStream for the given @fd.
|
2007-11-26 17:13:05 +01:00
|
|
|
*
|
2008-12-08 06:41:43 +01:00
|
|
|
* If @close_fd, is %TRUE, the file descriptor will be closed when
|
|
|
|
* the output stream is destroyed.
|
|
|
|
*
|
|
|
|
* Returns: a new #GOutputStream
|
2007-11-26 17:13:05 +01:00
|
|
|
**/
|
|
|
|
GOutputStream *
|
2008-12-08 06:41:43 +01:00
|
|
|
g_unix_output_stream_new (gint fd,
|
|
|
|
gboolean close_fd)
|
2007-11-26 17:13:05 +01:00
|
|
|
{
|
2007-11-27 16:08:03 +01:00
|
|
|
GUnixOutputStream *stream;
|
2007-11-26 17:13:05 +01:00
|
|
|
|
|
|
|
g_return_val_if_fail (fd != -1, NULL);
|
|
|
|
|
2008-12-08 06:41:43 +01:00
|
|
|
stream = g_object_new (G_TYPE_UNIX_OUTPUT_STREAM,
|
|
|
|
"fd", fd,
|
|
|
|
"close-fd", close_fd,
|
|
|
|
NULL);
|
2007-11-26 17:13:05 +01:00
|
|
|
|
|
|
|
return G_OUTPUT_STREAM (stream);
|
|
|
|
}
|
|
|
|
|
2008-12-08 06:41:43 +01:00
|
|
|
/**
|
|
|
|
* g_unix_output_stream_set_close_fd:
|
|
|
|
* @stream: a #GUnixOutputStream
|
|
|
|
* @close_fd: %TRUE to close the file descriptor when done
|
|
|
|
*
|
|
|
|
* Sets whether the file descriptor of @stream shall be closed
|
|
|
|
* when the stream is closed.
|
|
|
|
*
|
|
|
|
* Since: 2.20
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
g_unix_output_stream_set_close_fd (GUnixOutputStream *stream,
|
|
|
|
gboolean close_fd)
|
|
|
|
{
|
|
|
|
g_return_if_fail (G_IS_UNIX_OUTPUT_STREAM (stream));
|
|
|
|
|
|
|
|
close_fd = close_fd != FALSE;
|
|
|
|
if (stream->priv->close_fd != close_fd)
|
|
|
|
{
|
|
|
|
stream->priv->close_fd = close_fd;
|
|
|
|
g_object_notify (G_OBJECT (stream), "close-fd");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* g_unix_output_stream_get_close_fd:
|
|
|
|
* @stream: a #GUnixOutputStream
|
|
|
|
*
|
|
|
|
* Returns whether the file descriptor of @stream will be
|
|
|
|
* closed when the stream is closed.
|
|
|
|
*
|
|
|
|
* Return value: %TRUE if the file descriptor is closed when done
|
|
|
|
*
|
|
|
|
* Since: 2.20
|
|
|
|
*/
|
|
|
|
gboolean
|
|
|
|
g_unix_output_stream_get_close_fd (GUnixOutputStream *stream)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (G_IS_UNIX_OUTPUT_STREAM (stream), FALSE);
|
|
|
|
|
|
|
|
return stream->priv->close_fd;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* g_unix_output_stream_get_fd:
|
|
|
|
* @stream: a #GUnixOutputStream
|
|
|
|
*
|
|
|
|
* Return the UNIX file descriptor that the stream writes to.
|
|
|
|
*
|
|
|
|
* Return value: The file descriptor of @stream
|
|
|
|
*
|
|
|
|
* Since: 2.20
|
|
|
|
*/
|
|
|
|
gint
|
|
|
|
g_unix_output_stream_get_fd (GUnixOutputStream *stream)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (G_IS_UNIX_OUTPUT_STREAM (stream), -1);
|
|
|
|
|
|
|
|
return stream->priv->fd;
|
|
|
|
}
|
|
|
|
|
2007-11-26 17:13:05 +01:00
|
|
|
static gssize
|
2007-11-30 06:11:25 +01:00
|
|
|
g_unix_output_stream_write (GOutputStream *stream,
|
|
|
|
const void *buffer,
|
|
|
|
gsize count,
|
|
|
|
GCancellable *cancellable,
|
|
|
|
GError **error)
|
2007-11-26 17:13:05 +01:00
|
|
|
{
|
2007-11-27 16:08:03 +01:00
|
|
|
GUnixOutputStream *unix_stream;
|
2007-11-26 17:13:05 +01:00
|
|
|
gssize res;
|
2008-09-26 18:19:35 +02:00
|
|
|
GPollFD poll_fds[2];
|
2007-11-26 17:13:05 +01:00
|
|
|
int poll_ret;
|
|
|
|
|
2007-11-27 16:08:03 +01:00
|
|
|
unix_stream = G_UNIX_OUTPUT_STREAM (stream);
|
2007-11-26 17:13:05 +01:00
|
|
|
|
2008-09-26 18:19:35 +02:00
|
|
|
if (cancellable)
|
2007-11-26 17:13:05 +01:00
|
|
|
{
|
2008-09-26 18:19:35 +02:00
|
|
|
poll_fds[0].fd = unix_stream->priv->fd;
|
|
|
|
poll_fds[0].events = G_IO_OUT;
|
|
|
|
g_cancellable_make_pollfd (cancellable, &poll_fds[1]);
|
2007-11-26 17:13:05 +01:00
|
|
|
do
|
2008-09-26 18:19:35 +02:00
|
|
|
poll_ret = g_poll (poll_fds, 2, -1);
|
2007-11-26 17:13:05 +01:00
|
|
|
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 writing to 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))
|
|
|
|
return -1;
|
|
|
|
|
2007-11-27 16:08:03 +01:00
|
|
|
res = write (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 writing to 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_output_stream_close (GOutputStream *stream,
|
|
|
|
GCancellable *cancellable,
|
|
|
|
GError **error)
|
2007-11-26 17:13:05 +01:00
|
|
|
{
|
2007-11-27 16:08:03 +01:00
|
|
|
GUnixOutputStream *unix_stream;
|
2007-11-26 17:13:05 +01:00
|
|
|
int res;
|
|
|
|
|
2007-11-27 16:08:03 +01:00
|
|
|
unix_stream = G_UNIX_OUTPUT_STREAM (stream);
|
2007-11-26 17:13:05 +01:00
|
|
|
|
2008-12-08 06:41:43 +01:00
|
|
|
if (!unix_stream->priv->close_fd)
|
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;
|
|
|
|
|
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 closing 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 != -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
gsize count;
|
|
|
|
const void *buffer;
|
|
|
|
GAsyncReadyCallback callback;
|
|
|
|
gpointer user_data;
|
|
|
|
GCancellable *cancellable;
|
2007-11-27 16:08:03 +01:00
|
|
|
GUnixOutputStream *stream;
|
2007-11-26 17:13:05 +01:00
|
|
|
} WriteAsyncData;
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
write_async_cb (WriteAsyncData *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_written;
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
if (g_cancellable_set_error_if_cancelled (data->cancellable, &error))
|
|
|
|
{
|
|
|
|
count_written = -1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
count_written = write (data->stream->priv->fd, data->buffer, data->count);
|
|
|
|
if (count_written == -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_output_stream_write_async);
|
2007-11-26 17:13:05 +01:00
|
|
|
|
|
|
|
g_simple_async_result_set_op_res_gssize (simple, count_written);
|
|
|
|
|
|
|
|
if (count_written == -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-30 06:11:25 +01:00
|
|
|
g_unix_output_stream_write_async (GOutputStream *stream,
|
|
|
|
const 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
|
|
|
GUnixOutputStream *unix_stream;
|
2007-11-26 17:13:05 +01:00
|
|
|
WriteAsyncData *data;
|
|
|
|
|
2007-11-27 16:08:03 +01:00
|
|
|
unix_stream = G_UNIX_OUTPUT_STREAM (stream);
|
2007-11-26 17:13:05 +01:00
|
|
|
|
|
|
|
data = g_new0 (WriteAsyncData, 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,
|
2008-09-26 18:19:35 +02:00
|
|
|
G_IO_OUT,
|
2007-11-26 17:13:05 +01:00
|
|
|
cancellable);
|
|
|
|
|
|
|
|
g_source_set_callback (source, (GSourceFunc)write_async_cb, data, g_free);
|
2009-06-17 02:22:58 +02:00
|
|
|
g_source_attach (source, g_main_context_get_thread_default ());
|
2007-11-26 17:13:05 +01:00
|
|
|
|
|
|
|
g_source_unref (source);
|
|
|
|
}
|
|
|
|
|
|
|
|
static gssize
|
2007-11-30 06:11:25 +01:00
|
|
|
g_unix_output_stream_write_finish (GOutputStream *stream,
|
|
|
|
GAsyncResult *result,
|
|
|
|
GError **error)
|
2007-11-26 17:13:05 +01:00
|
|
|
{
|
|
|
|
GSimpleAsyncResult *simple;
|
|
|
|
gssize nwritten;
|
|
|
|
|
|
|
|
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_output_stream_write_async);
|
2007-11-26 17:13:05 +01:00
|
|
|
|
|
|
|
nwritten = g_simple_async_result_get_op_res_gssize (simple);
|
|
|
|
return nwritten;
|
|
|
|
}
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
GOutputStream *stream;
|
|
|
|
GAsyncReadyCallback callback;
|
|
|
|
gpointer user_data;
|
|
|
|
} CloseAsyncData;
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
close_async_cb (CloseAsyncData *data)
|
|
|
|
{
|
2007-11-27 16:08:03 +01:00
|
|
|
GUnixOutputStream *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_OUTPUT_STREAM (data->stream);
|
2007-11-26 17:13:05 +01:00
|
|
|
|
2008-12-08 06:41:43 +01:00
|
|
|
if (!unix_stream->priv->close_fd)
|
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;
|
|
|
|
|
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 closing 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;
|
|
|
|
}
|
|
|
|
|
|
|
|
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_output_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_output_stream_close_async (GOutputStream *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, g_free);
|
2009-06-17 02:22:58 +02:00
|
|
|
g_source_attach (idle, g_main_context_get_thread_default ());
|
2007-11-26 17:13:05 +01:00
|
|
|
g_source_unref (idle);
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2007-11-30 06:11:25 +01:00
|
|
|
g_unix_output_stream_close_finish (GOutputStream *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_OUTPUT_STREAM_C__
|
|
|
|
#include "gioaliasdef.c"
|