diff options
author | Mark H Weaver <mhw@netris.org> | 2014-09-30 03:50:47 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2014-09-30 03:50:47 -0400 |
commit | 856d318a9f543d8a61fcf61caae7d07102586802 (patch) | |
tree | 10bd99500c027bbd472253f6cc34f8b1b516d4a1 /libguile/filesys.c | |
parent | f7582f9807d9a10fba86f54c4aeaa7444c51a315 (diff) | |
parent | 3157d455039f137ca5dfa8b9fbc4a3404ce00606 (diff) | |
download | guile-856d318a9f543d8a61fcf61caae7d07102586802.tar.gz |
Merge branch 'stable-2.0'
Conflicts:
benchmark-suite/benchmarks/ports.bm
libguile/async.h
libguile/bytevectors.c
libguile/foreign.c
libguile/gsubr.c
libguile/srfi-1.c
libguile/vm-engine.h
libguile/vm-i-scheme.c
module/Makefile.am
module/language/tree-il/analyze.scm
module/language/tree-il/peval.scm
module/scripts/compile.scm
module/scripts/disassemble.scm
test-suite/tests/asm-to-bytecode.test
test-suite/tests/peval.test
test-suite/tests/rdelim.test
Diffstat (limited to 'libguile/filesys.c')
-rw-r--r-- | libguile/filesys.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libguile/filesys.c b/libguile/filesys.c index a2280a51a..204d74eed 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 @@ -1238,6 +1239,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; |