From 41beb477c5744bc396fa1162ee0c14218ec12213 Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Mon, 27 May 2019 08:20:32 -0700
Subject: [PATCH] Fix bug in undefer_input() that misplaced the input state.

---
 fileio.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fileio.c b/fileio.c
index c042987..bc00d74 100644
--- a/fileio.c
+++ b/fileio.c
@@ -530,8 +530,10 @@ void undefer_input(__G)
          * This condition was checked when G.incnt_leftover was set > 0 in
          * defer_leftover_input(), and it is NOT allowed to touch G.csize
          * before calling undefer_input() when (G.incnt_leftover > 0)
-         * (single exception: see read_byte()'s  "G.csize <= 0" handling) !!
+         * (single exception: see readbyte()'s  "G.csize <= 0" handling) !!
          */
+        if (G.csize < 0L)
+            G.csize = 0L;
         G.incnt = G.incnt_leftover + (int)G.csize;
         G.inptr = G.inptr_leftover - (int)G.csize;
         G.incnt_leftover = 0;
='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=8fb26437048aed696d256501cf6009c0460bb5a5'>refs</a><a class='active' href='/guix/log/build-aux/update-NEWS.scm'>log</a><a href='/guix/tree/build-aux/update-NEWS.scm?id=8fb26437048aed696d256501cf6009c0460bb5a5'>tree</a><a href='/guix/commit/build-aux/update-NEWS.scm?id=8fb26437048aed696d256501cf6009c0460bb5a5'>commit</a><a href='/guix/diff/build-aux/update-NEWS.scm?id=8fb26437048aed696d256501cf6009c0460bb5a5'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/build-aux/update-NEWS.scm'>
<input type='hidden' name='id' value='8fb26437048aed696d256501cf6009c0460bb5a5'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=8fb26437048aed696d256501cf6009c0460bb5a5'>root</a>/<a href='/guix/log/build-aux?id=8fb26437048aed696d256501cf6009c0460bb5a5'>build-aux</a>/<a href='/guix/log/build-aux/update-NEWS.scm?id=8fb26437048aed696d256501cf6009c0460bb5a5'>update-NEWS.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/build-aux/update-NEWS.scm?id=8fb26437048aed696d256501cf6009c0460bb5a5&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-05-20 11:50:21 +0200'>2019-05-20</span></td><td><a href='/guix/commit/build-aux/update-NEWS.scm?id=996ecaf64e397341dbed70198032ce828040e5ac'>maint: update-NEWS: Track "gcc-toolchain", not "gcc".</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to d78010b81ee6ef4fd8803082e2f401b9e55b44db.

* build-aux/update-NEWS.scm (write-packages-updates)[important]: Replace
"gcc" by "gcc-toolchain".
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-12-05 00:08:34 +0100'>2018-12-05</span></td><td><a href='/guix/commit/build-aux/update-NEWS.scm?id=e3c03952be99419b958e98e5934fb3b86f71165d'>maint: update-NEWS: Don't produce full package lists.</a><span class='msg-avail'>...<span class='msg-tooltip'>The lists of new and upgraded packages in 'NEWS' had become way too long
and redundant with what 'guix pull' reports.

* build-aux/update-NEWS.scm (write-packages-added): Don't print ADDED.
(write-packages-updates)[important, table, latest, noteworthy]: New
variables.
Print NOTEWORTHY rather than all of UPGRADED.
(main): Print PREVIOUS-VERSION and NEW-VERSION.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-09-02 16:43:10 +0200'>2018-09-02</span></td><td><a href='/guix/commit/build-aux/update-NEWS.scm?id=fe634eaf93ba40862acdf62d7f197c6f19f0651c'>Add (guix describe) and use it to initialize '%package-search-path'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/describe.scm: New file.
* Makefile.am (MODULES): Add it.
* gnu/packages.scm (%default-package-module-path): New variable.
(%package-module-path): Honor 'package-path-entries'.
* build-aux/update-NEWS.scm (main): Use %DEFAULT-PACKAGE-MODULE-PATH
instead of (last (%package-module-path)).
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-05-18 16:24:02 +0200'>2017-05-18</span></td><td><a href='/guix/commit/build-aux/update-NEWS.scm?id=920803fbf443f7e40ed299f433255f10a4ae9fb3'>maint: Add 'update-NEWS' target.</a><span class='msg-avail'>...<span class='msg-tooltip'>* build-aux/update-NEWS.scm: New file.
* Makefile.am (EXTRA_DIST): Add it.
(GUIX_MAINTENANCE_DIRECTORY): New variable.
(update-NEWS): New target.
(.PHONY): Add it.
</span></span></td><td>Ludovic Courtès</td></tr>