net-smb 0.0.4 → 0.0.5

data/.gitignore

@@ -5,4 +5,8 @@
 *.so
 Gemfile.lock
 Makefile
+Rakefile.local
+tags
 pkg/*
+test/log
+test/log.*

data/CHANGES

@@ -1,3 +1,6 @@
+Ruby Net::SMB 0.0.5 (2013-03-09)
+  * Add Net::SMB#xattr, Net::SMB::Dir#xattr, Net::SMB::File#xattr
+
 Ruby Net::SMB 0.0.4 (2013-02-28)
 
   * Add Net::SMB::Stat

data/README.md

@@ -23,7 +23,7 @@ Development Resources
 Copyright
 ----------------------------------------------------------------------
 
-Copyright (C) 2013 SATOH Fumiyas @ OSS Technology Corp., Japan
+Copyright (C) 2012-2013 SATOH Fumiyas @ OSS Technology Corp., Japan
 
 Licensed under the GNU General Public License version 3
 

data/ext/net_smb/rb_smb.h

@@ -1,7 +1,7 @@
 /*
  * Ruby/Net::SMB - SMB/CIFS client (Samba libsmbclient binding) for Ruby
  * Common header for Net::SMB
- * Copyright (C) 2012 SATOH Fumiyas @ OSS Technology Corp., Japan
+ * Copyright (C) 2012-2013 SATOH Fumiyas @ OSS Technology Corp., Japan
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -112,6 +112,8 @@ void Init_net_smbdir(void);
 void Init_net_smbdirentry(void);
 void Init_net_smbfile(void);
 
+VALUE rb_smb_xattr_get(VALUE self, VALUE url_obj, VALUE name_obj);
+
 #define _RB_SMB_H_
 
 #endif /* _RB_SMB_H_ */

data/ext/net_smb/smb.c

@@ -1,7 +1,7 @@
 /*
  * Ruby/Net::SMB - SMB/CIFS client (Samba libsmbclient binding) for Ruby
  * Net::SMB class
- * Copyright (C) 2012 SATOH Fumiyas @ OSS Technology Corp., Japan
+ * Copyright (C) 2012-2013 SATOH Fumiyas @ OSS Technology Corp., Japan
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,8 @@
 VALUE rb_cSMB;
 VALUE rb_eSMBError;
 
+static ID id_call;
+
 /* ====================================================================== */
 
 static void smbcctx_auth_fn(SMBCCTX *smbcctx,
@@ -43,7 +45,7 @@ static void smbcctx_auth_fn(SMBCCTX *smbcctx,
   }
 
   cred_obj = rb_funcall(data->auth_callback,
-    rb_intern("call"), 2,
+    id_call, 2,
     rb_str_new2(server),
     rb_str_new2(share));
 
@@ -268,6 +270,21 @@ static VALUE rb_smb_open(int argc, VALUE *argv, VALUE self)
   return smbfile;
 }
 
+VALUE rb_smb_xattr_get(VALUE self, VALUE url_obj, VALUE name_obj)
+{
+  RB_SMB_DATA_FROM_OBJ(self, data);
+  const char *url = RSTRING_PTR(url_obj);
+  const char *name = RSTRING_PTR(name_obj);
+  char value[1024];
+
+  smbc_getxattr_fn fn = smbc_getFunctionGetxattr(data->smbcctx);
+
+  if ((*fn)(data->smbcctx, url, name, value, sizeof(value)) < 0) {
+    rb_sys_fail_str(url_obj);
+  }
+
+  return rb_str_new2(value);
+}
 
 /* ====================================================================== */
 
@@ -288,10 +305,13 @@ void Init_net_smb(void)
   rb_define_method(rb_cSMB, "stat", rb_smb_stat, 1);
   rb_define_method(rb_cSMB, "opendir", rb_smb_opendir, 1);
   rb_define_method(rb_cSMB, "open", rb_smb_open, -1);
+  rb_define_method(rb_cSMB, "xattr", rb_smb_xattr_get, 2);
 
   /* Net::SMB::Error */
   rb_eSMBError = rb_define_class_under(rb_cSMB, "Error", rb_eStandardError);
 
