From 4eb893f30dd06771e9606136f94ee349f9cff890 Mon Sep 17 00:00:00 2001 From: Ian Beckwith Date: Mon, 27 Sep 2010 17:23:56 +0100 Subject: [PATCH] tidy ID3FS::Fuse --- lib/ID3FS/Fuse.pm | 91 +++++++++++++++++++++++++++---------------------------- 1 file changed, 44 insertions(+), 47 deletions(-) diff --git a/lib/ID3FS/Fuse.pm b/lib/ID3FS/Fuse.pm index 264cf87..2a02276 100644 --- a/lib/ID3FS/Fuse.pm +++ b/lib/ID3FS/Fuse.pm @@ -5,8 +5,7 @@ use warnings; use ID3FS::Path; use Fuse; use POSIX qw(EINVAL EROFS ENOENT EOPNOTSUPP S_IRUSR S_IRGRP S_IROTH S_IXUSR S_IXGRP S_IXOTH); -use vars qw($TYPE_DIR $TYPE_SYMLINK); -($TYPE_DIR, $TYPE_SYMLINK)=(0040, 0120); +our ($TYPE_DIR, $TYPE_SYMLINK)=(0040, 0120); sub new { @@ -36,26 +35,26 @@ sub run readlink => sub { $self->readlink(@_); }, getdir => sub { $self->getdir(@_); }, # Not used -# mknod => sub { $self->mknod(@_); }, -# mkdir => sub { $self->mkdir(@_); }, -# unlink => sub { $self->unlink(@_); }, -# rmdir => sub { $self->rmdir(@_); }, -# symlink => sub { $self->symlink(@_); }, -# rename => sub { $self->rename(@_); }, -# link => sub { $self->link(@_); }, -# chmod => sub { $self->chmod(@_); }, -# chown => sub { $self->chown(@_); }, -# truncate => sub { $self->truncate(@_); }, -# utime => sub { $self->utime(@_); }, -# open => sub { $self->open(@_); }, -# read => sub { $self->read(@_); }, -# write => sub { $self->write(@_); }, -# statfs => sub { $self->statfs(@_); }, -# release => sub { $self->release(@_); }, -# fsync => sub { $self->fsync(@_); }, -# setxattr => sub { $self->setxattr(@_); }, -# getxattr => sub { $self->getxattr(@_); }, -# listxattr => sub { $self->listxattr(@_); }, +# mknod => sub { $self->mknod(@_); }, +# mkdir => sub { $self->mkdir(@_); }, +# unlink => sub { $self->unlink(@_); }, +# rmdir => sub { $self->rmdir(@_); }, +# symlink => sub { $self->symlink(@_); }, +# rename => sub { $self->rename(@_); }, +# link => sub { $self->link(@_); }, +# chmod => sub { $self->chmod(@_); }, +# chown => sub { $self->chown(@_); }, +# truncate => sub { $self->truncate(@_); }, +# utime => sub { $self->utime(@_); }, +# open => sub { $self->open(@_); }, +# read => sub { $self->read(@_); }, +# write => sub { $self->write(@_); }, +# statfs => sub { $self->statfs(@_); }, +# release => sub { $self->release(@_); }, +# fsync => sub { $self->fsync(@_); }, +# setxattr => sub { $self->setxattr(@_); }, +# getxattr => sub { $self->getxattr(@_); }, +# listxattr => sub { $self->listxattr(@_); }, # removexattr => sub { $self->removexattr(@_); }, ); } @@ -74,8 +73,8 @@ sub getattr my($atime,$mtime,$ctime)=($last_update) x 3; my($blksize,$blocks)=(512,1); my $mode=$self->mode( $path->isdir() ? $TYPE_DIR : $TYPE_SYMLINK ); - return($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size, - $atime,$mtime,$ctime,$blksize,$blocks); + return($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size, + $atime, $mtime, $ctime, $blksize, $blocks); } sub readlink @@ -101,27 +100,27 @@ sub getdir } # unused stubs -sub mknod { print "mknod\n"; return -EROFS(); } -sub mkdir { print "mkdir\n"; return -EROFS(); } -sub unlink { print "unlink\n"; return -EROFS(); } -sub rmdir { print "rmdir\n"; return -EROFS(); } -sub symlink { print "symlink\n"; return -EROFS(); } -sub rename { print "rename\n"; return -EROFS(); } -sub link { print "link\n"; return -EROFS(); } -sub chmod { print "chmod\n"; return -EROFS(); } -sub chown { print "chown\n"; return -EROFS(); } -sub truncate { print "truncate\n"; return -EROFS(); } -sub utime { print "utime\n"; return -EINVAL(); } -sub open { print "open\n"; return -EINVAL(); } -sub read { print "read\n"; return -EINVAL(); } -sub write { print "write\n"; return -EROFS(); } -sub statfs { print "statfs\n"; return -EINVAL(); } -sub release { print "release\n"; return 0; } -sub fsync { print "fsync\n"; return 0; } -sub setxattr { print "setxattr\n"; return -EOPNOTSUPP(); } -sub getxattr { print "getxattr\n"; return -EOPNOTSUPP(); } -sub listxattr { print "listxattr\n"; return -EOPNOTSUPP(); } -sub removexattr { print "removexattr\n"; return -EOPNOTSUPP(); } +sub mknod { print "FUSE: mknod\n"; return -EROFS(); } +sub mkdir { print "FUSE: mkdir\n"; return -EROFS(); } +sub unlink { print "FUSE: unlink\n"; return -EROFS(); } +sub rmdir { print "FUSE: rmdir\n"; return -EROFS(); } +sub symlink { print "FUSE: symlink\n"; return -EROFS(); } +sub rename { print "FUSE: rename\n"; return -EROFS(); } +sub link { print "FUSE: link\n"; return -EROFS(); } +sub chmod { print "FUSE: chmod\n"; return -EROFS(); } +sub chown { print "FUSE: chown\n"; return -EROFS(); } +sub truncate { print "FUSE: truncate\n"; return -EROFS(); } +sub utime { print "FUSE: utime\n"; return -EINVAL(); } +sub open { print "FUSE: open\n"; return -EINVAL(); } +sub read { print "FUSE: read\n"; return -EINVAL(); } +sub write { print "FUSE: write\n"; return -EROFS(); } +sub statfs { print "FUSE: statfs\n"; return -EINVAL(); } +sub release { print "FUSE: release\n"; return 0; } +sub fsync { print "FUSE: fsync\n"; return 0; } +sub setxattr { print "FUSE: setxattr\n"; return -EOPNOTSUPP(); } +sub getxattr { print "FUSE: getxattr\n"; return -EOPNOTSUPP(); } +sub listxattr { print "FUSE: listxattr\n"; return -EOPNOTSUPP(); } +sub removexattr { print "FUSE: removexattr\n"; return -EOPNOTSUPP(); } sub mode { @@ -129,6 +128,4 @@ sub mode return(($type << 9) | $self->{perms}); } - - 1; -- 2.11.0