--- fuse-comp.pl	2007/07/09 22:44:20	25
+++ fuse-comp.pl	2007/07/10 01:10:49	28
@@ -42,13 +42,18 @@
 
 my $pending;
 
+sub real_name {
+	my ( $dir, $name ) = @_;
+	if ( -e "$dir/${name}.gz" ) {
+		confess "ASSERT: unexpected $dir/$name exists" if -e "$dir/$name";
+		return "${name}.gz";
+	}
+	return $name;
+}
+
 sub fixup {
 	my ( $path ) = @_;
-	my $full = $mount->{from} . '/' . $path;
-	if ( -e $full . '.gz' ) {
-		return $full . '.gz';
-	}
-	return $full;
+	return $mount->{from} . '/' . real_name( $mount->{from}, $path );
 }
 
 sub original_name {
@@ -117,6 +122,63 @@
 	undef $s;
 }
 
+sub create_tmp_file {
+	my $file = shift;
+
+	my $path = fixup( $file );
+	my $tmp = $mount->{tmp} . '/' . $file;
+	if ( -e $tmp ) {
+		$path = $tmp;
+	} elsif ( $path =~ m/\.gz$/ ) {
+		my $dest_path = $tmp;
+		$dest_path =~ s!/[^/]+$!!;	#!vim-fix
+		mkpath $dest_path unless -e $dest_path;
+		if ( -s $path ) {
+			file_copy( '<:gzip', $path, '>', $tmp )
+		} else {
+			warn "ERROR: filesystem corruption, $path is zero size\n";
+		}
+		$path = $tmp;
+	}
+	warn "## create_temp_file( $file ) => $path [", -s $path, "]\n";
+	return $path;
+}
+
+sub compress_path_dest {
+	my ( $path, $dest ) = @_;
+
+	# cleanup old compressed copy
+	if ( $dest =~ /\.gz$/ ) {
+		warn "## remove old $dest\n";
+		unlink $dest || confess "can't remove $dest: $!";
+		$dest =~ s/\.gz$//;
+	}
+
+	if ( $path =~ $skip_extensions_regex ) {
+		warn "$path [",-s $path,"] skipped compression\n";
+		file_copy( '<', $path, '>', $dest ) if ( $path ne $dest );
+	} elsif ( -s $path < $min_compress_size ) {
+		warn "$path [",-s $path,"] uncompressed, too small\n";
+		file_copy( '<', $path, '>', $dest ) if ( $path ne $dest );
+	} else {
+		warn "$path [",-s $path,"] compressing\n";
+
+		my $comp = $dest . '.gz';
+		file_copy( '<', $path, '>:gzip', $comp );
+
+		my ( $size_path, $size_comp ) = ( -s $path, -s $comp );
+
+		if ( $size_path <= $size_comp ) {
+			warn ">>> $size_path <= $size_comp leaving uncompressed\n";
+			unlink $comp || confess "can't remove: $comp: $!";
+		} else {
+			warn ">>> compressed $size_path -> $size_comp ",int(($size_comp * 100) / $size_path),"%\n";
+			# FIXME add timeout to remove uncompressed version?
+			unlink $path || confess "can't remove $path: $!";
+		}
+	}
+}
+
 sub x_open {
 	my ($file) = shift;
 	my ($mode) = shift;
@@ -141,24 +203,12 @@
 		create => $mode && O_CREAT,
 		trunc => $mode && O_TRUNC,
 	};
-	my $path = fixup($file);
+
+	my $path = create_tmp_file( $file );
+
 	warn "## open( $file, $mode ) pending: ", $pending->{$file}->{open}, " mode $mode: ", dump( $mode_desc )," $path [", -s $path, "]\n" if $debug;
-	my $fh;
 
