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

* genio.c (scm_do_read_line): Don't just politely check that the

Browse source 
line was either non-empty or EOF.  Abort if it's empty and not
EOF.
This commit is contained in:
Jim Blandy 1998-10-12 20:09:34 +00:00
parent c8983d6a2c
commit 4eebd8fcea
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libguile/genio.c
View file

@ -183,11 +183,18 @@ scm_do_read_line (port, len)
i = SCM_PTOBNUM (port); i = SCM_PTOBNUM (port);
SCM_SYSCALL (s = (scm_ptobs[i].fgets) (port, len)); SCM_SYSCALL (s = (scm_ptobs[i].fgets) (port, len));
/* We should never get an empty string. Every line has a newline at
the end, except for the last one. If the last line has no
newline and is empty, then that's just an ordinary EOF, and we
should have s == NULL. But this seems obscure to me, so we check
this here, to protect ourselves from odd port implementations. */
if (s && *len <= 0)
abort ();
/* If we're not at EOF, and there was a newline at the end of the /* If we're not at EOF, and there was a newline at the end of the
string, increment the line counter. */ string, increment the line counter. */
if (s && *len > 0 && s[*len - 1] == '\n') if (s && s[*len - 1] == '\n')
SCM_INCLINE(port); SCM_INCLINE(port);
return s; return s;
} }