# define FUSE_CONTEXT_PRE
# define FUSE_CONTEXT_POST
#endif
-#include <fuse/fuse.h>
+#include <fuse.h>
#undef DEBUGf
#if 0
SV *_PLfuse_callbacks[N_CALLBACKS];
int _PLfuse_getattr(const char *file, struct stat *result) {
- int rv, statcount;
+ int rv;
FUSE_CONTEXT_PRE;
dSP;
DEBUGf("getattr begin: %s\n",file);
result->st_uid = POPi;
result->st_nlink = POPi;
result->st_mode = POPi;
- /*result->st_ino =*/ POPi;
+ result->st_ino = POPi;
result->st_dev = POPi;
rv = 0;
}
int _PLfuse_readlink(const char *file,char *buf,size_t buflen) {
int rv;
- char *rvstr;
- I32 ax;
FUSE_CONTEXT_PRE;
dSP;
if(buflen < 1)
return rv;
}
+#if 0
+/*
+ * This doesn't yet work... we alwas get ENOSYS when trying to use readdir().
+ * Well, of course, getdir() is fine as well.
+ */
+ int _PLfuse_readdir(const char *file, void *dirh, fuse_fill_dir_t dirfil, off_t off, struct fuse_file_info *fi) {
+#endif
int _PLfuse_getdir(const char *file, fuse_dirh_t dirh, fuse_dirfil_t dirfil) {
int prv, rv;
FUSE_CONTEXT_PRE;
if(prv) {
rv = POPi;
while(--prv)
- dirfil(dirh,POPp,0);
+ dirfil(dirh,POPp,0,0);
} else {
fprintf(stderr,"getdir() handler returned nothing!\n");
rv = -ENOSYS;
int _PLfuse_mknod (const char *file, mode_t mode, dev_t dev) {
int rv;
- SV *rvsv;
- char *rvstr;
FUSE_CONTEXT_PRE;
dSP;
DEBUGf("mknod begin\n");
int _PLfuse_mkdir (const char *file, mode_t mode) {
int rv;
- SV *rvsv;
- char *rvstr;
FUSE_CONTEXT_PRE;
dSP;
DEBUGf("mkdir begin\n");
int _PLfuse_unlink (const char *file) {
int rv;
- SV *rvsv;
- char *rvstr;
FUSE_CONTEXT_PRE;
dSP;
DEBUGf("unlink begin\n");
int _PLfuse_rmdir (const char *file) {
int rv;
- SV *rvsv;
- char *rvstr;
FUSE_CONTEXT_PRE;
dSP;
DEBUGf("rmdir begin\n");
int _PLfuse_symlink (const char *file, const char *new) {
int rv;
- SV *rvsv;
- char *rvstr;
FUSE_CONTEXT_PRE;
dSP;
DEBUGf("symlink begin\n");
int _PLfuse_rename (const char *file, const char *new) {
int rv;
- SV *rvsv;
- char *rvstr;
FUSE_CONTEXT_PRE;
dSP;
DEBUGf("rename begin\n");
int _PLfuse_link (const char *file, const char *new) {
int rv;
- SV *rvsv;
- char *rvstr;
FUSE_CONTEXT_PRE;
dSP;
DEBUGf("link begin\n");
int _PLfuse_chmod (const char *file, mode_t mode) {
int rv;
- SV *rvsv;
- char *rvstr;
FUSE_CONTEXT_PRE;
dSP;
DEBUGf("chmod begin\n");
int _PLfuse_chown (const char *file, uid_t uid, gid_t gid) {
int rv;
- SV *rvsv;
- char *rvstr;
FUSE_CONTEXT_PRE;
dSP;
DEBUGf("chown begin\n");
int _PLfuse_truncate (const char *file, off_t off) {
int rv;
- SV *rvsv;
- char *rvstr;
FUSE_CONTEXT_PRE;
dSP;
DEBUGf("truncate begin\n");
int _PLfuse_utime (const char *file, struct utimbuf *uti) {
int rv;
- SV *rvsv;
- char *rvstr;
FUSE_CONTEXT_PRE;
dSP;
DEBUGf("utime begin\n");
return rv;
}
-int _PLfuse_open (const char *file, int flags) {
+int _PLfuse_open (const char *file, struct fuse_file_info *fi) {
int rv;
- SV *rvsv;
- char *rvstr;
+ int flags = fi->flags;
FUSE_CONTEXT_PRE;
dSP;
DEBUGf("open begin\n");
return rv;
}
-int _PLfuse_read (const char *file, char *buf, size_t buflen, off_t off) {
+int _PLfuse_read (const char *file, char *buf, size_t buflen, off_t off, struct fuse_file_info *fi) {
int rv;
- char *rvstr;
FUSE_CONTEXT_PRE;
dSP;
DEBUGf("read begin\n");
rv = 0;
}
if(rv > buflen)
- croak("%i: read() handler returned more than buflen! (%i > %i)",getpid(),rv,buflen);
+ croak("read() handler returned more than buflen! (%i > %i)",rv,buflen);
if(rv)
memcpy(buf,SvPV_nolen(mysv),rv);
}
return rv;
}
-int _PLfuse_write (const char *file, const char *buf, size_t buflen, off_t off) {
+int _PLfuse_write (const char *file, const char *buf, size_t buflen, off_t off, struct fuse_file_info *fi) {
int rv;
- char *rvstr;
FUSE_CONTEXT_PRE;
dSP;
DEBUGf("write begin\n");
return rv;
}
-int _PLfuse_statfs (const char *file, struct statfs *st) {
+int _PLfuse_statfs (const char *file, struct statvfs *st) {
int rv;
- char *rvstr;
FUSE_CONTEXT_PRE;
dSP;
DEBUGf("statfs begin\n");
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;
+ /* 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;
+
+ if(rv == 7)
rv = POPi;
else
rv = 0;
return rv;
}
-int _PLfuse_flush (const char *file) {
+int _PLfuse_flush (const char *file, struct fuse_file_info *fi) {
int rv;
- char *rvstr;
FUSE_CONTEXT_PRE;
dSP;
DEBUGf("flush begin\n");
return rv;
}
-int _PLfuse_release (const char *file, int flags) {
+int _PLfuse_release (const char *file, struct fuse_file_info *fi) {
int rv;
- char *rvstr;
+ int flags = fi->flags;
FUSE_CONTEXT_PRE;
dSP;
DEBUGf("release begin\n");
return rv;
}
-int _PLfuse_fsync (const char *file, int flags) {
+int _PLfuse_fsync (const char *file, int datasync, struct fuse_file_info *fi) {
int rv;
- char *rvstr;
+ int flags = fi->flags;
FUSE_CONTEXT_PRE;
dSP;
DEBUGf("fsync begin\n");
int _PLfuse_setxattr (const char *file, const char *name, const char *buf, size_t buflen, int flags) {
int rv;
- char *rvstr;
FUSE_CONTEXT_PRE;
dSP;
DEBUGf("setxattr begin\n");
int _PLfuse_getxattr (const char *file, const char *name, char *buf, size_t buflen) {
int rv;
- char *rvstr;
FUSE_CONTEXT_PRE;
dSP;
DEBUGf("getxattr begin\n");
int _PLfuse_listxattr (const char *file, char *list, size_t size) {
int prv, rv;
- char *rvstr;
FUSE_CONTEXT_PRE;
dSP;
DEBUGf("listxattr begin\n");
char *p = list;
int spc = size;
int total_len = 0;
- int i;
rv = POPi;
prv--;
int _PLfuse_removexattr (const char *file, const char *name) {
int rv;
- char *rvstr;
FUSE_CONTEXT_PRE;
dSP;
DEBUGf("removexattr begin\n");
getattr: _PLfuse_getattr,
readlink: _PLfuse_readlink,
getdir: _PLfuse_getdir,
+#if 0
+readdir: _PLfuse_readdir,
+#endif
mknod: _PLfuse_mknod,
mkdir: _PLfuse_mkdir,
unlink: _PLfuse_unlink,
void
perl_fuse_main(...)
PREINIT:
- struct fuse_operations fops = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL};
- int i, fd, varnum = 0, debug, threaded, have_mnt;
+ struct fuse_operations fops =
+ {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+ NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL};
+ int i, fd, debug, threaded;
char *mountpoint;
char *mountopts;
- STRLEN n_a;
- STRLEN l;
+ struct fuse_args margs = FUSE_ARGS_INIT(0, NULL);
+ struct fuse_args fargs = FUSE_ARGS_INIT(0, NULL);
INIT:
if(items != 29) {
fprintf(stderr,"Perl<->C inconsistency or internal error\n");
mountopts = SvPV_nolen(ST(3));
for(i=0;i<N_CALLBACKS;i++) {
SV *var = ST(i+4);
- /* allow symbolic references, or real code references. */
- if((var != &PL_sv_undef) && (SvPOK(var) || (SvROK(var) && SvTYPE(SvRV(var)) == SVt_PVCV))) {
+ /* allow symbolic references, or real code references. */
+ if(SvOK(var) && (SvPOK(var) || (SvROK(var) && SvTYPE(SvRV(var)) == SVt_PVCV))) {
void **tmp1 = (void**)&_available_ops, **tmp2 = (void**)&fops;
tmp2[i] = tmp1[i];
+#ifdef FUSE_USE_ITHREADS
if(threaded)
/* note: under 5.8.7, this croaks for code references. */
SvSHARE(var);
+#endif
_PLfuse_callbacks[i] = var;
+ } else
+ if(SvOK(var)) {
+ croak("invalid callback passed to perl_fuse_main "
+ "(%s is not a string, code ref, or undef).\n",
+ i+4,SvPVbyte_nolen(var));
}
}
- /* FIXME: need to pass fusermount arguments */
- fd = fuse_mount(mountpoint,mountopts);
+ /*
+ * XXX: What comes here is just a ridiculous use of the option parsing API
+ * to hack on compatibility with other parts of the new API. First and
+ * foremost, real C argc/argv would be good to get at...
+ */
+ if (mountopts &&
+ (fuse_opt_add_arg(&margs, "") == -1 ||
+ fuse_opt_add_arg(&margs, "-o") == -1 ||
+ fuse_opt_add_arg(&margs, mountopts) == -1)) {
+ fuse_opt_free_args(&margs);
+ croak("out of memory\n");
+ }
+ fd = fuse_mount(mountpoint,&margs);
+ fuse_opt_free_args(&margs);
if(fd < 0)
- croak("could not mount fuse filesystem!");
+ croak("could not mount fuse filesystem!\n");
+ if (debug) {
+ if ( fuse_opt_add_arg(&fargs, "") == -1 ||
+ fuse_opt_add_arg(&fargs, "-d") == -1) {
+ fuse_opt_free_args(&fargs);
+ croak("out of memory\n");
+ }
+ } else {
+ if (fuse_opt_add_arg(&fargs, "") == -1)
+ croak("out of memory\n");
+ }
+
if(threaded) {
- fuse_loop_mt(fuse_new(fd,debug ? "debug" : NULL,&fops));
+ fuse_loop_mt(fuse_new(fd,&fargs,&fops,sizeof(fops)/sizeof(void*)));
} else
- fuse_loop(fuse_new(fd,debug ? "debug" : NULL,&fops));
+ fuse_loop(fuse_new(fd,&fargs,&fops,sizeof(fops)/sizeof(void*)));
+ fuse_opt_free_args(&fargs);
projects / perl-fuse.git / blobdiff