-/* Copyright (C) 1995,1996,1998,1999,2000,2001, 2002, 2003, 2006, 2009, 2010, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1998,1999,2000,2001, 2002, 2003, 2006, 2009, 2010, 2011, 2013 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
#include "libguile/_scm.h"
#include "libguile/eval.h"
#include "libguile/chars.h"
+#include "libguile/ports.h"
+#include "libguile/ports-internal.h"
#include "libguile/fports.h"
#include "libguile/root.h"
#include "libguile/strings.h"
{
SCM p = SCM_PACK (SCM_STREAM (port));
SCM ans;
- scm_t_port *pt;
+ scm_t_wchar c;
+ scm_t_port_internal *pti;
ans = scm_call_0 (SCM_SIMPLE_VECTOR_REF (p, 3)); /* get char. */
if (scm_is_false (ans) || SCM_EOF_OBJECT_P (ans))
return EOF;
SCM_ASSERT (SCM_CHARP (ans), ans, SCM_ARG1, "sf_fill_input");
- pt = SCM_PTAB_ENTRY (port);
+ pti = SCM_PORT_GET_INTERNAL (port);
- if (pt->encoding == NULL)
+ c = SCM_CHAR (ans);
+
+ if (pti->encoding_mode == SCM_PORT_ENCODING_MODE_LATIN1
+ || (pti->encoding_mode == SCM_PORT_ENCODING_MODE_UTF8 && c < 0xff))
{
scm_t_port *pt = SCM_PTAB_ENTRY (port);
- *pt->read_buf = SCM_CHAR (ans);
+ *pt->read_buf = c;
pt->read_pos = pt->read_buf;
pt->read_end = pt->read_buf + 1;
- return *pt->read_buf;
}
else
- scm_ungetc_unlocked (SCM_CHAR (ans), port);
- return SCM_CHAR (ans);
+ {
+ long line = SCM_LINUM (port);
+ int column = SCM_COL (port);
+
+ scm_ungetc_unlocked (c, port);
+
+ SCM_LINUM (port) = line;
+ SCM_COL (port) = column;
+ }
+
+ return c;
}