ffi: improve support for functions returning arrays

[m6w6/ext-psi] / psi.d / glob.psi

diff --git a/psi.d/glob.psi b/psi.d/glob.psi
index f4a762a729e1a0bfbac6e1877954d12abf449486..d0c62cbd16a856bfbe13a2afdfbfa0cd23e2b7aa 100644 (file)
--- a/psi.d/glob.psi
+++ b/psi.d/glob.psi
@@ -1,7 +1,12 @@
+#include <glob.h>
+
 function psi\glob(string $pattern, int $flags, array &$glob = NULL, callable $errfn = NULL) : int {
        let path = strval($pattern);
        let flags = intval($flags);
-       let err = callback intval($errfn(
+       let err = callback(
+               epath, 
+               eerrno
+       ) as intval($errfn(
                to_string(epath),
                to_int(eerrno)
        ));
@@ -14,7 +19,7 @@ function psi\glob(string $pattern, int $flags, array &$glob = NULL, callable $er
                        strval($gl_pathv)
                )
        );
-       return to_int(glob);
+       return glob(path, flags, err, buf) as to_int(glob);
        set $glob = to_array(*buf,
                to_int(gl_matchc),
                to_int(gl_pathc),
@@ -22,5 +27,4 @@ function psi\glob(string $pattern, int $flags, array &$glob = NULL, callable $er
                to_int(gl_flags),
                to_array(*gl_pathv, gl_pathc + gl_offs, to_string(*gl_pathv))
        );
-       free globfree(buf);
 }