X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/d7a67c3e918acd8ca46dc7792a8ca98b33cb94e8..c0a56ec78ddf9df65f591104a1d7bbcada099477:/libguile/filesys.c diff --git a/libguile/filesys.c b/libguile/filesys.c index a2280a51a..95d1a9dff 100644 --- a/libguile/filesys.c +++ b/libguile/filesys.c @@ -50,6 +50,7 @@ #include "libguile/validate.h" #include "libguile/filesys.h" +#include "libguile/load.h" /* for scm_i_mirror_backslashes */ #ifdef HAVE_IO_H @@ -773,8 +774,13 @@ SCM_DEFINE (scm_select, "select", 3, 2, 0, "This procedure has a variety of uses: waiting for the ability\n" "to provide input, accept output, or the existence of\n" "exceptional conditions on a collection of ports or file\n" - "descriptors, or waiting for a timeout to occur.\n" - "It also returns if interrupted by a signal.\n\n" + "descriptors, or waiting for a timeout to occur.\n\n" + + "When an error occurs, of if it is interrupted by a signal, this\n" + "procedure throws a @code{system-error} exception\n" + "(@pxref{Conventions, @code{system-error}}). In case of an\n" + "interruption, the associated error number is @var{EINTR}.\n\n" + "@var{reads}, @var{writes} and @var{excepts} can be lists or\n" "vectors, with each member a port or a file descriptor.\n" "The value returned is a list of three corresponding\n" @@ -1238,6 +1244,9 @@ SCM_DEFINE (scm_getcwd, "getcwd", 0, 0, 0, errno = save_errno; SCM_SYSERROR; } + /* On Windows, convert backslashes in current directory to forward + slashes. */ + scm_i_mirror_backslashes (wd); result = scm_from_locale_stringn (wd, strlen (wd)); free (wd); return result;