X-Git-Url: http://git.rot13.org/?p=Fuse-DBI;a=blobdiff_plain;f=DBI.pm;h=c8572cee20465aff28d65c5243e721bbc9897b97;hp=c94a5e3e84d40f1fd346d3894fb3d8086df72fab;hb=ce6e47777c54874882f3d0d6a792e2703f17416b;hpb=258e57966734da73223b72d0048e613ad0b38703

diff --git a/DBI.pm b/DBI.pm
index c94a5e3..c8572ce 100755
--- a/DBI.pm
+++ b/DBI.pm
@@ -13,7 +13,7 @@ use Carp;
 use Data::Dumper;
 
 
-our $VERSION = '0.04';
+our $VERSION = '0.06';
 
 =head1 NAME
 
@@ -29,7 +29,7 @@ See C<run> below for examples how to set parameters.
 =head1 DESCRIPTION
 
 This module will use C<Fuse> module, part of C<FUSE (Filesystem in USErspace)>
-available at L<http://sourceforge.net/projects/avf> to mount
+available at L<http://fuse.sourceforge.net/> to mount
 your database as file system.
 
 That will give you possibility to use normal file-system tools (cat, grep, vi)
@@ -169,8 +169,6 @@ sub mount {
 	$self->{'read_filenames'} = sub { $self->read_filenames };
 	$self->read_filenames;
 
-	$self->{'mounted'} = 1;
-
 	$fuse_self = \$self;
 
 	Fuse::main(
@@ -188,8 +186,6 @@ sub mount {
 		debug=>0,
 	);
 	
-	$self->{'mounted'} = 0;
-
 	exit(0) if ($arg->{'fork'});
 
 	return 1;
@@ -210,23 +206,44 @@ database to filesystem.
 sub umount {
 	my $self = shift;
 
-	if ($self->{'mounted'}) {
-		system "fusermount -u ".$self->{'mount'} || croak "umount error: $!";
-	}
+	if ($self->{'mount'}) {
+		if (open(MTAB, "/etc/mtab")) {
+			my $mounted = 0;
+			my $mount = $self->{'mount'};
+			while(<MTAB>) {
+				$mounted = 1 if (/ $mount fuse /i);
+			}
+			close(MTAB);
+		
+			if ($mounted) {
+				system "fusermount -u ".$self->{'mount'}." 2>&1 >/dev/null" || return 0;
+				return 1;
+			}
 
-	return 1;
+		} else {
+			warn "can't open /etc/mtab: $!";
+			return 0;
+		}
+	}
 }
 
 $SIG{'INT'} = sub {
-	print STDERR "umount called by SIG INT\n";
-	umount;
+	if ($fuse_self && $$fuse_self->umount) {
+		print STDERR "umount called by SIG INT\n";
+	}
+};
+
+$SIG{'QUIT'} = sub {
+	if ($fuse_self && $$fuse_self->umount) {
+		print STDERR "umount called by SIG QUIT\n";
+	}
 };
 
 sub DESTROY {
 	my $self = shift;
-	return if (! $self->{'mounted'});
-	print STDERR "umount called by DESTROY\n";
-	$self->umount;
+	if ($self->umount) {
+		print STDERR "umount called by DESTROY\n";
+	}
 }
 
 =head2 fuse_module_loaded
@@ -264,6 +281,10 @@ sub read_filenames {
 			type => 0040,
 			mode => 0755,
 		},
+		'..' => {
+			type => 0040,
+			mode => 0755,
+		},
 	#	a => {
 	#		cont => "File 'a'.\n",
 	#		type => 0100,
@@ -342,7 +363,7 @@ sub e_getdir {
 	my %out;
 	foreach my $f (sort keys %files) {
 		if ($dirname) {
-			if ($f =~ s/^\E$dirname\Q\///) {
+			if ($f =~ s/^\Q$dirname\E\///) {
 				$out{$f}++ if ($f =~ /^[^\/]+$/);
 			}
 		} else {
@@ -520,10 +541,16 @@ __END__
 
 Nothing.
 
+=head1 BUGS
+
+Size information (C<ls -s>) is wrong. It's a problem in upstream Fuse module
+(for which I'm to blame lately), so when it gets fixes, C<Fuse::DBI> will
+automagically pick it up.
+
 =head1 SEE ALSO
 
 C<FUSE (Filesystem in USErspace)> website
-L<http://sourceforge.net/projects/avf>
+L<http://fuse.sourceforge.net/>
 
 Example for WebGUI which comes with this distribution in
 directory C<examples/webgui.pl>. It also contains a lot of documentation