mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-20 02:30:23 +02:00
Code Activity

1999-08-19 Gary Houston <ghouston@easynet.co.uk>

Browse source 
* fports.c (fport_write): fix line-buffering mode again.
	(scm_open_file): recognise 'l' for line-buffering.
	(scm_setvbuf): recognise _IOLBF for line-buffering.
This commit is contained in:
Gary Houston 1999-08-19 21:25:56 +00:00
parent 92d9876b41
commit d363921411
2 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libguile/ChangeLog
View file

@ -1,3 +1,9 @@
1999-08-19 Gary Houston <ghouston@easynet.co.uk>
* fports.c (fport_write): fix line-buffering mode again.
(scm_open_file): recognise 'l' for line-buffering.
(scm_setvbuf): recognise _IOLBF for line-buffering.
1999-08-19 Mikael Djurfeldt <mdj@thalamus.nada.kth.se> 1999-08-19 Mikael Djurfeldt <mdj@thalamus.nada.kth.se>
* Makefile.am (libguile_la_LDFLAGS): Increased the version number * Makefile.am (libguile_la_LDFLAGS): Increased the version number

23
libguile/fports.c
View file

@ -137,8 +137,19 @@ scm_setvbuf (SCM port, SCM mode, SCM size)
s_setvbuf); s_setvbuf);
SCM_ASSERT (SCM_INUMP (mode), mode, SCM_ARG2, s_setvbuf); SCM_ASSERT (SCM_INUMP (mode), mode, SCM_ARG2, s_setvbuf);
cmode = SCM_INUM (mode); cmode = SCM_INUM (mode);
if (cmode != _IONBF && cmode != _IOFBF) if (cmode != _IONBF && cmode != _IOFBF && cmode != _IOLBF)
scm_out_of_range (s_setvbuf, mode); scm_out_of_range (s_setvbuf, mode);
if (cmode == _IOLBF)
{
SCM_SETCAR (port, SCM_CAR (port) | SCM_BUFLINE);
cmode = _IOFBF;
}
else
{
SCM_SETCAR (port, SCM_CAR (port) ^ SCM_BUFLINE);
}
if (SCM_UNBNDP (size)) if (SCM_UNBNDP (size))
{ {
if (cmode == _IOFBF) if (cmode == _IOFBF)
@ -153,6 +164,7 @@ scm_setvbuf (SCM port, SCM mode, SCM size)
if (csize < 0 || (cmode == _IONBF && csize > 0)) if (csize < 0 || (cmode == _IONBF && csize > 0))
scm_out_of_range (s_setvbuf, size); scm_out_of_range (s_setvbuf, size);
} }
pt = SCM_PTAB_ENTRY (port); pt = SCM_PTAB_ENTRY (port);
/* silently discards buffered chars. */ /* silently discards buffered chars. */
@ -250,6 +262,7 @@ scm_open_file (filename, modes)
break; break;
case '0': /* unbuffered: handled later. */ case '0': /* unbuffered: handled later. */
case 'b': /* 'binary' mode: ignored. */ case 'b': /* 'binary' mode: ignored. */
case 'l': /* line buffered: handled during output. */
break; break;
default: default:
scm_out_of_range (s_open_file, modes); scm_out_of_range (s_open_file, modes);
@ -476,14 +489,16 @@ fport_write (SCM port, void *data, size_t size)
else else
{ {
const char *input = (char *) data; const char *input = (char *) data;
while (size > 0) size_t remaining = size;
while (remaining > 0)
{ {
int space = pt->write_end - pt->write_pos; int space = pt->write_end - pt->write_pos;
int write_len = (size > space) ? space : size; int write_len = (remaining > space) ? space : remaining;
memcpy (pt->write_pos, input, write_len); memcpy (pt->write_pos, input, write_len);
pt->write_pos += write_len; pt->write_pos += write_len;
size -= write_len; remaining -= write_len;
input += write_len; input += write_len;
if (write_len == space) if (write_len == space)
fport_flush (port); fport_flush (port);