Attachment 611844 Details for Bug 844713 – proposed patch

[patch] proposed patch

nautilus-2.28.4-statfs-symlink.patch (text/plain), 1.58 KB, created by Tomáš Bžatek on 2012-09-11 15:53:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomáš Bžatek

Created: 2012-09-11 15:53:17 UTC

Size: 1.58 KB

patch

obsolete

>diff -up nautilus-2.28.4/libnautilus-private/nautilus-file-operations.c.bak nautilus-2.28.4/libnautilus-private/nautilus-file-operations.c
>--- nautilus-2.28.4/libnautilus-private/nautilus-file-operations.c.bak	2012-09-11 17:45:02.663019906 +0200
>+++ nautilus-2.28.4/libnautilus-private/nautilus-file-operations.c	2012-09-11 17:40:28.000000000 +0200
>@@ -2673,6 +2673,7 @@ verify_destination (CommonJob *job,
> 	char *primary, *secondary, *details;
> 	int response;
> 	GFileType file_type;
>+	gboolean dest_is_symlink = FALSE;
> 
> 	if (dest_fs_id) {
> 		*dest_fs_id = NULL;
>@@ -2684,7 +2685,7 @@ verify_destination (CommonJob *job,
> 	info = g_file_query_info (dest, 
> 				  G_FILE_ATTRIBUTE_STANDARD_TYPE","
> 				  G_FILE_ATTRIBUTE_ID_FILESYSTEM,
>-				  0,
>+				  dest_is_symlink ? G_FILE_QUERY_INFO_NONE : G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
> 				  job->cancellable,
> 				  &error);
> 
>@@ -2726,6 +2727,12 @@ verify_destination (CommonJob *job,
> 	}
> 
> 	file_type = g_file_info_get_file_type (info);
>+	if (!dest_is_symlink && file_type == G_FILE_TYPE_SYMBOLIC_LINK) {
>+		/* Record that destination is a symlink and do real stat() once again */
>+		dest_is_symlink = TRUE;
>+		g_object_unref (info);
>+		goto retry;
>+	}
> 
> 	if (dest_fs_id) {
> 		*dest_fs_id =
>@@ -2751,6 +2758,11 @@ verify_destination (CommonJob *job,
> 		return;
> 	}
> 	
>+	if (dest_is_symlink) {
>+		/* We can't reliably statfs() destination if it's a symlink, thus not doing any further checks. */
>+		return;
>+	}
>+	
> 	fsinfo = g_file_query_filesystem_info (dest,
> 					       G_FILE_ATTRIBUTE_FILESYSTEM_FREE","
> 					       G_FILE_ATTRIBUTE_FILESYSTEM_READONLY,

Actions: View | Diff

Attachments on bug 844713: 611844