--- fuse-comp.pl	2007/07/09 21:57:11	24
+++ fuse-comp.pl	2007/07/09 22:44:20	25
@@ -76,20 +76,6 @@
 	return unpack("L", $buff);
 }
 
-sub unlink_all {
-	my $file = shift;
-	warn "# unlink_all( $file )\n";
-
-	my $path = fixup( $file );
-	unlink $path || return 0;
-
-	my $tmp = $mount->{tmp} . '/' . $file;
-	unlink $tmp if ( -e $tmp );
-
-	delete( $pending->{$file} );
-	return 1;
-}
-
 sub x_getattr {
 	my ($file) = fixup(shift);
 	my (@list) = lstat($file);
@@ -207,6 +193,7 @@
 
 sub x_write {
 	my ($file,$buf,$off) = @_;
+
 	$pending->{$file}->{write}++;
 	my $rv;
 	my $path = fixup($file);
@@ -229,7 +216,24 @@
 sub err { return (-shift || -$!) }
 
 sub x_readlink { return readlink(fixup(shift));         }
-sub x_unlink   { return unlink_all( shift ) ? 0 : -$! }
+sub x_unlink   {
+	my $file = shift;
+	my $path = fixup( $file );
+
+	if ( $file =~ m#\Q/.fuse_hidden\E# ) {
+		return unlink $path ? 0 : -$1;
+	}
+
+	warn "# unlink( $file )\n";
+
+	unlink $path || return 0;
+
+	my $tmp = $mount->{tmp} . '/' . $file;
+	unlink $tmp if ( -e $tmp );
+
+	delete( $pending->{$file} );
+	return 0;
+}
 
 sub x_symlink { return symlink(shift,fixup(shift)) ? 0 : -$!; }
 
@@ -244,8 +248,12 @@
 
 	my $tmp = $mount->{tmp} . '/' . $old;
 	if ( -e $tmp ) {
-		my $new_tmp = $mount->{tmp} . '/' . $new;
-		rename $tmp, $new_tmp || confess "can't rename $tmp -> $new_tmp : $!";
+		if ( $new =~ m#\Q/.fuse_hidden\E# ) {
+			unlink $tmp || confess "can't unlink $tmp for $new\n";
+		} else {
+			my $new_tmp = $mount->{tmp} . '/' . $new;
+			rename $tmp, $new_tmp || confess "can't rename $tmp -> $new_tmp : $!";
+		}
 	}
 
 	if (defined( $pending->{$old} )) {
@@ -254,9 +262,9 @@
 		my $path = $pending->{$old}->{path};
 		$path =~ s/\Q$old\E/$new/;
 		$pending->{$new}->{path} = $path;
-		$pending->{$old}->{path} = $path;
 
-		#delete( $pending->{$old} );
+		delete( $pending->{$old} );
+		warn "## tweaking pending to ", dump( $pending ) if $debug;
 	}
 
 	return $err;
@@ -312,6 +320,13 @@
 
 sub x_release {
 	my ( $file, $mode ) = @_;
+
+	if ( $file =~ m#\Q/.fuse_hidden\E# ) {
+		warn "release internal $file\n" if $debug;
+		delete( $pending->{$file} );
+		return 0;
+	}
+
 	if ( ! defined( $pending->{$file} ) ) {
 		warn "release $file, NO PENDING DATA\n";
 		return 0;