diff --git a/src/init.c b/src/init.c index a45e685..2814f1d 100644 --- a/src/init.c +++ b/src/init.c @@ -162,16 +162,16 @@ int main( int argc, char *argv[] ) { bind_function( L"inspect", &lisp_inspect ); bind_function( L"multiply", &lisp_multiply ); bind_function( L"negative?", &lisp_is_negative ); - bind_function( L"read", &lisp_read ); - bind_function( L"repl", &lisp_repl ); bind_function( L"oblist", &lisp_oblist ); bind_function( L"open", &lisp_open ); bind_function( L"print", &lisp_print ); bind_function( L"progn", &lisp_progn ); bind_function( L"read", &lisp_read ); - bind_function( L"read_char", &lisp_read_char ); + bind_function( L"read-char", &lisp_read_char ); + bind_function( L"repl", &lisp_repl ); bind_function( L"reverse", &lisp_reverse ); bind_function( L"set", &lisp_set ); + bind_function( L"slurp", &lisp_slurp ); bind_function( L"source", &lisp_source ); bind_function( L"subtract", &lisp_subtract ); bind_function( L"throw", &lisp_exception ); diff --git a/src/io/fopen.c b/src/io/fopen.c index 499fada..3b09957 100644 --- a/src/io/fopen.c +++ b/src/io/fopen.c @@ -47,6 +47,7 @@ #include +#include "debug.h" #include "fopen.h" /* we use a global one for convenience */ @@ -474,6 +475,7 @@ wint_t url_fgetwc( URL_FILE * input ) { break; } + debug_printf( DEBUG_IO, L"url_fgetwc returning %d (%C)\n", result, result); return result; } @@ -483,7 +485,7 @@ wint_t url_ungetwc( wint_t wc, URL_FILE * input ) { switch ( input->type ) { case CFTYPE_FILE: fwide( input->handle.file, 1 ); /* wide characters */ - result = fgetwc( input->handle.file ); /* passthrough */ + result = ungetwc( wc, input->handle.file ); /* passthrough */ break; case CFTYPE_CURL:{