From 2a9b15aefb842a734637f3d230936ea1b7c60096 Mon Sep 17 00:00:00 2001
From: Philip Kime <Philip@kime.org.uk>
Date: Thu, 8 Nov 2018 22:02:09 +0100
Subject: [PATCH] Fix to address #239

---
 lib/Biber.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Biber.pm b/lib/Biber.pm
index 8b1f80a5..d97fca29 100644
--- a/lib/Biber.pm
+++ b/lib/Biber.pm
@@ -311,6 +311,8 @@ sub parse_ctrlfile {
     unless (eval {$checkbuf = File::Slurper::read_text($ctrl_file_path, 'latin1')}) {
       biber_error("$ctrl_file_path is not UTF-8 or even latin1, how horrible.");
     }
+    # Write ctrl file as UTF-8
+    File::Slurper::write_text($ctrl_file_path, NFC($checkbuf));# Unicode NFC boundary
   }
 
   $checkbuf = NFD($checkbuf);# Unicode NFD boundary
@@ -319,8 +321,6 @@ sub parse_ctrlfile {
     unlink($output) unless $output eq '-';# ignore deletion of STDOUT marker
     biber_error("$ctrl_file_path is malformed, last biblatex run probably failed. Deleted $output");
   }
-  # Write ctrl file as UTF-8
-  File::Slurper::write_text($ctrl_file_path, NFC($checkbuf));# Unicode NFC boundary
 
   # Validate if asked to
   if (Biber::Config->getoption('validate_control')) {
/a><a href='/guix/tree/tests/zlib.scm?id=96dc8f3527a6ac0c84b51f7a0cac1d8052cf0e72'>tree</a><a href='/guix/commit/tests/zlib.scm?id=96dc8f3527a6ac0c84b51f7a0cac1d8052cf0e72'>commit</a><a href='/guix/diff/tests/zlib.scm?id=96dc8f3527a6ac0c84b51f7a0cac1d8052cf0e72'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/zlib.scm'>
<input type='hidden' name='id' value='96dc8f3527a6ac0c84b51f7a0cac1d8052cf0e72'/><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=96dc8f3527a6ac0c84b51f7a0cac1d8052cf0e72'>root</a>/<a href='/guix/log/tests?id=96dc8f3527a6ac0c84b51f7a0cac1d8052cf0e72'>tests</a>/<a href='/guix/log/tests/zlib.scm?id=96dc8f3527a6ac0c84b51f7a0cac1d8052cf0e72'>zlib.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/tests/zlib.scm?id=96dc8f3527a6ac0c84b51f7a0cac1d8052cf0e72&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2017-10-11 15:20:50 +0200'>2017-10-11</span></td><td><a href='/guix/commit/tests/zlib.scm?id=85a2b58987bc32e33e63bea86c1a94496b796ae9'>zlib: Fix memory leak due to revealed ports not being GC'd.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://bugs.gnu.org/28784&gt;.

This mostly reverts 81a0f1cdf12e7bcc34c1203f034a323fa8f52cf5, which
introduced a regression: revealed ports are *never* GC'd (contrary to
what Guile's manual suggests).

In addition to the revert, 'close-procedure' now explicitly swallows
EBADF errors when 'close-port' is called.

* guix/zlib.scm (close-procedure): New procedure.
(make-gzip-input-port)[gzfile]: Use 'fileno' instead of 'port-&gt;fdes'.
Use 'close-procedure' instead of 'gzclose'.
(make-gzip-output-port): Likewise.
* tests/zlib.scm ("compression/decompression pipe"): Use 'port-closed?'
to determine whether PARENT has been closed.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-03-15 15:19:53 +0100'>2017-03-15</span></td><td><a href='/guix/commit/tests/zlib.scm?id=81a0f1cdf12e7bcc34c1203f034a323fa8f52cf5'>zlib: Don't rely on EBADF being ignored by 'fport_close'.</a><span class='msg-avail'>...<span class='msg-tooltip'>In 2.2, 'fport_close' no longer swallows EBADF and instead raises a
'system-error' for this.  This commit adjusts for 2.2.

* guix/zlib.scm (close-procedure): Remove.
(make-gzip-input-port): Use 'port-&gt;fdes' instead of 'fileno'.
Use 'gzclose' instead of 'close-procedure'.
(make-gzip-output-port): Likewise.
* tests/zlib.scm ("compression/decompression pipe"): Don't check whether
PARENT is closed using 'port-closed?'.  Instead, use 'seek' on the
underlying FD and check for EBADF.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2016-07-19 00:07:12 +0200'>2016-07-19</span></td><td><a href='/guix/commit/tests/zlib.scm?id=721539026dda02e58addbb618f2102b31a2927f8'>Add (guix zlib).</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/zlib.scm, tests/zlib.scm: New files.
* Makefile.am (MODULES): Add guix/zlib.scm.
(SCM_TESTS): Add tests/zlib.scm.
* m4/guix.m4 (GUIX_LIBGCRYPT_LIBDIR): New macro.
* configure.ac (LIBGCRYPT_LIBDIR): Use it.  Define and substitute
'LIBZ'.
* guix/config.scm.in (%libz): New variable.
</span></span></td><td>Ludovic Courtès</td></tr>