unix: fixed read-symbolic-link (#1074) + tests

[factor.git] / basis / unix / unix.factor

diff --git a/basis/unix/unix.factor b/basis/unix/unix.factor
index 4364fd40d0e618cc76bb15c14dd01aa7a311cccb..7c61cd531fe15a2eaab522c3ba1feaeb5a5381b0 100644 (file)
--- a/basis/unix/unix.factor
+++ b/basis/unix/unix.factor
@@ -1,11 +1,10 @@
 ! Copyright (C) 2005, 2010 Slava Pestov.
 ! Copyright (C) 2008 Eduardo Cavazos.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien.c-types alien.syntax byte-vectors
-classes.struct combinators.short-circuit combinators.smart
-generalizations kernel libc locals math sequences
-sequences.generalizations strings system unix.ffi vocabs.loader
-;
+USING: accessors alien.c-types alien.syntax byte-arrays classes.struct
+combinators.short-circuit combinators.smart generalizations kernel
+libc locals math sequences sequences.generalizations strings system
+unix.ffi vocabs.loader ;
 IN: unix
 
 ERROR: unix-system-call-error args errno message word ;
@@ -79,11 +78,14 @@ M: unix open-file [ open ] unix-system-call ;
         swap >>actime
         [ utime ] unix-system-call drop ;
 
+: (read-symbolic-link) ( path bufsiz -- path' )
+    dup <byte-array> 3dup swap [ readlink ] unix-system-call
+    pick dupd < [ head >string 2nip ] [
+        2nip 2 * (read-symbolic-link)
+    ] if ;
+
 : read-symbolic-link ( path -- path )
-    PATH_MAX <byte-vector> [
-        underlying>> PATH_MAX
-        [ readlink ] unix-system-call
-    ] keep swap >>length >string ;
+    4096 (read-symbolic-link) ;
 
 : unlink-file ( path -- ) [ unlink ] unix-system-call drop ;