rfuse 1.0.4.RC0 → 1.0.4.RC1

data/ext/rfuse/rfuse.c

@@ -815,7 +815,8 @@ static VALUE unsafe_read(VALUE *args)
   VALUE res;
   
   res = rb_funcall3(args[0],rb_intern("read"),5,&args[1]);
-
+  //TODO If res does not implement to_str then you'll get an exception here that
+  //is hard to debug
   return StringValue(res);
 }
 
@@ -1006,14 +1007,14 @@ static int rf_setxattr(const char *path,const char *name,
    @param [String] name
 
    @return [String] attribute value
-   @raise [Errno] Errno::ENODATA if attribute does not exist
+   @raise [Errno] Errno::ENOATTR if attribute does not exist
 
 */
 static VALUE unsafe_getxattr(VALUE *args)
 {
   VALUE res;
   res = rb_funcall3(args[0],rb_intern("getxattr"),3,&args[1]);
-
+  //TODO - exception won't should that we're calling getxattr
   return StringValue(res);
 }
 
@@ -1023,7 +1024,8 @@ static int rf_getxattr(const char *path,const char *name,char *buf,
   VALUE args[4];
   VALUE res;
   int error = 0;
- 
+  long length;
+
   struct fuse_context *ctx=fuse_get_context();
   init_context_path_args(args,ctx,path);
   
@@ -1036,7 +1038,12 @@ static int rf_getxattr(const char *path,const char *name,char *buf,
   }
   else
   {
-    return rb_strcpy(res,buf,size);
+    length = rb_strcpy(res,buf,size);
+    if (buf != NULL && length > (long) size)
+    }
+       return -ERANGE;
+    }
+    return length;
   }
 }
 
@@ -1066,16 +1073,25 @@ static int rf_listxattr(const char *path,char *buf, size_t size)
   VALUE args[3];
   VALUE res;
   int error = 0;
+  long length;
   
   struct fuse_context *ctx=fuse_get_context();
   init_context_path_args(args,ctx,path);
   
   res=rb_protect((VALUE (*)())unsafe_listxattr,(VALUE) args,&error);
 
-  if (error) {
+  if (error)
+  {
     return -(return_error(ENOENT));
-  } else {
-    return rb_strcpy(res,buf,size);
+  }
+  else
+  {
+    length = rb_strcpy(res,buf,size);
+    if (buf != NULL && length > (long) size)
+    {
+       return -ERANGE;
+    }
+    return length;
   }
 }
 

data/lib/rfuse/version.rb

@@ -1,3 +1,3 @@
 module RFuse
-  VERSION = "1.0.4.RC0"
+  VERSION = "1.0.4.RC1"
 end

data/spec/xattr_spec.rb

@@ -14,12 +14,14 @@ describe RFuse::Fuse do
                     "1"
                 when "user.two"
                     "2"
+                when "user.large"
+                    "x" * 1000
                 else
                     ""
                 end
             }
 
-            mockfs.stub(:listxattr).with(anything(),"/myfile").and_return([ "user.one","user.two" ])
+            mockfs.stub(:listxattr).with(anything(),"/myfile").and_return([ "user.one","user.two","user.large" ])
             mockfs.should_receive(:setxattr).with(anything(),"/myfile","user.three","updated",anything())
             mockfs.should_receive(:removexattr).with(anything(),"/myfile","user.one")
 
@@ -29,7 +31,7 @@ describe RFuse::Fuse do
                 xattr = Xattr.new("#{mountpoint}/myfile")
                 xattr.list.should include("user.one")
                 xattr.list.should include("user.two")
-                xattr.list.size.should == 2
+                xattr.list.size.should == 3
 
                 xattr['user.one'].should == "1"
                 xattr['user.two'].should == "2"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rfuse
 version: !ruby/object:Gem::Version
-  version: 1.0.4.RC0
+  version: 1.0.4.RC1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -170,7 +170,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 927008359791353354
+      hash: 3887867623874537565
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: