some fixes - next up is read()

diff --git a/perl/Fuse.xs b/perl/Fuse.xs
index 6061d9f8f51b3be8b9b3352ae96f48c634a22b54..9d0fa9bd7851740f41f6af09c0a0a3043b007800 100644 (file)
--- a/perl/Fuse.xs
+++ b/perl/Fuse.xs
@@ -6,7 +6,7 @@
 
 #undef DEBUGf
 #if 1
-#define DEBUGf(a...) fprintf(stderr, ##a)
+#define DEBUGf(f, a...) fprintf(stderr, "%s:%d (%i): " f,__BASE_FILE__,__LINE__,PL_stack_sp-PL_stack_base ,##a )
 #else
 #define DEBUGf(a...)
 #endif
@@ -29,6 +29,7 @@ SV *_PLfuse_callbacks[18];
 int _PLfuse_getattr(const char *file, struct stat *result) {
        dSP;
        int rv, statcount;
+       DEBUGf("getattr begin: %i\n",sp-PL_stack_base);
        ENTER;
        SAVETMPS;
        PUSHMARK(SP);
@@ -62,14 +63,17 @@ int _PLfuse_getattr(const char *file, struct stat *result) {
        }
        FREETMPS;
        LEAVE;
+       PUTBACK;
+       DEBUGf("getattr end: %i\n",sp-PL_stack_base);
        return rv;
 }
 
 int _PLfuse_readlink(const char *file,char *buf,size_t buflen) {
        int rv;
        char *rvstr;
-       dXSARGS;
-       DEBUGf("readlink begin\n");
+       dSP;
+       I32 ax;
+       DEBUGf("readlink begin: %i\n",sp-PL_stack_base);
        if(buflen < 1)
                return EINVAL;
        ENTER;
@@ -81,24 +85,29 @@ int _PLfuse_readlink(const char *file,char *buf,size_t buflen) {
        SPAGAIN;
        if(!rv)
                rv = -ENOENT;
-       else
-               if(SvTYPE(ST(0)) == SVt_IV)
-                       rv = POPi;
+       else {
+               SV *mysv = POPs;
+               DEBUGf("type = %i\n",SvTYPE(mysv));
+               if(SvTYPE(mysv) == SVt_IV || SvTYPE(mysv) == SVt_NV)
+                       rv = SvIV(mysv);
                else {
-                       strncpy(buf,POPp,buflen);
+                       strncpy(buf,SvPV_nolen(mysv),buflen);
                        rv = 0;
                }
+       }
        FREETMPS;
        LEAVE;
+       DEBUGf("ribbit3: %i (%s)\n",rv,buf);
        buf[buflen-1] = 0;
-       DEBUGf("readlink end\n");
+       PUTBACK;
+       DEBUGf("readlink end: %i\n",sp-PL_stack_base);
        return rv;
 }
 
 int _PLfuse_getdir(const char *file, fuse_dirh_t dirh, fuse_dirfil_t dirfil) {
        int prv, rv;
-       dXSARGS;
-       DEBUGf("getdir begin\n");
+       dSP;
+       DEBUGf("getdir begin: %i\n",sp-PL_stack_base);
        ENTER;
        SAVETMPS;
        PUSHMARK(SP);
@@ -107,22 +116,17 @@ int _PLfuse_getdir(const char *file, fuse_dirh_t dirh, fuse_dirfil_t dirfil) {
        prv = call_sv(_PLfuse_callbacks[2],G_ARRAY);
        SPAGAIN;
        if(prv) {
-               SV *mysv = sv_2mortal(POPs);
-               if(!SvIOK(mysv)) {
-                       fprintf(stderr,"last getdir retval needs to be numeric (e.g. 0 or -ENOENT) (%s)\n",SvPV_nolen(mysv));
-                       rv = -ENOSYS;
-               } else {
-                       rv = SvIV(mysv);
-                       while(--prv)
-                               dirfil(dirh,POPp,0);
-               }
+               rv = POPi;
+               while(--prv)
+                       dirfil(dirh,POPp,0);
        } else {
                fprintf(stderr,"getdir() handler returned nothing!\n");
                rv = -ENOSYS;
        }
        FREETMPS;
        LEAVE;
-       DEBUGf("getdir end\n");
+       PUTBACK;
+       DEBUGf("getdir end: %i\n",sp-PL_stack_base);
        return rv;
 }
 
@@ -131,7 +135,7 @@ int _PLfuse_mknod (const char *file, mode_t mode, dev_t dev) {
        SV *rvsv;
        char *rvstr;
        dSP;
-       DEBUGf("mknod begin\n");
+       DEBUGf("mknod begin: %i\n",sp-PL_stack_base);
        ENTER;
        SAVETMPS;
        PUSHMARK(SP);
@@ -147,7 +151,8 @@ int _PLfuse_mknod (const char *file, mode_t mode, dev_t dev) {
                rv = 0;
        FREETMPS;
        LEAVE;
-       DEBUGf("mknod end: %i\n",rv);
+       PUTBACK;
+       DEBUGf("mknod end: %i\n",sp-PL_stack_base);
        return rv;
 }
 
@@ -156,7 +161,7 @@ int _PLfuse_mkdir (const char *file, mode_t mode) {
        SV *rvsv;
        char *rvstr;
        dSP;
-       DEBUGf("mkdir begin\n");
+       DEBUGf("mkdir begin: %i\n",sp-PL_stack_base);
        ENTER;
        SAVETMPS;
        PUSHMARK(SP);
@@ -171,7 +176,8 @@ int _PLfuse_mkdir (const char *file, mode_t mode) {
                rv = 0;
        FREETMPS;
        LEAVE;
-       DEBUGf("mkdir end\n");
+       PUTBACK;
+       DEBUGf("mkdir end: %i\n",sp-PL_stack_base);
        return rv;
 }
 
@@ -181,7 +187,7 @@ int _PLfuse_unlink (const char *file) {
        SV *rvsv;
        char *rvstr;
        dSP;
-       DEBUGf("unlink begin\n");
+       DEBUGf("unlink begin: %i\n",sp-PL_stack_base);
        ENTER;
        SAVETMPS;
        PUSHMARK(SP);
@@ -195,7 +201,8 @@ int _PLfuse_unlink (const char *file) {
                rv = 0;
        FREETMPS;
        LEAVE;
-       DEBUGf("unlink end\n");
+       PUTBACK;
+       DEBUGf("unlink end: %i\n",sp-PL_stack_base);
        return rv;
 }
 
@@ -204,7 +211,7 @@ int _PLfuse_rmdir (const char *file) {
        SV *rvsv;
        char *rvstr;
        dSP;
-       DEBUGf("rmdir begin\n");
+       DEBUGf("rmdir begin: %i\n",sp-PL_stack_base);
        ENTER;
        SAVETMPS;
        PUSHMARK(SP);
@@ -218,7 +225,8 @@ int _PLfuse_rmdir (const char *file) {
                rv = 0;
        FREETMPS;
        LEAVE;
-       DEBUGf("rmdir end\n");
+       PUTBACK;
+       DEBUGf("rmdir end: %i\n",sp-PL_stack_base);
        return rv;
 }
 
@@ -227,7 +235,7 @@ int _PLfuse_symlink (const char *file, const char *new) {
        SV *rvsv;
        char *rvstr;
        dSP;
-       DEBUGf("symlink begin\n");
+       DEBUGf("symlink begin: %i\n",sp-PL_stack_base);
        ENTER;
        SAVETMPS;
        PUSHMARK(SP);
@@ -242,7 +250,8 @@ int _PLfuse_symlink (const char *file, const char *new) {
                rv = 0;
        FREETMPS;
        LEAVE;
-       DEBUGf("symlink end\n");
+       PUTBACK;
+       DEBUGf("symlink end: %i\n",sp-PL_stack_base);
        return rv;
 }
 
@@ -251,7 +260,7 @@ int _PLfuse_rename (const char *file, const char *new) {
        SV *rvsv;
        char *rvstr;
        dSP;
-       DEBUGf("rename begin\n");
+       DEBUGf("rename begin: %i\n",sp-PL_stack_base);
        ENTER;
        SAVETMPS;
        PUSHMARK(SP);
@@ -266,7 +275,8 @@ int _PLfuse_rename (const char *file, const char *new) {
                rv = 0;
        FREETMPS;
        LEAVE;
-       DEBUGf("rename end\n");
+       PUTBACK;
+       DEBUGf("rename end: %i\n",sp-PL_stack_base);
        return rv;
 }
 
@@ -275,7 +285,7 @@ int _PLfuse_link (const char *file, const char *new) {
        SV *rvsv;
        char *rvstr;
        dSP;
-       DEBUGf("link begin\n");
+       DEBUGf("link begin: %i\n",sp-PL_stack_base);
        ENTER;
        SAVETMPS;
        PUSHMARK(SP);
@@ -290,7 +300,8 @@ int _PLfuse_link (const char *file, const char *new) {
                rv = 0;
        FREETMPS;
        LEAVE;
-       DEBUGf("link end\n");
+       PUTBACK;
+       DEBUGf("link end: %i\n",sp-PL_stack_base);
        return rv;
 }
 
@@ -299,7 +310,7 @@ int _PLfuse_chmod (const char *file, mode_t mode) {
        SV *rvsv;
        char *rvstr;
        dSP;
-       DEBUGf("chmod begin\n");
+       DEBUGf("chmod begin: %i\n",sp-PL_stack_base);
        ENTER;
        SAVETMPS;
        PUSHMARK(SP);
@@ -314,7 +325,8 @@ int _PLfuse_chmod (const char *file, mode_t mode) {
                rv = 0;
        FREETMPS;
        LEAVE;
-       DEBUGf("chmod end\n");
+       PUTBACK;
+       DEBUGf("chmod end: %i\n",sp-PL_stack_base);
        return rv;
 }
 
@@ -323,7 +335,7 @@ int _PLfuse_chown (const char *file, uid_t uid, gid_t gid) {
        SV *rvsv;
        char *rvstr;
        dSP;
-       DEBUGf("chown begin\n");
+       DEBUGf("chown begin: %i\n",sp-PL_stack_base);
        ENTER;
        SAVETMPS;
        PUSHMARK(SP);
@@ -339,7 +351,8 @@ int _PLfuse_chown (const char *file, uid_t uid, gid_t gid) {
                rv = 0;
        FREETMPS;
        LEAVE;
-       DEBUGf("chown end\n");
+       PUTBACK;
+       DEBUGf("chown end: %i\n",sp-PL_stack_base);
        return rv;
 }
 
@@ -348,7 +361,7 @@ int _PLfuse_truncate (const char *file, off_t off) {
        SV *rvsv;
        char *rvstr;
        dSP;
-       DEBUGf("truncate begin\n");
+       DEBUGf("truncate begin: %i\n",sp-PL_stack_base);
        ENTER;
        SAVETMPS;
        PUSHMARK(SP);
@@ -363,7 +376,8 @@ int _PLfuse_truncate (const char *file, off_t off) {
                rv = 0;
        FREETMPS;
        LEAVE;
-       DEBUGf("truncate end\n");
+       PUTBACK;
+       DEBUGf("truncate end: %i\n",sp-PL_stack_base);
        return rv;
 }
 
@@ -372,7 +386,7 @@ int _PLfuse_utime (const char *file, struct utimbuf *uti) {
        SV *rvsv;
        char *rvstr;
        dSP;
-       DEBUGf("utime begin\n");
+       DEBUGf("utime begin: %i\n",sp-PL_stack_base);
        ENTER;
        SAVETMPS;
        PUSHMARK(SP);
@@ -388,7 +402,8 @@ int _PLfuse_utime (const char *file, struct utimbuf *uti) {
                rv = 0;
        FREETMPS;
        LEAVE;
-       DEBUGf("utime end\n");
+       PUTBACK;
+       DEBUGf("utime end: %i\n",sp-PL_stack_base);
        return rv;
 }
 
@@ -397,7 +412,7 @@ int _PLfuse_open (const char *file, int flags) {
        SV *rvsv;
        char *rvstr;
        dSP;
-       DEBUGf("open begin\n");
+       DEBUGf("open begin: %i\n",sp-PL_stack_base);
        ENTER;
        SAVETMPS;
        PUSHMARK(SP);
@@ -412,7 +427,8 @@ int _PLfuse_open (const char *file, int flags) {
                rv = 0;
        FREETMPS;
        LEAVE;
-       DEBUGf("open end: %i\n",rv);
+       PUTBACK;
+       DEBUGf("open end: %i %i\n",sp-PL_stack_base,rv);
        return rv;
 }
 
@@ -420,7 +436,7 @@ int _PLfuse_read (const char *file, char *buf, size_t buflen, off_t off) {
        int rv;
        char *rvstr;
        dXSARGS;
-       DEBUGf("read begin\n");
+       DEBUGf("read begin: %i\n",sp-PL_stack_base);
        ENTER;
        SAVETMPS;
        PUSHMARK(SP);
@@ -429,22 +445,25 @@ int _PLfuse_read (const char *file, char *buf, size_t buflen, off_t off) {
        XPUSHs(sv_2mortal(newSViv(off)));
        PUTBACK;
        rv = call_sv(_PLfuse_callbacks[15],G_SCALAR);
+       DEBUGf("k\n");
        SPAGAIN;
        if(!rv)
                rv = -ENOENT;
        else {
-               SV *mysv = sv_2mortal(POPs);
-               if(SvTYPE(mysv) == SVt_IV)
+               SV *mysv = POPs;
+               if(SvTYPE(mysv) == SVt_NV || SvTYPE(mysv) == SVt_IV)
                        rv = SvIV(mysv);
                else {
-                       rv = SvCUR(mysv);
-                       if(rv > buflen)
+                       if(buflen < (rv = SvCUR(mysv)))
                                croak("read() handler returned more than buflen! (%i > %i)",rv,buflen);
                        if(rv)
                                memcpy(buf,SvPV_nolen(mysv),rv);
                }
        }
-       DEBUGf("read end\n");
+       FREETMPS;
+       LEAVE;
+       PUTBACK;
+       DEBUGf("read end: %i %i\n",sp-PL_stack_base,rv);
        return rv;
 }
 
@@ -452,7 +471,7 @@ int _PLfuse_write (const char *file, const char *buf, size_t buflen, off_t off)
        int rv;
        char *rvstr;
        dSP;
-       DEBUGf("write begin\n");
+       DEBUGf("write begin: %i\n",sp-PL_stack_base);
        ENTER;
        SAVETMPS;
        PUSHMARK(SP);
@@ -468,7 +487,8 @@ int _PLfuse_write (const char *file, const char *buf, size_t buflen, off_t off)
                rv = 0;
        FREETMPS;
        LEAVE;
-       DEBUGf("write end\n");
+       PUTBACK;
+       DEBUGf("write end: %i\n",sp-PL_stack_base);
        return rv;
 }
 
@@ -476,7 +496,7 @@ int _PLfuse_statfs (struct statfs *st) {
        int rv;
        char *rvstr;
        dSP;
-       DEBUGf("statfs begin\n");
+       DEBUGf("statfs begin: %i\n",sp-PL_stack_base);
        ENTER;
        SAVETMPS;
        PUSHMARK(SP);
@@ -504,7 +524,8 @@ int _PLfuse_statfs (struct statfs *st) {
                rv = -ENOSYS;
        FREETMPS;
        LEAVE;
-       DEBUGf("statfs end\n");
+       PUTBACK;
+       DEBUGf("statfs end: %i\n",sp-PL_stack_base);
        return rv;
 }
 
@@ -592,4 +613,6 @@ perl_fuse_main(...)
                                croak("arg is not a code reference!");
                }
        }
+       printf("pre-main\n");
        fuse_main(argc,argv,&fops);
+       printf("post-main\n");

diff --git a/perl/example.pl b/perl/example.pl
index d01278c3cc309e6477bc7670eafb7ab801010da7..9ba1117554f23da578aec902cb370d2c09a23fb0 100755 (executable)
--- a/perl/example.pl
+++ b/perl/example.pl
@@ -48,14 +48,17 @@ sub e_getattr {
 
 sub e_getdir {
        # return as many text filenames as you like, followed by the retval.
+       print((scalar keys %files)."\n");
        return (keys %files),0;
 }
 
 sub e_open {
        # VFS sanity check; it keeps all the necessary state, not much to do here.
        my ($file) = filename_fixup(shift);
+       print("open called\n");
        return -ENOENT() unless exists($files{$file});
        return -EISDIR() unless exists($files{$file}{cont});
+       print("open ok\n");
        return 0;
 }
 
@@ -82,6 +85,6 @@ Fuse::main(
        getdir=>\&e_getdir,
        open=>\&e_open,
        statfs=>\&e_statfs,
-       #read=>\&e_read,
+       read=>\&e_read,
        #debug=>1, threaded=>0
 );

diff --git a/perl/loopback.pl b/perl/loopback.pl
index 2a8496a6f6792e4829f32ad95b9dd09f92fb9932..a962993d7915372f37de8d7f7fef950a00e2ff2d 100644 (file)
--- a/perl/loopback.pl
+++ b/perl/loopback.pl
@@ -2,6 +2,7 @@
 
 use strict;
 use Fuse;
+use IO::File;
 use POSIX qw(ENOENT ENOSYS EEXIST EPERM O_RDONLY O_RDWR O_APPEND O_CREAT);
 use Fcntl qw(S_ISBLK S_ISCHR S_ISFIFO);
 
@@ -15,8 +16,8 @@ sub x_getattr {
        my ($file) = fixup(shift);
        debug("getattr $file");
        return -ENOENT() unless -e $file;
-       debug(stat($file));
-       return (stat($file));
+       debug(lstat($file));
+       return (lstat($file));
 }
 
 sub x_getdir {
@@ -44,7 +45,6 @@ sub x_open {
        debug("open $file = $fd");
        return $fd if $fd < 0;
        POSIX::close($fd);
-       debug("good: $fd");
        return 0;
 }
 
@@ -52,10 +52,12 @@ sub x_read {
        my ($file,$bufsize,$off) = @_;
        debug("read",@_);
        my ($rv) = -ENOSYS();
+       my ($handle) = new IO::File;
        return -ENOENT() unless -e ($file = fixup($file));
-       return -ENOSYS() unless sysopen(FILE,$file,O_RDONLY());
-       if(sysseek(FILE,$off,0)) { sysread(FILE,$rv,$bufsize); }
-       close(FILE);
+       return -ENOSYS() unless open($handle,$file);
+       if(seek($handle,$off,0)) {
+               read($handle,$rv,$bufsize);
+       }
        debug("good");
        return $rv;
 }
@@ -75,7 +77,7 @@ sub x_write {
 
 sub err { return (-shift || -$!) }
 
-sub x_readlink { return err(readlink(fixup(shift))            ); }
+sub x_readlink { return readlink(fixup(shift)                 ); }
 sub x_unlink   { return unlink(fixup(shift)) ? 0 : -$!;          }
 sub x_rmdir    { return err(rmdir(fixup(shift))               ); }
 sub x_symlink  { return err(symlink(fixup(shift),fixup(shift))); }
@@ -85,7 +87,7 @@ sub x_mkdir    { return err(mkdir(fixup(shift),shift)         ); }
 sub x_chmod    { return err(chmod(fixup(shift),shift)         ); }
 sub x_chown    { return err(chown(fixup(shift),shift,shift)   ); }
 sub x_chmod    { return err(chmod(fixup(shift),shift)         ); }
-sub x_truncate { return err(truncate(fixup(shift),shift)      ); }
+sub x_truncate { return truncate(fixup(shift),shift) ? 0 : -$! ; }
 sub x_utime    { return utime($_[1],$_[2],fixup($_[0])) ? 0:-$!; }
 
 sub x_mknod {
@@ -111,7 +113,7 @@ sub x_mknod {
 
 my ($mountpoint) = "";
 $mountpoint = shift(@ARGV) if @ARGV;
-Fuse::main(mountpoint=>$mountpoint, getattr=>\&x_getattr, readlink=>\&readlink, getdir=>\&x_getdir, mknod=>\&x_mknod,
+Fuse::main(mountpoint=>$mountpoint, getattr=>\&x_getattr, readlink=>\&x_readlink, getdir=>\&x_getdir, mknod=>\&x_mknod,
        mkdir=>\&x_mkdir, unlink=>\&x_unlink, rmdir=>\&x_rmdir, symlink=>\&x_symlink, rename=>\&x_rename, link=>\&x_link,
        chmod=>\&x_chmod, chown=>\&x_chown, truncate=>\&x_truncate, utime=>\&x_utime, open=>\&x_open, read=>\&x_read, write=>\&x_write
 );