--- perl-llin/Fuse.xs 2006/01/02 19:50:33 21 +++ perl-llin/Fuse.xs 2006/01/03 16:21:13 68 @@ -30,7 +30,7 @@ #include #undef DEBUGf -#if 0 +#if 1 #define DEBUGf(f, a...) fprintf(stderr, "%s:%d (%i): " f,__BASE_FILE__,__LINE__,sp-PL_stack_base ,##a ) #else #define DEBUGf(a...) @@ -541,7 +541,14 @@ return rv; } -int _PLfuse_statfs (const char *file, struct statfs *st) { +/* FIXME check for old fuse API (< 21?) and use statfs here */ +#ifdef __FreeBSD__ + #define _fuse_statvfs statfs +#else + #define _fuse_statvfs statvfs +#endif +int _PLfuse_statfs (const char *file, struct _fuse_statvfs *st) { + int rv; char *rvstr; FUSE_CONTEXT_PRE; @@ -553,14 +560,24 @@ PUTBACK; rv = call_sv(_PLfuse_callbacks[17],G_ARRAY); SPAGAIN; - if(rv > 5) { - st->f_bsize = POPi; - st->f_bfree = POPi; - st->f_blocks = POPi; - st->f_ffree = POPi; - st->f_files = POPi; - st->f_namelen = POPi; - if(rv > 6) + DEBUGf("statfs got %i params\n",rv); + if(rv == 6 || rv == 7) { + st->f_bsize = POPi; + st->f_bfree = POPi; + st->f_blocks = POPi; + st->f_ffree = POPi; + st->f_files = POPi; + st->f_namemax = POPi; +#ifndef __FreeBSD__ + /* zero and fill-in other */ + st->f_fsid = 0; + st->f_frsize = 4096; + st->f_flag = 0; + st->f_bavail = st->f_bfree; + st->f_favail = st->f_ffree; +#endif + + if(rv == 7) rv = POPi; else rv = 0;