libc: adding memmove

[factor.git] / basis / libc / libc.factor

diff --git a/basis/libc/libc.factor b/basis/libc/libc.factor
index a2ed34c267dd7e72b1b4d374904240879535b970..644f35954a846553fa9db57a509682ae9be521a8 100644 (file)
--- a/basis/libc/libc.factor
+++ b/basis/libc/libc.factor
@@ -2,18 +2,20 @@
 ! Copyright (C) 2007, 2010 Slava Pestov
 ! Copyright (C) 2007, 2008 Doug Coleman
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien alien.c-types alien.syntax assocs continuations
-alien.destructors kernel namespaces accessors sets summary
-destructors destructors.private ;
+USING: accessors alien alien.c-types alien.destructors
+alien.syntax destructors destructors.private kernel math
+namespaces sequences sets summary system vocabs ;
 IN: libc
 
+HOOK: strerror os ( errno -- str )
+
 LIBRARY: factor
 
 FUNCTION-ALIAS: errno
-    int err_no ( ) ;
+    int err_no ( )
 
 FUNCTION-ALIAS: set-errno
-    void set_err_no ( int err-no ) ;
+    void set_err_no ( int err-no )
 
 : clear-errno ( -- )
     0 set-errno ;
@@ -24,16 +26,30 @@ FUNCTION-ALIAS: set-errno
 LIBRARY: libc
 
 FUNCTION-ALIAS: (malloc)
-    void* malloc ( size_t size ) ;
+    void* malloc ( size_t size )
 
 FUNCTION-ALIAS: (calloc)
-    void* calloc ( size_t count,  size_t size ) ;
+    void* calloc ( size_t count,  size_t size )
 
 FUNCTION-ALIAS: (free)
-    void free ( void* alien ) ;
+    void free ( void* alien )
 
 FUNCTION-ALIAS: (realloc)
-    void* realloc ( void* alien, size_t size ) ;
+    void* realloc ( void* alien, size_t size )
+
+FUNCTION-ALIAS: strerror_unsafe
+    char* strerror ( int errno )
+
+! Add a default strerror even though it's not threadsafe
+M: object strerror strerror_unsafe ;
+
+ERROR: libc-error errno message ;
+
+: (throw-errno) ( errno -- * ) dup strerror libc-error ;
+
+: throw-errno ( -- * ) errno (throw-errno) ;
+
+: io-error ( n -- ) 0 < [ throw-errno ] when ;
 
 <PRIVATE
 
@@ -43,7 +59,7 @@ TUPLE: malloc-ptr value continuation ;
 M: malloc-ptr hashcode* value>> hashcode* ;
 
 M: malloc-ptr equal?
-    over malloc-ptr? [ [ value>> ] bi@ = ] [ 2drop f ] if ;
+    over malloc-ptr? [ [ value>> ] same? ] [ 2drop f ] if ;
 
 : <malloc-ptr> ( value -- malloc-ptr )
     malloc-ptr new swap >>value ;
@@ -72,7 +88,7 @@ M: realloc-error summary
     [ <malloc-ptr> unregister-disposable ] when* ;
 
 : malloc-exists? ( alien -- ? )
-    <malloc-ptr> disposables get key? ;
+    <malloc-ptr> disposables get in? ;
 
 PRIVATE>
 
@@ -91,14 +107,21 @@ PRIVATE>
 : free ( alien -- )
     >c-ptr [ delete-malloc ] [ (free) ] bi ;
 
-FUNCTION: void memcpy ( void* dst, void* src, ulong size ) ;
+FUNCTION: void memset ( void* buf, int char, size_t size )
+
+FUNCTION: void memcpy ( void* dst, void* src, ulong size )
+
+FUNCTION: void memmove ( void* dst, void* src, ulong size )
 
-FUNCTION: int memcmp ( void* a, void* b, ulong size ) ;
+FUNCTION: int memcmp ( void* a, void* b, ulong size )
 
-: memory= ( a b size -- ? )
-    memcmp 0 = ;
+: memory= ( a b size -- ? ) memcmp 0 = ; inline
 
-FUNCTION: size_t strlen ( c-string alien ) ;
+FUNCTION: size_t strlen ( c-string alien )
+
+FUNCTION: int system ( c-string command )
 
 DESTRUCTOR: free
-DESTRUCTOR: (free)
+
+! For libc.linux, libc.windows, libc.macosx...
+<< "libc." os name>> append require >>