rfuse 1.0.2 → 1.0.3

data/CHANGES.md

@@ -1,5 +1,14 @@
-1.0.2- 2012/08/09
------------------
+1.0.3 - 2012/08/16
+------------------
+
+Cleanup compile warnings
+
+Bugfixes
+ * {RFuse::Fuse#statfs} potential segfault
+ * {RFuse::Fuse#release} not receiving FileInfo
+
+1.0.2 - 2012/08/09
+------------------
 
 Support Ruby 1.8 (tested with 1.8.7)
 
@@ -39,7 +48,7 @@ with API breaking changes since the various 0.x.y series of rfuse and rfuse-ng
      command at a time. This allows the Ruby interpreter to retain control
      so you can use other threads, Signal.trap etc...
 
-  Various {RFuse::Fuse} methods will throw {Rfuse::Error} if the filesystem is
+  Various {RFuse::Fuse} methods will throw {RFuse::Error} if the filesystem is
   not mounted, which can be tested after initialisation with {RFuse::Fuse#mounted?}
 
   Implemented {RFuse::FuseDelegator} so your filesystem can be implemented (and tested/debugged)

data/README.md

@@ -3,7 +3,7 @@ RFuse
 
 http://rubygems.org/gems/rfuse
 
-FUSE bindings for Ruby 
+Ruby FUSE binding
 
 FUSE (Filesystem in USErspace) is a simple interface for userspace programs to export a virtual filesystem to the linux kernel. FUSE aims to provide a secure method for non privileged users to create and mount their own filesystem implementations.
 

data/ext/rfuse/context.c

@@ -66,5 +66,4 @@ void context_init(VALUE module) {
   rb_define_method(cContext,"uid",context_uid,0);
   rb_define_method(cContext,"gid",context_gid,0);
   rb_define_method(cContext,"pid",context_pid,0);
-  return cContext;
 }

data/ext/rfuse/file_info.c

@@ -21,7 +21,7 @@ VALUE wrap_file_info(struct fuse_context *ctx, struct fuse_file_info *ffi) {
  
   //also store it in an open_files hash on the fuse_object
   //so it doesn't get GC'd
-  open_files = rb_iv_get(ctx->private_data,"@open_files");
+  open_files = rb_iv_get((VALUE) ctx->private_data,"@open_files");
   key        = rb_funcall(rffi,rb_intern("object_id"),0);
   rb_hash_aset(open_files,key,rffi);
 
@@ -44,13 +44,15 @@ VALUE release_file_info(struct fuse_context *ctx, struct fuse_file_info *ffi)
 
   if (TYPE(ffi->fh) == T_DATA) {
       VALUE rffi = ffi->fh;
-      VALUE fuse_object = ctx->private_data;
+      VALUE fuse_object = (VALUE) ctx->private_data;
       VALUE open_files = rb_iv_get(fuse_object,"@open_files");
       VALUE key = rb_funcall(rffi,rb_intern("object_id"),0);
       rb_hash_delete(open_files,key);
-  } else {
-      return Qnil;
-  }
+
+      return rffi;
+  } 
+
+  return Qnil;
 
 }
 
@@ -136,5 +138,4 @@ void file_info_init(VALUE module) {
      Filehandle - can be any ruby object
   */
   rb_define_attr(cFileInfo,"fh",1,1);
-  return cFileInfo;
 }

data/ext/rfuse/filler.c

@@ -27,18 +27,19 @@ VALUE rfiller_new(VALUE class){
  */
 VALUE rfiller_push(VALUE self, VALUE name, VALUE stat, VALUE offset) {
   struct filler_t *f;
+  int result;
+  
   Data_Get_Struct(self,struct filler_t,f);
-  //Allow nil return instead of a stat
 
-  int result;
 
+  //Allow nil return instead of a stat
   if (NIL_P(stat)) {
-    result = f->filler(f->buffer,STR2CSTR(name),NULL,NUM2LONG(offset));
+    result = f->filler(f->buffer,StringValueCStr(name),NULL,NUM2LONG(offset));
   } else {
     struct stat st;
     memset(&st, 0, sizeof(st));
     rstat2stat(stat,&st);
-    result = f->filler(f->buffer,STR2CSTR(name),&st,NUM2LONG(offset));
+    result = f->filler(f->buffer,StringValueCStr(name),&st,NUM2LONG(offset));
   }
 
   return result ? Qnil : self;

data/ext/rfuse/helper.c

@@ -1,13 +1,10 @@
 #include "helper.h"
 
-char*
-rb_compat_str2cstr(VALUE x)
-{
-  return StringValuePtr(x);
-}
-
 void rstat2stat(VALUE rstat, struct stat *statbuf)
 {
+  ID to_i;
+  VALUE r_atime,r_mtime,r_ctime;
+
   statbuf->st_dev     = FIX2ULONG(rb_funcall(rstat,rb_intern("dev"),0));
   statbuf->st_ino     = FIX2ULONG(rb_funcall(rstat,rb_intern("ino"),0));
   statbuf->st_mode    = FIX2UINT(rb_funcall(rstat,rb_intern("mode"),0));
@@ -19,11 +16,11 @@ 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));
 
-  VALUE r_atime = rb_funcall(rstat,rb_intern("atime"),0);
-  VALUE r_mtime = rb_funcall(rstat,rb_intern("mtime"),0);
-  VALUE r_ctime = rb_funcall(rstat,rb_intern("ctime"),0);
+  r_atime = rb_funcall(rstat,rb_intern("atime"),0);
+  r_mtime = rb_funcall(rstat,rb_intern("mtime"),0);
+  r_ctime = rb_funcall(rstat,rb_intern("ctime"),0);
 
-  ID to_i = rb_intern("to_i");
+  to_i = rb_intern("to_i");
 
   statbuf->st_atime = NUM2ULONG(rb_funcall(r_atime,to_i,0));
   statbuf->st_mtime = NUM2ULONG(rb_funcall(r_mtime,to_i,0));
@@ -31,7 +28,9 @@ void rstat2stat(VALUE rstat, struct stat *statbuf)
 
 //TODO: Find out the correct way to test for nano second resolution availability
 #ifdef _STATBUF_ST_NSEC
-  ID nsec = rb_intern("nsec");
+  {
+  ID nsec;
+  nsec = rb_intern("nsec");
 
   if (rb_respond_to(r_atime,nsec))
     statbuf->st_atim.tv_nsec = NUM2ULONG(rb_funcall(r_atime,nsec,0));
@@ -41,6 +40,7 @@ void rstat2stat(VALUE rstat, struct stat *statbuf)
 
   if (rb_respond_to(r_ctime,nsec))
     statbuf->st_ctim.tv_nsec = NUM2ULONG(rb_funcall(r_ctime,nsec,0));
+  }
 #endif
 
 }
@@ -71,22 +71,26 @@ void rfuseconninfo2fuseconninfo(VALUE rfuseconninfo,struct fuse_conn_info *fusec
 
 struct fuse_args * rarray2fuseargs(VALUE rarray){
 
+  int i;
+  struct fuse_args *args;
+  //TODO - we probably don't want to execute the rest if the type check fails
   Check_Type(rarray, T_ARRAY);
-  struct fuse_args *args = malloc(sizeof(struct fuse_args));
+  
+  args = malloc(sizeof(struct fuse_args));
   args->argc      = RARRAY_LEN(rarray) + 1;
   args->argv      = malloc((args->argc + 1) * sizeof(char *));
   args->allocated = 1;
 
-  int i;
-  VALUE v;
 
   args->argv[0] = strdup("");
 
   for(i = 0; i < args->argc - 1; i++) {
+      VALUE v;
       v = RARRAY_PTR(rarray)[i];
       Check_Type(v, T_STRING);
-      args->argv[i+1] = strdup(rb_string_value_ptr(&v)); //STR2CSTR(RSTRING(v));
-                                      }
+      args->argv[i+1] = strdup(rb_string_value_ptr(&v)); 
+  }
+
   args->argv[args->argc] = NULL;
                         
   return args;

data/ext/rfuse/helper.h

@@ -3,20 +3,12 @@
 #include <ruby.h>
 #include <fuse.h>
 
-#ifndef _RHUSE_HELPER_H
-#define _RHUSE_HELPER_H
-
-#define STR2CSTR(x) rb_compat_str2cstr(x)
-char *rb_compat_str2cstr(VALUE);
+#ifndef _RFUSE_HELPER_H
+#define _RFUSE_HELPER_H
 
 void rstat2stat(VALUE rstat,struct stat *statbuf);
 void rstatvfs2statvfs(VALUE rstatvfs,struct statvfs *statvfsbuf);
 void rfuseconninfo2fuseconninfo(VALUE rfuseconninfo,struct fuse_conn_info *fuseconninfo);
 struct fuse_args * rarray2fuseargs(VALUE rarray);
 
-#if defined(RUBY_VERSION) && RUBY_VERSION >= 19
-  #define STR2CSTR(X) StringValuePtr(X)
-#endif
-
-
 #endif

data/ext/rfuse/intern_rfuse.c

@@ -23,15 +23,9 @@ int intern_fuse_destroy(struct intern_fuse *inf){
   return 0;
 }
 
-int intern_fuse_init(
-  struct intern_fuse *inf,
-  struct fuse_args *args,
-  void* user_data
-  )
+int intern_fuse_init(struct intern_fuse *inf, struct fuse_args *args, void* user_data)
 {
   struct fuse_chan* fc;
-  int res;                                       
-
   char* mountpoint;
   mountpoint = inf->mountpoint;
   fc = fuse_mount(mountpoint,args);
@@ -41,6 +35,7 @@ int intern_fuse_init(
   }
 
   inf->fuse=fuse_new(fc, args, &(inf->fuse_op), sizeof(struct fuse_operations), user_data);
+
   if (inf->fuse == NULL) {
       fuse_unmount(inf->mountpoint, fc);
       return -1;
@@ -58,13 +53,14 @@ int intern_fuse_fd(struct intern_fuse *inf)
      return -1;
    }
 
-  struct fuse_chan *fc = inf->fc;
-  return fuse_chan_fd(fc);
+  return fuse_chan_fd(inf->fc);
 }
 
 //Process one fuse command (ie after IO.select)
 int intern_fuse_process(struct intern_fuse *inf)
 {
+  struct fuse_cmd *cmd;
+
   if (inf->fuse == NULL) {
     return -1;
   }
@@ -73,7 +69,6 @@ int intern_fuse_process(struct intern_fuse *inf)
     return -1;
   }
 
-  struct fuse_cmd *cmd;
   cmd = fuse_read_cmd(inf->fuse);
 
   if (cmd != NULL) {