Attachment 294900 Details for Bug 432764 – add flag to enable recursion despite error

[patch] add flag to enable recursion despite error

gnome-vfs2.patch (text/plain), 1.30 KB, created by ritz on 2008-02-14 09:46:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ritz

Created: 2008-02-14 09:46:05 UTC

Size: 1.30 KB

patch

obsolete

>diff -Naur gnome-vfs-2.16.2.orig/libgnomevfs/gnome-vfs-directory.c gnome-vfs-2.16.2/libgnomevfs/gnome-vfs-directory.c
>--- gnome-vfs-2.16.2.orig/libgnomevfs/gnome-vfs-directory.c	2008-02-10 05:50:00.000000000 +0530
>+++ gnome-vfs-2.16.2/libgnomevfs/gnome-vfs-directory.c	2008-02-10 05:50:27.000000000 +0530
>@@ -434,8 +434,15 @@
> 				ancestor_references = remove_first_reference
> 					(ancestor_references);
> 
>-			if (result != GNOME_VFS_OK)
>-				stop = TRUE;
>+			if (result != GNOME_VFS_OK) {
>+				if (visit_options &
>+				    GNOME_VFS_DIRECTORY_VISIT_IGNORE_RECURSE_ERROR) {
>+					result = GNOME_VFS_OK;
>+				}
>+				else {
>+					stop = TRUE;
>+				}
>+			}
> 
> 			gnome_vfs_uri_unref (new_uri);
> 			g_free (new_prefix);
>diff -Naur gnome-vfs-2.16.2.orig/libgnomevfs/gnome-vfs-directory.h gnome-vfs-2.16.2/libgnomevfs/gnome-vfs-directory.h
>--- gnome-vfs-2.16.2.orig/libgnomevfs/gnome-vfs-directory.h	2008-02-10 05:50:00.000000000 +0530
>+++ gnome-vfs-2.16.2/libgnomevfs/gnome-vfs-directory.h	2008-02-10 05:50:27.000000000 +0530
>@@ -53,7 +53,8 @@
> typedef enum {
> 	GNOME_VFS_DIRECTORY_VISIT_DEFAULT = 0,
> 	GNOME_VFS_DIRECTORY_VISIT_SAMEFS = 1 << 0,
>-	GNOME_VFS_DIRECTORY_VISIT_LOOPCHECK = 1 << 1
>+	GNOME_VFS_DIRECTORY_VISIT_LOOPCHECK = 1 << 1,
>+	GNOME_VFS_DIRECTORY_VISIT_IGNORE_RECURSE_ERROR = 1 << 2
> } GnomeVFSDirectoryVisitOptions;
> 
> /**

Actions: View | Diff

Attachments on bug 432764: 294900