diff options
| author | Andy Wingo <wingo@pobox.com> | 2012-06-22 13:18:02 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2012-06-22 13:18:02 +0200 |
| commit | 0dd7c5407599b65a1a3da4b9bd8feccc715b51f7 (patch) | |
| tree | 7e54c75087c5ea3f876bcb54cc49c70ec87ae0b5 /libguile/strports.c | |
| parent | 747747ee06ac64c224b91e8f64f810a1159c1675 (diff) | |
| parent | 2874f66017b7bfae256e85af84689d00ecc418ab (diff) | |
| download | guile-0dd7c5407599b65a1a3da4b9bd8feccc715b51f7.tar.gz | |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
libguile/deprecated.c
libguile/ports.c
libguile/ports.h
libguile/strports.c
test-suite/tests/cse.test
Diffstat (limited to 'libguile/strports.c')
| -rw-r--r-- | libguile/strports.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libguile/strports.c b/libguile/strports.c index 7b51a8c87..702022740 100644 --- a/libguile/strports.c +++ b/libguile/strports.c @@ -1,5 +1,6 @@ -/* Copyright (C) 1995,1996,1998,1999,2000,2001,2002, 2003, 2005, 2006, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. - * +/* Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006, + * 2009, 2010, 2011, 2012 Free Software Foundation, Inc. + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License * as published by the Free Software Foundation; either version 3 of @@ -292,10 +293,11 @@ scm_mkstrport (SCM pos, SCM str, long modes, const char *caller) z = scm_c_make_port_with_encoding (scm_tc16_strport, modes, encoding, - SCM_FAILED_CONVERSION_ERROR, + scm_i_default_port_conversion_handler (), (scm_t_bits)buf); pt = SCM_PTAB_ENTRY (z); + pt->write_buf = pt->read_buf = (unsigned char *) c_buf; pt->read_pos = pt->write_pos = pt->read_buf + c_pos; pt->read_buf_size = read_buf_size; |