-	my $tmp = $mount->{tmp} . '/' . $file;
-	if ( -e $tmp ) {
-		$path = $tmp;
-	} elsif ( $path =~ m/\.gz$/ ) {
-		my $dest_path = $tmp;
-		$dest_path =~ s!/[^/]+$!!;	#!vim-fix
-		mkpath $dest_path unless -e $dest_path;
-		if ( -s $path ) {
-			file_copy( '<:gzip', $path, '>', $tmp )
-		} else {
-			warn "ERROR: filesystem corruption, $path is zero size\n";
-		}
-		$path = $tmp;
-	}
+	my $fh;
 
 	if ( sysopen($fh , $path, $mode) ) {
 		close($fh) || confess "can't close $path: $!";
@@ -166,7 +216,7 @@
 		$pending->{$file}->{path} = $path;
 		return 0;
 	} else {
-		warn "ERROR: can't open $path : $!";
+		warn "ERROR: can't open $path -- $!";
 		return -$!;
 	}
 
@@ -194,7 +244,6 @@
 sub x_write {
 	my ($file,$buf,$off) = @_;
 
-	$pending->{$file}->{write}++;
 	my $rv;
 	my $path = fixup($file);
 
@@ -202,20 +251,25 @@
 
 	return -ENOENT() unless -e $path;
 
+	$path = $pending->{$file}->{path} || confess "no path for $file in ", dump( $pending );
+	confess "write into non-existant $path for $file: $!" unless -e $path;
+
 	my $fh = new IO::File;
-	return -ENOSYS() unless open($fh,'+<',$pending->{$file}->{path});
+	return -ENOSYS() unless open($fh,'+<',$path);
 	if($rv = seek( $fh ,$off,SEEK_SET)) {
 		$rv = print( $fh $buf );
-		warn "## write ", $pending->{$file}->{path}, " $off ",length( $buf ), "\n" if $debug;
+		warn "## write $path offset $off [",length( $buf ), "]\n" if $debug;
+		$pending->{$file}->{write}++;
 	}
 	$rv = -ENOSYS() unless $rv;
-	close($fh);
+	close($fh) || warn "can't close $path: $!";
 	return length($buf);
 }
 
 sub err { return (-shift || -$!) }
 
-sub x_readlink { return readlink(fixup(shift));         }
+sub x_readlink { return readlink(fixup(shift)); }
+
 sub x_unlink   {
 	my $file = shift;
 	my $path = fixup( $file );
@@ -235,7 +289,36 @@
 	return 0;
 }
 
-sub x_symlink { return symlink(shift,fixup(shift)) ? 0 : -$!; }
+sub x_symlink {
+	my ($from,$to) = @_;
+
+	my $from_path = $from;	#fixup( $from );
+	my $to_path = fixup( $to );
+
+	my $rv = symlink( $from_path, $to_path ) ? 0 : -$!;
+	warn "# symlink( $from_path -> $to_path ) = $rv\n" if $debug;
+
+	my $tmp = $mount->{tmp} . '/' . $from;
+	if ( -e $tmp ) {
+		my $tmp_to = $mount->{$tmp} . '/' . $to;
+		symlink( $tmp, $tmp_to ) || confess "can't symlink $tmp -> $tmp_to: $!";
+	}
+	return $rv;
+}
+
+sub x_link {
+	my ($from,$to) = @_;
+
+	my $from_path = fixup($from);
+	my $to_path = fixup($to);
+	$to_path .= '.gz' if ( $from_path =~ m/\.gz$/ && $to_path !~ m/\.gz$/ );
+
+	my $rv = link( $from_path, $to_path ) ? 0 : -$!;
+
+	warn "# link( $from_path -> $to_path ) = $rv\n" if $debug;
+
+	return $rv;
+}
 
 sub x_rename {
 	my ($old,$new) = @_;
@@ -269,17 +352,20 @@
 
 	return $err;
 }
