Changeset 15012 in project

Timestamp:

06/18/09 03:23:12 (12 years ago)

Author:

Jim Ursetto

Message:

hfs+: update to version 0.2

Location:

release/4/hfs+/trunk

Files:

• hfs+.scm (modified) (6 diffs)
• hfs+.setup (modified) (1 diff)

release/4/hfs+/trunk/hfs+.scm

@@ -20 +20 @@
   get-extended-attribute set-extended-attribute!
   remove-extended-attribute!
-  get-extended-attributes)
+  get-extended-attributes
+  clear-extended-attributes!)
 
 (import scheme chicken foreign)
@@ -54 +55 @@
 (define removexattr
   (foreign-lambda int removexattr (const c-string) (const c-string) int))
+(define fremovexattr
+  (foreign-lambda int fremovexattr int (const c-string) int))
 
 (define-foreign-enum-type (xattr-options int)
@@ -59 +62 @@
   ((no-follow xattr/nofollow) XATTR_NOFOLLOW)
   ((create xattr/create) XATTR_CREATE)
-  ((replace xattr/replace) XATTR_REPLACE))
+  ((replace xattr/replace) XATTR_REPLACE)
+  ((silent xattr/silent) "0")  ; hack -- not a real API option :)
+  )
 
 (define strerror
@@ -143 +148 @@
                         buf)))))))))
 
+;; #:silent could, possibly, fail silently on errno/noattr or errno/exist.
 (define (set-extended-attribute! file attribute value . options)
   (let ((c-options (xattr-options->int options))  ; 'create + 'replace results in EINVAL
@@ -174 +180 @@
                (void)))))))
 
-;; Error signaled if attribute does not exist.  Unsure about this.
+;; Error signaled if attribute does not exist, but if you give the
+;; #:silent option it will fail silently.
 (define (remove-extended-attribute! file attribute . options)
-  (let ((c-options (xattr-options->int options)))
+  (let ((c-options (xattr-options->int options))
+        (attribute (if (symbol? attribute)
+                       (symbol->string attribute)
+                       attribute))
+        (removexattr (if (number? file)
+                         fremovexattr
+                         removexattr)))
     (let ((rv (removexattr file attribute c-options)))
       (cond ((< rv 0)
              (let ((err (update-errno)))
-               (xattr-error err 'remove-extended-attribute! file attribute)))
+               (if (and (= err errno/noattr)
+                        (memq #:silent options))
+                   (void)
+                   (xattr-error err 'remove-extended-attribute! file attribute))))
+            ((> rv 0)
+             (error 'remove-extended-attribute!
+                    "unexpected return value" rv))
             (else
              (void))))))
@@ -195 +214 @@
        (apply list-extended-attributes file options)))
 
+(define (clear-extended-attributes! file . options)
+  (for-each
+   (lambda (x)
+     (apply remove-extended-attribute! file x options))
+   (apply list-extended-attributes file options)))
+
 ;; (define (get-resource-fork filename)
 ;;   ...)

release/4/hfs+/trunk/hfs+.setup

@@ -4 +4 @@
  'foreigners
  '("hfs+.so" "hfs+.import.so")
- '((version 0.1)))
+ '((version 0.2)))