--- a/fileio.c	2014-12-05 05:06:05 -0600
+++ b/fileio.c	2017-11-14 01:06:28 -0600
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 1990-2009 Info-ZIP.  All rights reserved.
+  Copyright (c) 1990-2017 Info-ZIP.  All rights reserved.
 
   See the accompanying file LICENSE, version 2009-Jan-02 or later
   (the contents of which are also included in unzip.h) for terms of use.
@@ -1582,6 +1582,8 @@
     int r = IZ_PW_ENTERED;
     char *m;
     char *prompt;
+    char *ep;
+    char *zp;
 
 #ifndef REENTRANT
     /* tell picky compilers to shut up about "unused variable" warnings */
@@ -1590,9 +1592,12 @@
 
     if (*rcnt == 0) {           /* First call for current entry */
         *rcnt = 2;
-        if ((prompt = (char *)malloc(2*FILNAMSIZ + 15)) != (char *)NULL) {
-            sprintf(prompt, LoadFarString(PasswPrompt),
-                    FnFilter1(zfn), FnFilter2(efn));
+        zp = FnFilter1( zfn);
+        ep = FnFilter2( efn);
+        prompt = (char *)malloc(        /* Slightly too long (2* "%s"). */
+         sizeof( PasswPrompt)+ strlen( zp)+ strlen( ep));
+        if (prompt != (char *)NULL) {
+            sprintf(prompt, LoadFarString(PasswPrompt), zp, ep);
             m = prompt;
         } else
             m = (char *)LoadFarString(PasswPrompt2);
ab8290c06af242579c01c72219d11eea453c2dae'>tree</a><a href='/guix/commit/tests/search-paths.scm?id=ab8290c06af242579c01c72219d11eea453c2dae'>commit</a><a href='/guix/diff/tests/search-paths.scm?id=ab8290c06af242579c01c72219d11eea453c2dae'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/search-paths.scm'>
<input type='hidden' name='id' value='ab8290c06af242579c01c72219d11eea453c2dae'/><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=ab8290c06af242579c01c72219d11eea453c2dae'>root</a>/<a href='/guix/log/tests?id=ab8290c06af242579c01c72219d11eea453c2dae'>tests</a>/<a href='/guix/log/tests/search-paths.scm?id=ab8290c06af242579c01c72219d11eea453c2dae'>search-paths.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/search-paths.scm?id=ab8290c06af242579c01c72219d11eea453c2dae&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-06-14 22:09:38 +0200'>2019-06-14</span></td><td><a href='/guix/commit/tests/search-paths.scm?id=92d00ca4661e186022732a47956a2bc0ef16be96'>build: Remove 'gnu/packages/bootstrap' and its binaries.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/local.mk (bootstrapdir, bootstrap_i686_linuxdir)
(bootstrap_armhf_linuxdir, bootstrap_aarch64_linuxdir)
(bootstrap_mips64el_linuxdir, dist_bootstrap_i686_linux_DATA)
(dist_bootstrap_armhf_linux_DATA, dist_bootstrap_aarch64_linux_DATA)
(dist_bootstrap_mips64el_linux_DATA): Remove.
(set-bootstrap-executable-permissions): Remove target.
* Makefile.am (install-data-hook): Remove dependency on
'set-bootstrap-executable-permissions'.
* gnu/packages/bootstrap: Remove directory.
* tests/search-paths.scm ("evaluate-search-paths, separator is #f"):
Adjust to match .../aux-files/linux-libre.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-04-04 00:10:00 +0200'>2017-04-04</span></td><td><a href='/guix/commit/tests/search-paths.scm?id=f73bb91ebe8d78f54bb90d2168b353a4f5210f02'>tests: Adjust search-paths test following the introduction of aarch64.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes a regression introduced in
3b88f3767d9f3ad2cc64173525cd53d429bfe7e7.

* tests/search-paths.scm ("evaluate-search-paths, separator is #f"):
Change the expected result to "aarch64-linux".
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-01-23 22:23:41 +0100'>2017-01-23</span></td><td><a href='/guix/commit/tests/search-paths.scm?id=fcd75bdbfa99d14363b905afbf914eec20e69df8'>search-paths: Allow specs with #f as their separator.</a><span class='msg-avail'>...<span class='msg-tooltip'>This adds support for single-entry search paths.
Fixes &lt;http://bugs.gnu.org/25422&gt;.
Reported by Leo Famulari &lt;leo@famulari.name&gt;.

* guix/search-paths.scm (&lt;search-path-specification&gt;)[separator]:
Document as string or #f.
(evaluate-search-paths): Add case for SEPARATOR as #f.
(environment-variable-definition): Handle SEPARATOR being #f.
* guix/build/utils.scm (list-&gt;search-path-as-string): Add case for
SEPARATOR as #f.
(search-path-as-string-&gt;list): Likewise.
* guix/build/profiles.scm (abstract-profile): Likewise.
* tests/search-paths.scm: New file.
* Makefile.am (SCM_TESTS): Add it.
* tests/packages.scm ("--search-paths with single-item search path"):
New test.
* gnu/packages/version-control.scm (git)[native-search-paths](separator):
New field.
</span></span></td><td>Ludovic Courtès</td></tr>