From 69e144245d36eab2636b08fbe7e26f0f9a395a1a Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Sun, 11 May 2008 22:05:53 -0500
Subject: [PATCH 1/9] add file parsing to ftp.client
---
extra/ftp/client/client.factor | 76 +++++++++++++++++++++++++++++++---
1 file changed, 71 insertions(+), 5 deletions(-)
diff --git a/extra/ftp/client/client.factor b/extra/ftp/client/client.factor
index 3ae3b27f2f..cd54baec95 100644
--- a/extra/ftp/client/client.factor
+++ b/extra/ftp/client/client.factor
@@ -1,12 +1,13 @@
! Copyright (C) 2008 Doug Coleman.
! See http://factorcode.org/license.txt for BSD license.
-USING: accessors classes.singleton combinators continuations
-io io.encodings.binary io.encodings.ascii io.files io.sockets
-kernel math math.parser sequences splitting namespaces strings ;
+USING: accessors arrays classes.singleton combinators
+continuations io io.encodings.binary io.encodings.ascii
+io.files io.sockets kernel math math.parser sequences
+splitting namespaces strings ;
IN: ftp.client
TUPLE: ftp-client host port stream user password mode ;
-TUPLE: ftp-response n strings ;
+TUPLE: ftp-response n strings parsed ;
SINGLETON: active
SINGLETON: passive
@@ -86,6 +87,70 @@ SINGLETON: passive
strings>> first
"|" split 2 tail* first string>number ;
+: ch>attribute ( ch -- symbol )
+ {
+ { CHAR: d [ +directory+ ] }
+ { CHAR: l [ +symbolic-link+ ] }
+ { CHAR: - [ +regular-file+ ] }
+ [ drop +unknown+ ]
+ } case ;
+
+TUPLE: remote-file
+ type permissions links owner group size month day time year name ;
+
+: <remote-file> ( -- remote-file ) remote-file new ;
+
+: parse-permissions ( remote-file str -- remote-file )
+ [ first ch>attribute >>type ] [ rest >>permissions ] bi ;
+
+: parse-list-9 ( lines -- seq )
+ [
+ <remote-file> swap {
+ [ 0 swap nth parse-permissions ]
+ [ 1 swap nth string>number >>links ]
+ [ 2 swap nth >>owner ]
+ [ 3 swap nth >>group ]
+ [ 4 swap nth string>number >>size ]
+ [ 5 swap nth >>month ]
+ [ 6 swap nth >>day ]
+ [ 7 swap nth >>time ]
+ [ 8 swap nth >>name ]
+ } cleave
+ ] map ;
+
+: parse-list-8 ( lines -- seq )
+ [
+ <remote-file> swap {
+ [ 0 swap nth parse-permissions ]
+ [ 1 swap nth string>number >>links ]
+ [ 2 swap nth >>owner ]
+ [ 3 swap nth >>size ]
+ [ 4 swap nth >>month ]
+ [ 5 swap nth >>day ]
+ [ 6 swap nth >>time ]
+ [ 7 swap nth >>name ]
+ } cleave
+ ] map ;
+
+: parse-list-3 ( lines -- seq )
+ [
+ <remote-file> swap {
+ [ 0 swap nth parse-permissions ]
+ [ 1 swap nth string>number >>links ]
+ [ 2 swap nth >>name ]
+ } cleave
+ ] map ;
+
+: parse-list ( ftp-response -- ftp-response )
+ dup strings>>
+ [ " " split [ empty? not ] filter ] map
+ dup length {
+ { 9 [ parse-list-9 ] }
+ { 8 [ parse-list-8 ] }
+ { 3 [ parse-list-3 ] }
+ [ drop ]
+ } case >>parsed ;
+
: ftp-epsv ( ftp-client -- ftp-response )
>r "EPSV" r> ftp-command ;
@@ -117,7 +182,8 @@ ERROR: ftp-error got expected ;
dup [ host>> ] [ start-2nd ] bi <inet> ascii <client>
over ftp-list 150 ftp-assert
lines <ftp-response> swap >>strings
- >r ftp-read 226 ftp-assert r> ;
+ >r ftp-read 226 ftp-assert r>
+ parse-list ;
: ftp-get ( filename ftp-client -- ftp-response )
dup [ host>> ] [ start-2nd ] bi <inet> binary <client>
From 2e4a171fcb3516901a35eda8b0fe4741ecf5e591 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 12 May 2008 14:09:24 -0500
Subject: [PATCH 2/9] io.unix.sockets: cleanup accept-sockaddr
---
extra/io/unix/sockets/sockets.factor | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extra/io/unix/sockets/sockets.factor b/extra/io/unix/sockets/sockets.factor
index 71edbc5500..8cdb484823 100755
--- a/extra/io/unix/sockets/sockets.factor
+++ b/extra/io/unix/sockets/sockets.factor
@@ -67,7 +67,7 @@ TUPLE: accept-task < input-task ;
accept-task <io-task> ;
: accept-sockaddr ( port -- fd sockaddr )
- dup port-handle swap server-port-addr sockaddr-type
+ [ handle>> ] [ addr>> sockaddr-type ] bi
dup <c-object> [ swap heap-size <int> accept ] keep ; inline
: do-accept ( port fd sockaddr -- )
From 1b39855447aff54ddd27afb4a23c41fbde507bc7 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 12 May 2008 16:33:04 -0500
Subject: [PATCH 3/9] unix.ffi: Moving functions to 'unix'
---
extra/unix/ffi/ffi.factor | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/extra/unix/ffi/ffi.factor b/extra/unix/ffi/ffi.factor
index e39d95dfa3..3751b4441c 100644
--- a/extra/unix/ffi/ffi.factor
+++ b/extra/unix/ffi/ffi.factor
@@ -3,13 +3,13 @@ USING: alien.syntax ;
IN: unix.ffi
-FUNCTION: int open ( char* path, int flags, int prot ) ;
+! FUNCTION: int open ( char* path, int flags, int prot ) ;
-C-STRUCT: utimbuf
- { "time_t" "actime" }
- { "time_t" "modtime" } ;
+! C-STRUCT: utimbuf
+! { "time_t" "actime" }
+! { "time_t" "modtime" } ;
-FUNCTION: int utime ( char* path, utimebuf* buf ) ;
+! FUNCTION: int utime ( char* path, utimebuf* buf ) ;
-FUNCTION: int err_no ( ) ;
-FUNCTION: char* strerror ( int errno ) ;
\ No newline at end of file
+! FUNCTION: int err_no ( ) ;
+! FUNCTION: char* strerror ( int errno ) ;
\ No newline at end of file
From 3691aa72ec3526a47465fd8e8e9ba9670c08e1aa Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 12 May 2008 17:11:40 -0500
Subject: [PATCH 4/9] unix: Now I see, all too clearly, the error of my ways
---
extra/io/unix/backend/backend.factor | 2 +-
extra/io/unix/files/files.factor | 2 +-
extra/io/unix/kqueue/kqueue.factor | 2 +-
extra/io/unix/sockets/sockets.factor | 2 +-
extra/unix/ffi/ffi.factor | 15 --------
extra/unix/system-call/system-call.factor | 15 --------
extra/unix/unix.factor | 42 +++++++++++++++++++----
7 files changed, 39 insertions(+), 41 deletions(-)
delete mode 100644 extra/unix/ffi/ffi.factor
delete mode 100644 extra/unix/system-call/system-call.factor
diff --git a/extra/io/unix/backend/backend.factor b/extra/io/unix/backend/backend.factor
index 902af8fe0d..08ff526f14 100644
--- a/extra/io/unix/backend/backend.factor
+++ b/extra/io/unix/backend/backend.factor
@@ -1,7 +1,7 @@
! Copyright (C) 2004, 2008 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
USING: alien generic assocs kernel kernel.private math
-io.nonblocking sequences strings structs sbufs threads unix.ffi unix
+io.nonblocking sequences strings structs sbufs threads unix
vectors io.buffers io.backend io.encodings math.parser
continuations system libc qualified namespaces io.timeouts
io.encodings.utf8 accessors ;
diff --git a/extra/io/unix/files/files.factor b/extra/io/unix/files/files.factor
index 28e08d4bf2..3254640900 100755
--- a/extra/io/unix/files/files.factor
+++ b/extra/io/unix/files/files.factor
@@ -45,7 +45,7 @@ M: unix (file-appender) ( path -- stream )
M: unix touch-file ( path -- )
normalize-path
- dup exists? [ f utime ] [
+ dup exists? [ touch ] [
touch-mode file-mode open close
] if ;
diff --git a/extra/io/unix/kqueue/kqueue.factor b/extra/io/unix/kqueue/kqueue.factor
index ec82a426d3..8e8fb0ec74 100755
--- a/extra/io/unix/kqueue/kqueue.factor
+++ b/extra/io/unix/kqueue/kqueue.factor
@@ -3,7 +3,7 @@
USING: alien.c-types kernel math math.bitfields namespaces
locals accessors combinators threads vectors hashtables
sequences assocs continuations sets
-unix.ffi unix unix.time unix.kqueue unix.process
+unix unix.time unix.kqueue unix.process
io.nonblocking io.unix.backend io.launcher io.unix.launcher
io.monitors ;
IN: io.unix.kqueue
diff --git a/extra/io/unix/sockets/sockets.factor b/extra/io/unix/sockets/sockets.factor
index 8cdb484823..c9fc9905a8 100755
--- a/extra/io/unix/sockets/sockets.factor
+++ b/extra/io/unix/sockets/sockets.factor
@@ -5,7 +5,7 @@ namespaces threads sequences byte-arrays io.nonblocking
io.binary io.unix.backend io.streams.duplex io.sockets.impl
io.backend io.files io.files.private io.encodings.utf8
math.parser continuations libc combinators system accessors
-qualified unix.ffi unix ;
+qualified unix ;
EXCLUDE: io => read write close ;
EXCLUDE: io.sockets => accept ;
diff --git a/extra/unix/ffi/ffi.factor b/extra/unix/ffi/ffi.factor
deleted file mode 100644
index 3751b4441c..0000000000
--- a/extra/unix/ffi/ffi.factor
+++ /dev/null
@@ -1,15 +0,0 @@
-
-USING: alien.syntax ;
-
-IN: unix.ffi
-
-! FUNCTION: int open ( char* path, int flags, int prot ) ;
-
-! C-STRUCT: utimbuf
-! { "time_t" "actime" }
-! { "time_t" "modtime" } ;
-
-! FUNCTION: int utime ( char* path, utimebuf* buf ) ;
-
-! FUNCTION: int err_no ( ) ;
-! FUNCTION: char* strerror ( int errno ) ;
\ No newline at end of file
diff --git a/extra/unix/system-call/system-call.factor b/extra/unix/system-call/system-call.factor
deleted file mode 100644
index bfcb9ae6ea..0000000000
--- a/extra/unix/system-call/system-call.factor
+++ /dev/null
@@ -1,15 +0,0 @@
-
-USING: kernel continuations sequences math accessors inference macros
- fry arrays.lib unix.ffi ;
-
-IN: unix.system-call
-
-ERROR: unix-system-call-error word args message ;
-
-MACRO: unix-system-call ( quot -- )
- [ ] [ infer in>> ] [ first ] tri
- '[
- [ @ dup 0 < [ dup throw ] [ ] if ]
- [ drop , narray , swap err_no strerror unix-system-call-error ]
- recover
- ] ;
diff --git a/extra/unix/unix.factor b/extra/unix/unix.factor
index c68f127226..9047a769ed 100755
--- a/extra/unix/unix.factor
+++ b/extra/unix/unix.factor
@@ -1,11 +1,11 @@
! Copyright (C) 2005, 2007 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
-USING: alien alien.c-types alien.syntax kernel libc structs
+USING: alien alien.c-types alien.syntax kernel libc structs sequences
+ continuations
math namespaces system combinators vocabs.loader qualified
- unix.ffi unix.types unix.system-call ;
-
-QUALIFIED: unix.ffi
+ accessors inference macros fry arrays.lib
+ unix.types ;
IN: unix
@@ -46,9 +46,22 @@ C-STRUCT: passwd
{ "time_t" "pw_expire" }
{ "int" "pw_fields" } ;
-! ! ! Unix functions
LIBRARY: factor
+
FUNCTION: void clear_err_no ( ) ;
+FUNCTION: int err_no ( ) ;
+
+ERROR: unix-system-call-error word args message ;
+
+DEFER: strerror
+
+MACRO: unix-system-call ( quot -- )
+ [ ] [ infer in>> ] [ first ] tri
+ '[
+ [ @ dup 0 < [ dup throw ] [ ] if ]
+ [ drop , narray , swap err_no strerror unix-system-call-error ]
+ recover
+ ] ;
LIBRARY: libc
@@ -100,9 +113,23 @@ FUNCTION: int munmap ( void* addr, size_t len ) ;
FUNCTION: uint ntohl ( uint n ) ;
FUNCTION: ushort ntohs ( ushort n ) ;
-: open ( path flags prot -- int ) [ unix.ffi:open ] unix-system-call ;
+FUNCTION: int open ( char* path, int flags, int prot ) ;
-: utime ( path buf -- ) [ unix.ffi:utime ] unix-system-call drop ;
+: open-file ( path flags mode -- fd ) [ open ] unix-system-call ;
+
+C-STRUCT: utimbuf
+ { "time_t" "actime" }
+ { "time_t" "modtime" } ;
+
+FUNCTION: int utime ( char* path, utimebuf* buf ) ;
+
+: touch ( filename -- ) f [ utime ] unix-system-call drop ;
+
+: change-file-times ( filename access modification -- )
+ "utimebuf" <c-object>
+ tuck set-utimbuf-modtime
+ tuck set-utimbuf-actime
+ [ utime ] unix-system-call drop ;
FUNCTION: int pclose ( void* file ) ;
FUNCTION: int pipe ( int* filedes ) ;
@@ -124,6 +151,7 @@ FUNCTION: int setreuid ( uid_t ruid, uid_t euid ) ;
FUNCTION: int setsockopt ( int s, int level, int optname, void* optval, socklen_t optlen ) ;
FUNCTION: int setuid ( uid_t uid ) ;
FUNCTION: int socket ( int domain, int type, int protocol ) ;
+FUNCTION: char* strerror ( int errno ) ;
FUNCTION: int symlink ( char* path1, char* path2 ) ;
FUNCTION: int system ( char* command ) ;
FUNCTION: int unlink ( char* path ) ;
From d1bae00e8a3e6363f8854289e87c7f7f66f0886b Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 12 May 2008 17:40:49 -0500
Subject: [PATCH 5/9] unix: Fix indentation
---
extra/unix/unix.factor | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/extra/unix/unix.factor b/extra/unix/unix.factor
index 9047a769ed..31146f9c8d 100755
--- a/extra/unix/unix.factor
+++ b/extra/unix/unix.factor
@@ -126,10 +126,10 @@ FUNCTION: int utime ( char* path, utimebuf* buf ) ;
: touch ( filename -- ) f [ utime ] unix-system-call drop ;
: change-file-times ( filename access modification -- )
- "utimebuf" <c-object>
- tuck set-utimbuf-modtime
- tuck set-utimbuf-actime
- [ utime ] unix-system-call drop ;
+ "utimebuf" <c-object>
+ tuck set-utimbuf-modtime
+ tuck set-utimbuf-actime
+ [ utime ] unix-system-call drop ;
FUNCTION: int pclose ( void* file ) ;
FUNCTION: int pipe ( int* filedes ) ;
From 8846650274992a16ffdf343bd89614e15844677f Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Mon, 12 May 2008 18:15:22 -0500
Subject: [PATCH 6/9] uses with-stream now
---
extra/ftp/client/client.factor | 135 +++++++++++++++------------------
1 file changed, 63 insertions(+), 72 deletions(-)
diff --git a/extra/ftp/client/client.factor b/extra/ftp/client/client.factor
index cd54baec95..fc70f279ed 100644
--- a/extra/ftp/client/client.factor
+++ b/extra/ftp/client/client.factor
@@ -2,11 +2,11 @@
! See http://factorcode.org/license.txt for BSD license.
USING: accessors arrays classes.singleton combinators
continuations io io.encodings.binary io.encodings.ascii
-io.files io.sockets kernel math math.parser sequences
-splitting namespaces strings ;
+io.files io.sockets kernel io.streams.duplex math
+math.parser sequences splitting namespaces strings fry ;
IN: ftp.client
-TUPLE: ftp-client host port stream user password mode ;
+TUPLE: ftp-client host port user password mode ;
TUPLE: ftp-response n strings parsed ;
SINGLETON: active
@@ -21,7 +21,7 @@ SINGLETON: passive
swap >>host
21 >>port
"anonymous" >>user
- "factor-ftp@factorcode.org" >>password ;
+ "ftp@my.org" >>password ;
: add-response-line ( ftp-response string -- ftp-response )
over strings>> push ;
@@ -32,56 +32,47 @@ SINGLETON: passive
: ftp-response-code ( string -- n/f )
dup fourth CHAR: - = [ drop f ] [ (ftp-response-code) ] if ;
-: last-code ( ftp-response -- n )
- strings>> peek (ftp-response-code) ;
-
-: read-response-until ( stream ftp-response n -- ftp-response )
- >r over stream-readln
+: read-response-loop ( ftp-response -- ftp-response )
+ readln
[ add-response-line ] [ ftp-response-code ] bi
- r> tuck = [ drop nip ] [ read-response-until ] if ;
+ over n>> = [ read-response-loop ] unless ;
-: read-response ( stream -- ftp-response )
- <ftp-response>
- over stream-readln
- [ add-response-line ] [ fourth CHAR: - = ] bi
- [ dup last-code read-response-until ]
- [ nip ] if dup last-code >>n ;
+: read-response ( -- ftp-response )
+ <ftp-response> readln
+ [ (ftp-response-code) >>n ]
+ [ add-response-line ]
+ [ fourth CHAR: - = ] tri
+ [ read-response-loop ] when ;
-: ftp-read ( ftp-client -- ftp-response )
- stream>> read-response ;
+: ftp-send ( string -- )
+ write "\r\n" write flush ;
-: ftp-send ( str ftp-client -- )
- stream>>
- [ stream-write ]
- [ "\r\n" swap stream-write ]
- [ stream-flush ] tri ;
-
-: ftp-command ( string ftp-client -- ftp-response )
- [ ftp-send ] [ ftp-read ] bi ;
+: ftp-command ( string -- ftp-response )
+ ftp-send read-response ;
: ftp-user ( ftp-client -- ftp-response )
- [ user>> "USER " prepend ] [ ftp-command ] bi ;
+ user>> "USER " prepend ftp-command ;
: ftp-password ( ftp-client -- ftp-response )
- [ password>> "PASS " prepend ] [ ftp-command ] bi ;
+ password>> "PASS " prepend ftp-command ;
-: ftp-set-binary ( ftp-client -- ftp-response )
- >r "TYPE I" r> ftp-command ;
+: ftp-set-binary ( -- ftp-response )
+ "TYPE I" ftp-command ;
-: ftp-pwd ( ftp-client -- ftp-response )
- >r "PWD" r> ftp-command ;
+: ftp-pwd ( -- ftp-response )
+ "PWD" ftp-command ;
-: ftp-list ( ftp-client -- ftp-response )
- >r "LIST" r> ftp-command ;
+: ftp-list ( -- ftp-response )
+ "LIST" ftp-command ;
-: ftp-quit ( ftp-client -- ftp-response )
- >r "QUIT" r> ftp-command ;
+: ftp-quit ( -- ftp-response )
+ "QUIT" ftp-command ;
-: ftp-cwd ( directory ftp-client -- ftp-response )
- >r "CWD " prepend r> ftp-command ;
+: ftp-cwd ( directory -- ftp-response )
+ "CWD " prepend ftp-command ;
-: ftp-retr ( filename ftp-client -- ftp-response )
- >r "RETR " prepend r> ftp-command ;
+: ftp-retr ( filename -- ftp-response )
+ "RETR " prepend ftp-command ;
: parse-epsv ( ftp-response -- port )
strings>> first
@@ -151,54 +142,54 @@ TUPLE: remote-file
[ drop ]
} case >>parsed ;
-: ftp-epsv ( ftp-client -- ftp-response )
- >r "EPSV" r> ftp-command ;
-
-M: ftp-client dispose ( ftp-client -- )
- [ ftp-quit drop ] [ stream>> dispose ] bi ;
+: ftp-epsv ( -- ftp-response )
+ "EPSV" ftp-command ;
ERROR: ftp-error got expected ;
: ftp-assert ( ftp-response n -- )
2dup >r n>> r> = [ 2drop ] [ ftp-error ] if ;
-: ftp-connect ( ftp-client -- )
- dup
- [ host>> ] [ port>> ] bi <inet> ascii <client>
- >>stream drop ;
-
: ftp-login ( ftp-client -- )
- {
- [ ftp-connect ]
- [ ftp-read 220 ftp-assert ]
- [ ftp-user 331 ftp-assert ]
- [ ftp-password 230 ftp-assert ]
- [ ftp-set-binary 200 ftp-assert ]
- } cleave ;
+ read-response 220 ftp-assert
+ [ ftp-user 331 ftp-assert ]
+ [ ftp-password 230 ftp-assert ] bi
+ ftp-set-binary 200 ftp-assert ;
-: start-2nd ( ftp-client -- port )
- ftp-epsv [ 229 ftp-assert ] [ parse-epsv ] bi ;
+: open-remote-port ( -- port )
+ ftp-epsv
+ [ 229 ftp-assert ] [ parse-epsv ] bi ;
: list ( ftp-client -- ftp-response )
- dup [ host>> ] [ start-2nd ] bi <inet> ascii <client>
- over ftp-list 150 ftp-assert
- lines <ftp-response> swap >>strings
- >r ftp-read 226 ftp-assert r>
+ host>> open-remote-port <inet> ascii <client>
+ ftp-list 150 ftp-assert
+ lines
+ <ftp-response> swap >>strings
+ read-response 226 ftp-assert
parse-list ;
: ftp-get ( filename ftp-client -- ftp-response )
- dup [ host>> ] [ start-2nd ] bi <inet> binary <client>
- rot tuck
- [ over ftp-retr 150 ftp-assert ]
- [ binary <file-writer> stream-copy ] 2bi*
- ftp-read dup 226 ftp-assert ;
+ host>> open-remote-port <inet> binary <client>
+ swap
+ [ ftp-retr 150 ftp-assert drop ]
+ [ binary <file-writer> stream-copy ] 2bi
+ read-response dup 226 ftp-assert ;
+
+: ftp-connect ( ftp-client -- stream )
+ [ host>> ] [ port>> ] bi <inet> ascii <client> ;
GENERIC: ftp-download ( path obj -- )
+: with-ftp-client ( ftp-client quot -- )
+ dupd '[
+ , [ ftp-login ] [ @ ] bi
+ ftp-quit drop
+ ] >r ftp-connect r> with-stream ; inline
+
M: ftp-client ftp-download ( path ftp-client -- )
- dup ftp-login
- [ >r parent-directory r> ftp-cwd drop ]
- [ >r file-name r> ftp-get drop ]
- [ dispose drop ] 2tri ;
+ [
+ [ drop parent-directory ftp-cwd drop ]
+ [ >r file-name r> ftp-get drop ] 2bi
+ ] with-ftp-client ;
M: string ftp-download ( path string -- )
<ftp-client> ftp-download ;
From 4697046d070b139a77863fd98602f77bc2a015d5 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Mon, 12 May 2008 18:18:14 -0500
Subject: [PATCH 7/9] add binding
---
extra/unix/unix.factor | 1 +
1 file changed, 1 insertion(+)
diff --git a/extra/unix/unix.factor b/extra/unix/unix.factor
index c68f127226..8085e4a51a 100755
--- a/extra/unix/unix.factor
+++ b/extra/unix/unix.factor
@@ -87,6 +87,7 @@ FUNCTION: int getgrnam_r ( char* name, group* grp, char* buffer, size_t bufsize,
FUNCTION: int getpwnam_r ( char* login, passwd* pwd, char* buffer, size_t bufsize, passwd** result ) ;
FUNCTION: int getgroups ( int gidsetlen, gid_t* gidset ) ;
FUNCTION: int gethostname ( char* name, int len ) ;
+FUNCTION: int getsockname ( int socket, sockaddr* address, socklen_t* address_len ) ;
FUNCTION: uid_t getuid ;
FUNCTION: uint htonl ( uint n ) ;
FUNCTION: ushort htons ( ushort n ) ;
From 0c83995f62ade144ef56a20ba17a35028d3b1ec3 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 12 May 2008 18:39:45 -0500
Subject: [PATCH 8/9] io.unix.sockets: cleanup do-accept
---
extra/io/unix/sockets/sockets.factor | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/extra/io/unix/sockets/sockets.factor b/extra/io/unix/sockets/sockets.factor
index c9fc9905a8..741e10f7a6 100755
--- a/extra/io/unix/sockets/sockets.factor
+++ b/extra/io/unix/sockets/sockets.factor
@@ -71,10 +71,7 @@ TUPLE: accept-task < input-task ;
dup <c-object> [ swap heap-size <int> accept ] keep ; inline
: do-accept ( port fd sockaddr -- )
- rot
- [ server-port-addr parse-sockaddr ] keep
- [ set-server-port-client-addr ] keep
- set-server-port-client ;
+ swapd over addr>> parse-sockaddr >>client-addr (>>client) ;
M: accept-task do-io-task
io-task-port dup accept-sockaddr
From 881739eda7426554ae20d5c81f120a91983b69dd Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Mon, 12 May 2008 18:40:20 -0500
Subject: [PATCH 9/9] And indent...
---
extra/io/unix/sockets/sockets.factor | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extra/io/unix/sockets/sockets.factor b/extra/io/unix/sockets/sockets.factor
index 741e10f7a6..ba0dedf0cc 100755
--- a/extra/io/unix/sockets/sockets.factor
+++ b/extra/io/unix/sockets/sockets.factor
@@ -71,7 +71,7 @@ TUPLE: accept-task < input-task ;
dup <c-object> [ swap heap-size <int> accept ] keep ; inline
: do-accept ( port fd sockaddr -- )
- swapd over addr>> parse-sockaddr >>client-addr (>>client) ;
+ swapd over addr>> parse-sockaddr >>client-addr (>>client) ;
M: accept-task do-io-task
io-task-port dup accept-sockaddr