rfuse-ng 0.2.0 → 0.3.0

data/Rakefile

@@ -5,7 +5,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "rfuse-ng"
-    gem.version = "0.2.0"
+    gem.version = "0.3.0"
     gem.summary = 'Ruby language binding for FUSE'
     gem.description = 'Ruby language binding for FUSE. It was forked from rfuse'
     gem.rubyforge_project = 'rfuse-ng'

data/ext/filler.c

@@ -6,7 +6,6 @@ VALUE rfiller_initialize(VALUE self){
   return self;
 }
 
-
 VALUE rfiller_new(VALUE class){
   VALUE self;
   struct filler_t *f;
@@ -14,7 +13,7 @@ VALUE rfiller_new(VALUE class){
   return self;
 }
 
-VALUE rfiller_push(VALUE self,VALUE name, VALUE stat,VALUE offset) {
+VALUE rfiller_push(VALUE self, VALUE name, VALUE stat, VALUE offset) {
   struct filler_t *f;
   Data_Get_Struct(self,struct filler_t,f);
   struct stat st;
@@ -24,10 +23,22 @@ VALUE rfiller_push(VALUE self,VALUE name, VALUE stat,VALUE offset) {
   return self;
 }
 
+VALUE rfiller_push_old(VALUE self, VALUE name, VALUE type, VALUE inode) {
+  printf("Called rfilter_push_old\n");
+  struct filler_t *f;
+  Data_Get_Struct(self,struct filler_t,f);
+  // TODO: architecture dependent int types
+  printf("Before df\n");
+  f->df(f->dh, STR2CSTR(name), NUM2INT(type), NUM2INT(inode));
+  printf("After df\n");
+  return self;
+}
+
 VALUE rfiller_init(VALUE module) {
   VALUE cFiller=rb_define_class_under(module,"Filler",rb_cObject);
   rb_define_alloc_func(cFiller,rfiller_new);
   rb_define_method(cFiller,"initialize",rfiller_initialize,0);
   rb_define_method(cFiller,"push",rfiller_push,3);
+  rb_define_method(cFiller,"push_old",rfiller_push_old,3);
   return cFiller;
 }

data/ext/filler.h

@@ -3,11 +3,14 @@
 
 struct filler_t {
   fuse_fill_dir_t filler;
-  void           *buffer;
+  void            *buffer;
+  fuse_dirh_t     dh;
+  fuse_dirfil_t   df;
 };
 
 VALUE rfiller_initialize(VALUE self);
 VALUE rfiller_new(VALUE class);
-VALUE rfiller_push(VALUE self,VALUE name, VALUE stat,VALUE offset);
+VALUE rfiller_push(VALUE self, VALUE name, VALUE stat, VALUE offset);
+VALUE rfiller_push_old(VALUE self, VALUE name, VALUE type, VALUE inode);
 
 VALUE rfiller_init(VALUE module);

data/ext/helper.c

@@ -12,9 +12,34 @@ void rstat2stat(VALUE rstat, struct stat *statbuf){
     statbuf->st_blksize=NUM2ULONG(rb_funcall(rstat,rb_intern("blksize"),0));
     statbuf->st_blocks=NUM2ULONG(rb_funcall(rstat,rb_intern("blocks"),0));
     statbuf->st_atime=NUM2ULONG(rb_funcall(rb_funcall(rstat,
-			rb_intern("atime"),0),rb_intern("to_i"),0));
+        rb_intern("atime"),0),rb_intern("to_i"),0));
     statbuf->st_mtime=NUM2ULONG(rb_funcall(rb_funcall(rstat,
                         rb_intern("mtime"),0),rb_intern("to_i"),0));
     statbuf->st_ctime=NUM2ULONG(rb_funcall(rb_funcall(rstat,
                         rb_intern("ctime"),0),rb_intern("to_i"),0));
 };
+
+struct fuse_args * rarray2fuseargs(VALUE rarray){
+
+  Check_Type(rarray, T_ARRAY);
+
+  struct fuse_args *args = malloc(sizeof(struct fuse_args));
+
+  args->argc      = RARRAY(rarray)->len;
+  args->argv      = malloc(args->argc * sizeof(char *) + 1);
+  /* Nope, this isn't really 'allocated'. The elements
+   * of this array shouldn't be freed */
+  args->allocated = 0;
+
+  int i;
+  VALUE v;
+  for(i = 0; i < args->argc; i++) {
+    v = RARRAY(rarray)->ptr[i];
+    Check_Type(v, T_STRING);
+    args->argv[i] = STR2CSTR(RSTRING(v));
+  }
+  args->argv[args->argc] = NULL;
+  
+  return args;
+}
+

data/ext/helper.h

@@ -1,7 +1,11 @@
 #include <sys/stat.h>
 #include <ruby.h>
+#include <fuse.h>
 
 #ifndef _RHUSE_HELPER_H
 #define _RHUSE_HELPER_H
+
 void rstat2stat(VALUE rstat,struct stat *statbuf);
+struct fuse_args * rarray2fuseargs(VALUE rarray);
+
 #endif