* 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.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* Author: Alexander Larsson <alexl@redhat.com>
*/
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
#include <errno.h>
#include <string.h>
#include "glocalfileinfo.h"
#ifdef G_OS_UNIX
+#include <unistd.h>
#include "gfiledescriptorbased.h"
#endif
#define O_BINARY 0
#endif
+struct _GLocalFileOutputStreamPrivate {
+ char *tmp_filename;
+ char *original_filename;
+ char *backup_filename;
+ char *etag;
+ guint sync_on_close : 1;
+ guint do_close : 1;
+ int fd;
+};
#ifdef G_OS_UNIX
static void g_file_descriptor_based_iface_init (GFileDescriptorBasedIface *iface);
#define g_local_file_output_stream_get_type _g_local_file_output_stream_get_type
#ifdef G_OS_UNIX
G_DEFINE_TYPE_WITH_CODE (GLocalFileOutputStream, g_local_file_output_stream, G_TYPE_FILE_OUTPUT_STREAM,
+ G_ADD_PRIVATE (GLocalFileOutputStream)
G_IMPLEMENT_INTERFACE (G_TYPE_FILE_DESCRIPTOR_BASED,
- g_file_descriptor_based_iface_init)
- );
+ g_file_descriptor_based_iface_init))
#else
-G_DEFINE_TYPE_WITH_CODE (GLocalFileOutputStream, g_local_file_output_stream, G_TYPE_FILE_OUTPUT_STREAM,);
+G_DEFINE_TYPE_WITH_CODE (GLocalFileOutputStream, g_local_file_output_stream, G_TYPE_FILE_OUTPUT_STREAM,
+ G_ADD_PRIVATE (GLocalFileOutputStream))
#endif
#define BACKUP_EXTENSION "~"
-struct _GLocalFileOutputStreamPrivate {
- char *tmp_filename;
- char *original_filename;
- char *backup_filename;
- char *etag;
- guint sync_on_close : 1;
- guint do_close : 1;
- int fd;
-};
-
static gssize g_local_file_output_stream_write (GOutputStream *stream,
const void *buffer,
gsize count,
G_OBJECT_CLASS (g_local_file_output_stream_parent_class)->finalize (object);
}
-
static void
g_local_file_output_stream_class_init (GLocalFileOutputStreamClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GOutputStreamClass *stream_class = G_OUTPUT_STREAM_CLASS (klass);
GFileOutputStreamClass *file_stream_class = G_FILE_OUTPUT_STREAM_CLASS (klass);
-
- g_type_class_add_private (klass, sizeof (GLocalFileOutputStreamPrivate));
-
+
gobject_class->finalize = g_local_file_output_stream_finalize;
stream_class->write_fn = g_local_file_output_stream_write;
static void
g_local_file_output_stream_init (GLocalFileOutputStream *stream)
{
- stream->priv = G_TYPE_INSTANCE_GET_PRIVATE (stream,
- G_TYPE_LOCAL_FILE_OUTPUT_STREAM,
- GLocalFileOutputStreamPrivate);
+ stream->priv = g_local_file_output_stream_get_instance_private (stream);
stream->priv->do_close = TRUE;
}
if (g_cancellable_set_error_if_cancelled (cancellable, error))
goto err_out;
-#ifdef HAVE_LINK
+#ifdef G_OS_UNIX
/* create original -> backup link, the original is then renamed over */
if (g_unlink (file->priv->backup_filename) != 0 &&
errno != ENOENT)