-sub x_link { return link(fixup(shift),fixup(shift)) ? 0 : -$! }
 
 sub x_chown {
-	my ($path) = fixup(shift);
+	my ($file,$uid,$gid) = @_;
+	my $path = fixup($file);
 	print "nonexistent $path\n" unless -e $path;
-	my ($uid,$gid) = @_;
 	# perl's chown() does not chown symlinks, it chowns the symlink's
 	# target.  it fails when the link's target doesn't exist, because
 	# the stat64() syscall fails.
 	# this causes error messages when unpacking symlinks in tarballs.
 	my ($err) = syscall(&SYS_lchown,$path,$uid,$gid,$path) ? -$! : 0;
+
+	my $tmp = $mount->{tmp} . '/' . $file;
+	syscall(&SYS_lchown,$file,$uid,$gid,$path) if -e $tmp;
+
 	return $err;
 }
 
@@ -292,17 +378,24 @@
 
 sub x_truncate {
 	my ( $file,$size ) = @_;
-	my $path = fixup($file);
-	my $rv = truncate( $path, $size ) ? 0 : -$! ;
-	if ( $path =~ m/\.gz$/ ) {
-		my $no_gz = $path;
-		$no_gz =~ s/\.gz$//;
-		rename $path, $no_gz || confess "can't rename $path -> $no_gz: $!";
+
+	#confess "no pending file $file to truncate in ", dump( $pending ) unless defined( $pending->{$file} );
+
+	my $path;
+
+	if (defined( $pending->{$file} )) {
+		$pending->{$file}->{write}++;
+		$path = fixup( $file );
+	} else {
+		$path = create_tmp_file( $file );
+		compress_path_dest( $path, fixup( $file ) );
 	}
+	my $rv = truncate( $path, $size ) ? 0 : -$! ;
 	warn "## truncate( $file $size ) $path [", -s $path, "] = $rv\n" if $debug;
-	$pending->{$file}->{write}++;
+
 	return $rv;
 }
+
 sub x_utime { return utime($_[1],$_[2],fixup($_[0])) ? 0:-$!; }
 
 sub x_mkdir { my ($name, $perm) = @_; return 0 if mkdir(fixup($name),$perm); return -$!; }
@@ -335,37 +428,8 @@
 	} elsif ( defined( $pending->{$file}->{open} ) && $pending->{$file}->{open} == 1 ) {
 		my $path = $pending->{$file}->{path} || confess "no path for $file ? ", dump( $pending );
 		my $dest = fixup( $file );
+		compress_path_dest( $path, $dest );
 
-		# cleanup old compressed copy
-		if ( $dest =~ /\.gz$/ ) {
-			warn "## remove old $dest\n";
-			unlink $dest || confess "can't remove $dest: $!";
-			$dest =~ s/\.gz$//;
-		}
-
-		if ( $file =~ $skip_extensions_regex ) {
-			warn "release $file [",-s $path,"] skipped compression\n";
-			file_copy( '<', $path, '>', $dest ) if ( $path ne $dest );
-		} elsif ( -s $path < $min_compress_size ) {
-			warn "release $file [",-s $path,"] uncompressed, too small\n";
-			file_copy( '<', $path, '>', $dest ) if ( $path ne $dest );
-		} else {
-			warn "release $file [",-s $path,"] compressing\n";
-
-			my $comp = $dest . '.gz';
-			file_copy( '<', $path, '>:gzip', $comp );
-
-			my ( $size_path, $size_comp ) = ( -s $path, -s $comp );
-
-			if ( $size_path <= $size_comp ) {
-				warn ">>> $size_path <= $size_comp leaving uncompressed\n";
-				unlink $comp || warn "can't reamove: $comp: $!";
-			} else {
-				warn ">>> compressed $size_path -> $size_comp ",int(($size_comp * 100) / $size_path),"%\n";
-				# FIXME add timeout to remove uncompressed version?
-				unlink $path || warn "can't remove $path: $!";
-			}
-		}
 	} else {
 		warn "release $file, but still used ", $pending->{$file}->{open} , " times, delaying compression\n";
 	}