diff --git a/basis/unix/process/process.factor b/basis/unix/process/process.factor index 030f0977e2..175425f948 100644 --- a/basis/unix/process/process.factor +++ b/basis/unix/process/process.factor @@ -33,7 +33,7 @@ FUNCTION: int execve ( char* path, char** argv, char** envp ) ; [ first ] [ ] bi exec-with-path ; : exec-args-with-env ( seq seq -- int ) - >r [ first ] [ ] bi r> exec-with-env ; + [ [ first ] [ ] bi ] dip exec-with-env ; : with-fork ( child parent -- ) [ [ fork-process dup zero? ] dip [ drop ] prepose ] dip diff --git a/basis/unix/statfs/netbsd/netbsd.factor b/basis/unix/statfs/netbsd/netbsd.factor index 56c632edb4..ad7c161713 100644 --- a/basis/unix/statfs/netbsd/netbsd.factor +++ b/basis/unix/statfs/netbsd/netbsd.factor @@ -31,8 +31,8 @@ C-STRUCT: statvfs { "uid_t" "f_owner" } { { "uint32_t" 4 } "f_spare" } { { "char" _VFS_NAMELEN } "f_fstypename" } - { { "char" _VFS_NAMELEN } "f_mntonname" } - { { "char" _VFS_NAMELEN } "f_mntfromname" } ; + { { "char" _VFS_MNAMELEN } "f_mntonname" } + { { "char" _VFS_MNAMELEN } "f_mntfromname" } ; FUNCTION: int statvfs ( char* path, statvfs *buf ) ; diff --git a/basis/unix/unix.factor b/basis/unix/unix.factor index ca8a7a2e60..d917425bf9 100644 --- a/basis/unix/unix.factor +++ b/basis/unix/unix.factor @@ -198,10 +198,10 @@ FUNCTION: ssize_t readlink ( char* path, char* buf, size_t bufsize ) ; : PATH_MAX 1024 ; inline : read-symbolic-link ( path -- path ) - PATH_MAX dup >r - PATH_MAX - [ readlink ] unix-system-call - r> swap head-slice >string ; + PATH_MAX dup [ + PATH_MAX + [ readlink ] unix-system-call + ] dip swap head-slice >string ; FUNCTION: ssize_t recv ( int s, void* buf, size_t nbytes, int flags ) ; FUNCTION: ssize_t recvfrom ( int s, void* buf, size_t nbytes, int flags, sockaddr-in* from, socklen_t* fromlen ) ;