File gvfs-support-nop-ftruncate.patch of Package gvfs

Overview Repositories Revisions Requests Users Attributes Meta

File gvfs-support-nop-ftruncate.patch of Package gvfs (Revision c33e15b763047427445e6b6f3099a96a)

Currently displaying revision c33e15b763047427445e6b6f3099a96a , Show latest

diff --git a/client/gvfsfusedaemon.c b/client/gvfsfusedaemon.c
index c35e082..4382721 100644
--- a/client/gvfsfusedaemon.c
+++ b/client/gvfsfusedaemon.c
@@ -1857,26 +1857,16 @@ vfs_rmdir (const gchar *path)
 }
 
 static gboolean
-file_handle_get_size (FileHandle *fh,
+file_get_size (GFile *file,
 		      goffset *size)
 {
-  GFileInfo *info;
+  GFileInfo *info = NULL;
+  GError *error = NULL;
   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;
+  info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_SIZE, 0, NULL, &error);
+  
   if (info)
     {
       if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_SIZE))
@@ -1886,6 +1876,10 @@ file_handle_get_size (FileHandle *fh,
 	}
       g_object_unref (info);
     }
+
+  if (error)
+      g_error_free (error);
+
   return res;
 }
 
@@ -1940,7 +1934,7 @@ truncate_stream (GFile *file, FileHandle *fh, off_t size)
           fh->stream = NULL;
         }
     }
-  else if (file_handle_get_size (fh, &current_size))
+  else if (file_get_size (file, &current_size))
     {
       if (current_size == size)
         {

Places

File gvfs-support-nop-ftruncate.patch of Package gvfs (Revision c33e15b763047427445e6b6f3099a96a)

Places