+  id_call = rb_intern("call");
+
   const char *smbc_ver = smbc_version();
   int smbc_ver_major = atoi(smbc_ver);
   int smbc_ver_minor = (smbc_ver = strchr(smbc_ver, '.')) ? atoi(++smbc_ver) : 0;

data/ext/net_smb/smbdir.c

@@ -1,7 +1,7 @@
 /*
  * Ruby/Net::SMB - SMB/CIFS client (Samba libsmbclient binding) for Ruby
  * Net::SMB::Dir class
- * Copyright (C) 2012 SATOH Fumiyas @ OSS Technology Corp., Japan
+ * Copyright (C) 2012-2013 SATOH Fumiyas @ OSS Technology Corp., Japan
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,7 +41,7 @@ static void rb_smbdir_close_by_data(RB_SMBFILE_DATA *data)
   smbc_closedir_fn fn = smbc_getFunctionClosedir(data->smbcctx);
 
   if ((*fn)(data->smbcctx, data->smbcfile) != 0) {
-    rb_sys_fail("SMBC_closedir_ctx() failed");
+    rb_sys_fail(data->url);
   }
 }
 
@@ -94,7 +94,7 @@ static VALUE rb_smbdir_initialize(VALUE self, VALUE smb_obj, VALUE url_obj)
   fn = smbc_getFunctionOpendir(smb_data->smbcctx);
   data->smbcfile = (*fn)(smb_data->smbcctx, url);
   if (data->smbcfile == NULL) {
-    rb_sys_fail("SMBC_opendir_ctx() failed");
+    rb_sys_fail_str(url_obj);
   }
 
   /* FIXME: Take encoding from argument */
@@ -156,6 +156,13 @@ static VALUE rb_smbdir_stat(VALUE self)
   return rb_class_new_instance(1, &self, rb_cSMBStat);
 }
 
