From 2396e90056706ef897acab3aaa081289c7336483 Mon Sep 17 00:00:00 2001
From: LEPILLER Julien <julien.lepiller@irisa.fr>
Date: Fri, 19 Apr 2019 11:48:39 +0200
Subject: [PATCH] Allow variable parameters

---
 mecab/src/param.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mecab/src/param.cpp b/mecab/src/param.cpp
index 65328a2..006b1b5 100644
--- a/mecab/src/param.cpp
+++ b/mecab/src/param.cpp
@@ -79,8 +79,12 @@ bool Param::load(const char *filename) {
     size_t s1, s2;
     for (s1 = pos+1; s1 < line.size() && isspace(line[s1]); s1++);
     for (s2 = pos-1; static_cast<long>(s2) >= 0 && isspace(line[s2]); s2--);
-    const std::string value = line.substr(s1, line.size() - s1);
+    std::string value = line.substr(s1, line.size() - s1);
     const std::string key   = line.substr(0, s2 + 1);
+
+    if(value.find('$') == 0) {
+        value = std::getenv(value.substr(1).c_str());
+    }
     set<std::string>(key.c_str(), value, false);
   }
 
-- 
2.20.1

'tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=d5f8b50365533f2713596f59519c48019f6b1f19'>refs</a><a class='active' href='/guix/log/tests/cve.scm'>log</a><a href='/guix/tree/tests/cve.scm?id=d5f8b50365533f2713596f59519c48019f6b1f19'>tree</a><a href='/guix/commit/tests/cve.scm?id=d5f8b50365533f2713596f59519c48019f6b1f19'>commit</a><a href='/guix/diff/tests/cve.scm?id=d5f8b50365533f2713596f59519c48019f6b1f19'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/cve.scm'>
<input type='hidden' name='id' value='d5f8b50365533f2713596f59519c48019f6b1f19'/><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=d5f8b50365533f2713596f59519c48019f6b1f19'>root</a>/<a href='/guix/log/tests?id=d5f8b50365533f2713596f59519c48019f6b1f19'>tests</a>/<a href='/guix/log/tests/cve.scm?id=d5f8b50365533f2713596f59519c48019f6b1f19'>cve.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/cve.scm?id=d5f8b50365533f2713596f59519c48019f6b1f19&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-10-23 16:40:17 +0200'>2019-10-23</span></td><td><a href='/guix/commit/tests/cve.scm?id=74afaa37d5dec1a9d1b83951529ba69d8947fb07'>cve: Rewrite to read the JSON feed instead of the XML feed.</a><span class='msg-avail'>...<span class='msg-tooltip'>The XML feed was discontinued on Oct. 16th, 2019:

  &lt;https://nvd.nist.gov/General/News/XML-Vulnerability-Feed-Retirement-Phase-3&gt;

* guix/cve.scm (string-&gt;date*): New procedure.
(&lt;cve-item&gt;, &lt;cve&gt;, &lt;cve-reference&gt;): New record types.
(cpe-match-&gt;cve-configuration, configuration-data-&gt;cve-configurations)
(json-&gt;cve-items, version-matches?): New procedures.
(yearly-feed-uri): Change URL to refer to JSON feed.
(cpe-&gt;product-alist, %parse-vulnerability-feed)
(xml-&gt;vulnerabilities): Remove.
(cve-configuration-&gt;package-list, merge-package-lists)
(cve-item-&gt;vulnerability, json-&gt;vulnerabilities): New procedures.
(write-cache): Use 'json-&gt;vulnerabilities' instead of
'xml-&gt;vulnerabilities', and remove 'parameterize'.
(vulnerabilities-&gt;lookup-proc): Use 'version-matches?' when VERSION is
true.
* tests/cve.scm (%sample): Use 'tests/cve-sample.json'.
(%expected-vulnerabilities): Rewrite accordingly.
("json-&gt;cve-items", "cve-item-published-date")
("json-&gt;vulnerabilities"): New tests.
("xml-&gt;vulnerabilities"): Remove.
("vulnerabilities-&gt;lookup-proc"): Adjust to new vulnerabilities.
* tests/cve-sample.json: New file.
* tests/cve-sample.xml: Remove.
* Makefile.am (EXTRA_DIST): Adjust accordingly.
* doc/guix.texi (Invoking guix lint): Update nist.gov URLs.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-10-20 23:26:50 +0200'>2019-10-20</span></td><td><a href='/guix/commit/tests/cve.scm?id=79c03e55e26d88c8d327daced02367abe7f17f91'>tests: Avoid now-deprecated 'make-struct'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* tests/cve.scm (vulnerability): Use 'make-struct/no-tail' instead of
'make-struct', which is deprecated.
* tests/lint.scm ("cve: one vulnerability")
("cve: one patched vulnerability")
("cve: known safe from vulnerability")
("cve: vulnerability fixed in replacement version")
("cve: patched vulnerability in replacement"): Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>