gvfs r2286 - in trunk: . client

[alexl svn gnome org]

Author: alexl
Date: Wed Mar  4 18:27:10 2009
New Revision: 2286
URL: http://svn.gnome.org/viewvc/gvfs?rev=2286&view=rev

Log:
2009-03-04  Alexander Larsson  <alexl redhat com>

	Bug 573837 â gvfs-fuse does not support ftruncate size != 0

        * client/gvfsfusedaemon.c:
	Support ftruncate to the current size as a NOP.
	Fixes OOo saving



Modified:
   trunk/ChangeLog
   trunk/client/gvfsfusedaemon.c

Modified: trunk/client/gvfsfusedaemon.c
==============================================================================
--- trunk/client/gvfsfusedaemon.c	(original)
+++ trunk/client/gvfsfusedaemon.c	Wed Mar  4 18:27:10 2009
@@ -75,8 +75,7 @@
   gchar    *path;
   FileOp    op;
   gpointer  stream;
-  gint      length;
-  size_t    pos;
+  goffset   pos;
 } FileHandle;
 
 static GThread        *subthread             = NULL;
@@ -1739,12 +1738,46 @@
   return result;
 }
 
+static gboolean
+file_handle_get_size (FileHandle *fh,
+		      goffset *size)
+{
+  GFileInfo *info;
+  gboolean res;
+
+  if (fh->stream == NULL)
+    return FALSE;
+  
+  info = NULL;
+  if (fh->op == FILE_OP_READ)
+    info = g_file_input_stream_query_info (fh->stream,
+					   G_FILE_ATTRIBUTE_STANDARD_SIZE,
+					   NULL, NULL);
+  else if (fh->op == FILE_OP_WRITE)
+    info = g_file_output_stream_query_info (fh->stream,
+					    G_FILE_ATTRIBUTE_STANDARD_SIZE,
+					    NULL, NULL);
+
+  res = FALSE;
+  if (info)
+    {
+      if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_SIZE))
+	{
+	  *size = g_file_info_get_size (info);
+	  res = TRUE;
+	}
+      g_object_unref (info);
+    }
+  return res;
+}
+
 static gint
 vfs_ftruncate (const gchar *path, off_t size, struct fuse_file_info *fi)
 {
   GFile  *file;
   GError *error  = NULL;
   gint    result = 0;
+  goffset current_size;
 
   debug_print ("vfs_ftruncate: %s\n", path);
 
@@ -1784,9 +1817,14 @@
                       fh->stream = NULL;
                     }
                 }
-              else
-                {
-                  result = -ENOTSUP;
+              else if (file_handle_get_size (fh, &current_size) &&
+		       current_size == size)
+		{
+		  /* Don't have to do anything to succeed */
+		}
+	      else
+		{
+		  result = -ENOTSUP;
                 }
 
               if (error)