+static VALUE rb_smbdir_xattr_get(VALUE self, VALUE name_obj)
+{
+  RB_SMBFILE_DATA_FROM_OBJ(self, data);
+
+  return rb_smb_xattr_get(data->smb_obj, rb_str_new2(data->url), name_obj);
+}
+
 static VALUE rb_smbdir_tell(VALUE self)
 {
   RB_SMBFILE_DATA_FROM_OBJ(self, data);
@@ -169,7 +176,7 @@ static VALUE rb_smbdir_tell(VALUE self)
   offset = (*fn)(data->smbcctx, data->smbcfile);
   if (offset == (off_t)-1) {
     if (errno != 0) {
-      rb_sys_fail("SMBC_telldir_ctx() failed");
+      rb_sys_fail(data->url);
     }
   }
 
@@ -187,7 +194,7 @@ static VALUE rb_smbdir_seek(VALUE self, VALUE offset_num)
 
   errno = 0;
   if ((*fn)(data->smbcctx, data->smbcfile, offset) == -1) {
-    rb_sys_fail("SMBC_lseekdir_ctx() failed");
+    rb_sys_fail(data->url);
   }
 
   return self;
@@ -212,7 +219,7 @@ static VALUE rb_smbdir_read(VALUE self)
 
   if (smbcdent == NULL) {
     if (errno) {
-      rb_sys_fail("SMBC_readdir_ctx() failed");
+      rb_sys_fail(data->url);
     }
 
     return Qnil;
@@ -259,6 +266,7 @@ void Init_net_smbdir(void)
   rb_define_method(rb_cSMBDir, "close", rb_smbdir_close, 0);
   rb_define_method(rb_cSMBDir, "closed?", rb_smbdir_closed_p, 0);
   rb_define_method(rb_cSMBDir, "stat", rb_smbdir_stat, 0);
+  rb_define_method(rb_cSMBDir, "xattr", rb_smbdir_xattr_get, 1);
   rb_define_method(rb_cSMBDir, "tell", rb_smbdir_tell, 0);
   rb_define_alias(rb_cSMBDir, "pos", "tell");
   rb_define_method(rb_cSMBDir, "seek", rb_smbdir_seek, 1);

data/ext/net_smb/smbdirentry.c

@@ -1,7 +1,7 @@
 /*
  * Ruby/Net::SMB - SMB/CIFS client (Samba libsmbclient binding) for Ruby
  * Net::SMB::DirEntry class
- * Copyright (C) 2012 SATOH Fumiyas @ OSS Technology Corp., Japan
+ * Copyright (C) 2012-2013 SATOH Fumiyas @ OSS Technology Corp., Japan
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

data/ext/net_smb/smbfile.c

@@ -1,7 +1,7 @@
 /*
  * Ruby/Net::SMB - SMB/CIFS client (Samba libsmbclient binding) for Ruby
  * Net::SMB::File class
- * Copyright (C) 2012 SATOH Fumiyas @ OSS Technology Corp., Japan
+ * Copyright (C) 2012-2013 SATOH Fumiyas @ OSS Technology Corp., Japan
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,7 +42,7 @@ static void rb_smbfile_close_by_data(RB_SMBFILE_DATA *data)
   smbc_close_fn fn = smbc_getFunctionClose(data->smbcctx);
 
   if ((*fn)(data->smbcctx, data->smbcfile) != 0) {
-    rb_sys_fail("SMBC_close_ctx() failed");
+    rb_sys_fail(data->url);
   }
 }
 
@@ -86,7 +86,7 @@ static void rb_smbfile_open_by_data(RB_SMBFILE_DATA *data)
 
   data->smbcfile = (*fn)(data->smbcctx, data->url, data->oflags, 0);
   if (data->smbcfile == NULL) {
-    rb_sys_fail("SMBC_open_ctx() failed");
+    rb_sys_fail(data->url);
   }
 
   RB_SMB_DEBUG("smbcctx=%p smbcfile=%p\n", data->smbcctx, data->smbcfile);
@@ -97,7 +97,7 @@ static void rb_smbfile_seek_by_data(RB_SMBFILE_DATA *data)
   smbc_lseek_fn fn = smbc_getFunctionLseek(data->smbcctx);
 
   if ((*fn)(data->smbcctx, data->smbcfile, data->pos, SEEK_SET) == -1) {
-    rb_sys_fail("SMBC_lseek_ctx() failed");
+    rb_sys_fail(data->url);
   }
 
   data->buffer_used_size = 0;
@@ -240,6 +240,13 @@ static VALUE rb_smbfile_stat(VALUE self)
   return rb_class_new_instance(1, &self, rb_cSMBStat);
 }
 
+static VALUE rb_smbfile_xattr_get(VALUE self, VALUE name_obj)
+{
+  RB_SMBFILE_DATA_FROM_OBJ(self, data);
+
+  return rb_smb_xattr_get(data->smb_obj, rb_str_new2(data->url), name_obj);
+}
+
 static VALUE rb_smbfile_pos(VALUE self)
 {
   RB_SMBFILE_DATA_FROM_OBJ(self, data);
@@ -265,15 +272,17 @@ static VALUE rb_smbfile_seek(int argc, VALUE *argv, VALUE self)
   case SEEK_CUR:
     if (offset < 0 && offset < -data->pos) {
       errno = EINVAL;
-      rb_sys_fail("SMBC_lseek_ctx() failed");
+      rb_sys_fail(data->url);
     }
     data->pos += offset;
     break;
   case SEEK_END:
-    rb_sys_fail("FIXME");
+    /* FIXME */
+    rb_raise(rb_eNotImpError, "SEEK_END");
     break;
   default:
-    rb_sys_fail("FIXME");
+    errno = EINVAL;
+    rb_sys_fail(data->url);
     break;
   }
 
@@ -388,6 +397,7 @@ void Init_net_smbfile(void)
   rb_define_method(rb_cSMBFile, "close", rb_smbfile_close, 0);
   rb_define_method(rb_cSMBFile, "closed?", rb_smbfile_closed_p, 0);
   rb_define_method(rb_cSMBFile, "stat", rb_smbfile_stat, 0);
+  rb_define_method(rb_cSMBFile, "xattr", rb_smbfile_xattr_get, 1);
   rb_define_method(rb_cSMBFile, "pos", rb_smbfile_pos, 0);
   rb_define_alias(rb_cSMBFile, "tell", "pos");
   rb_define_method(rb_cSMBFile, "seek", rb_smbfile_seek, -1);

data/ext/net_smb/smbstat.c

@@ -1,7 +1,7 @@
 /*
  * Ruby/Net::SMB - SMB/CIFS client (Samba libsmbclient binding) for Ruby
  * Net::SMB::Stat class
- * Copyright (C) 2012 SATOH Fumiyas @ OSS Technology Corp., Japan
+ * Copyright (C) 2012-2013 SATOH Fumiyas @ OSS Technology Corp., Japan
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -70,7 +70,7 @@ static VALUE rb_smbstat_initialize(int argc, VALUE *argv, VALUE self)
     const char *url = StringValueCStr(url_obj);
     smbc_stat_fn fn = smbc_getFunctionStat(smb_data->smbcctx);
     if ((*fn)(smb_data->smbcctx, url, &data->stat)) {
-      rb_sys_fail("SMBC_stat_ctx() failed");
+      rb_sys_fail_str(url_obj);
     }
   }
   else if (rb_obj_is_kind_of(smb_or_file_obj, rb_cSMBFile)) {
@@ -78,7 +78,7 @@ static VALUE rb_smbstat_initialize(int argc, VALUE *argv, VALUE self)
     smbc_fstat_fn fn = smbc_getFunctionFstat(smbfile_data->smbcctx);
 
     if ((*fn)(smbfile_data->smbcctx, smbfile_data->smbcfile, &data->stat)) {
-      rb_sys_fail("SMBC_fstat_ctx() failed");
+      rb_sys_fail(smbfile_data->url);
     }
   }
   else if (rb_obj_is_kind_of(smb_or_file_obj, rb_cSMBDir)) {
@@ -91,12 +91,12 @@ static VALUE rb_smbstat_initialize(int argc, VALUE *argv, VALUE self)
     smbc_fstatdir_fn fn = smbc_getFunctionFstatdir(smbfile_data->smbcctx);
 
     if ((*fn)(smbfile_data->smbcctx, smbfile_data->smbcfile, &data->stat)) {
-      rb_sys_fail("SMBC_fstatdir_ctx() failed");
+      rb_sys_fail(smbfile_data->url);
     }
 #else
     smbc_stat_fn fn = smbc_getFunctionStat(smbfile_data->smbcctx);
     if ((*fn)(smbfile_data->smbcctx, smbfile_data->url, &data->stat)) {
-      rb_sys_fail("SMBC_stat_ctx() failed");
+      rb_sys_fail(smbfile_data->url);
     }
 #endif
   }

data/lib/net/smb/version.rb

@@ -1,5 +1,5 @@
 module Net #:nodoc:
   class SMB #:nodoc:
-    VERSION = "0.0.4" #:nodoc:
+    VERSION = "0.0.5" #:nodoc:
   end
 end

data/test/etc/smb.conf

@@ -6,6 +6,7 @@ cache directory = %$(TEST_SAMBA_VAR_DIR)
 pid directory = %$(TEST_SAMBA_VAR_DIR)
 ncalrpc dir = %$(TEST_SAMBA_VAR_DIR)
 
+netbios name = localhost
 map to guest = BAD USER
 stat cache = no
 

data/test/test_net_smb.rb

@@ -415,6 +415,24 @@ class SMBTest < Test::Unit::TestCase
     end
   end
 
+  def test_smb_xattr
+    smb = self.smb
+
+    owner = "LOCALHOST\\#{@@username}"
+
+    smb.opendir(@@share_public) do |smbdir|
+      while dent = smbdir.read
+	next if (dent.name =~ /^\.\.?$/)
+	next if (dent.name =~ /\.noaccess$/)
+
+        assert_equal(owner, smb.xattr(dent.url, 'system.nt_sec_desc.owner+'))
+        assert_raise(Errno::EINVAL) do
+          assert_equal(owner, smb.xattr(dent.url, 'invalid-xattr-name'))
+        end
+      end
+    end
+  end
+
   def test_file_open_read_close
     smb = self.smb
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-smb
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2013-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler