deploy: c249eba

sylvestre · sylvestre · commit d00b886cbd89 · 2022-06-10T03:27:30.000Z
diff --git a/dev/src/uu_mktemp/mktemp.rs.html b/dev/src/uu_mktemp/mktemp.rs.html
@@ -491,6 +491,27 @@
 <span id="486">486</span>
 <span id="487">487</span>
 <span id="488">488</span>
+<span id="489">489</span>
+<span id="490">490</span>
+<span id="491">491</span>
+<span id="492">492</span>
+<span id="493">493</span>
+<span id="494">494</span>
+<span id="495">495</span>
+<span id="496">496</span>
+<span id="497">497</span>
+<span id="498">498</span>
+<span id="499">499</span>
+<span id="500">500</span>
+<span id="501">501</span>
+<span id="502">502</span>
+<span id="503">503</span>
+<span id="504">504</span>
+<span id="505">505</span>
+<span id="506">506</span>
+<span id="507">507</span>
+<span id="508">508</span>
+<span id="509">509</span>
 </pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.</span>
 <span class="comment">//</span>
 <span class="comment">// (c) Sunrin SHIMURA</span>
@@ -546,9 +567,14 @@
     <span class="doccomment">/// The template suffix contains a path separator (e.g. `&quot;XXXa/b&quot;`).</span>
     <span class="ident">SuffixContainsDirSeparator</span>(<span class="ident">String</span>),
     <span class="ident">InvalidTemplate</span>(<span class="ident">String</span>),
+    <span class="ident">TooManyTemplates</span>,
 }
 
-<span class="kw">impl</span> <span class="ident">UError</span> <span class="kw">for</span> <span class="ident">MkTempError</span> {}
+<span class="kw">impl</span> <span class="ident">UError</span> <span class="kw">for</span> <span class="ident">MkTempError</span> {
+    <span class="kw">fn</span> <span class="ident">usage</span>(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; <span class="ident">bool</span> {
+        <span class="macro">matches!</span>(<span class="self">self</span>, <span class="ident"><span class="self">Self</span>::TooManyTemplates</span>)
+    }
+}
 
 <span class="kw">impl</span> <span class="ident">Error</span> <span class="kw">for</span> <span class="ident">MkTempError</span> {}
 
@@ -578,6 +604,9 @@
                 <span class="string">&quot;invalid template, {}; with --tmpdir, it may not be absolute&quot;</span>,
                 <span class="ident">s</span>.<span class="ident">quote</span>()
             ),
+            <span class="ident">TooManyTemplates</span> =&gt; {
+                <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;too many templates&quot;</span>)
+            }
         }
     }
 }
@@ -801,11 +830,24 @@
 
 <span class="attribute">#[<span class="ident">uucore::main</span>]</span>
 <span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">uumain</span>(<span class="ident">args</span>: <span class="kw">impl</span> <span class="ident">uucore::Args</span>) -&gt; <span class="ident">UResult</span><span class="op">&lt;</span>()<span class="op">&gt;</span> {
-    <span class="kw">let</span> <span class="ident">matches</span> <span class="op">=</span> <span class="ident">uu_app</span>().<span class="ident">try_get_matches_from</span>(<span class="ident">args</span>)<span class="question-mark">?</span>;
+    <span class="kw">let</span> <span class="ident">args</span> <span class="op">=</span> <span class="ident">args</span>.<span class="ident">collect_str_lossy</span>().<span class="ident">accept_any</span>();
+
+    <span class="kw">let</span> <span class="ident">matches</span> <span class="op">=</span> <span class="ident">uu_app</span>().<span class="ident">try_get_matches_from</span>(<span class="kw-2">&amp;</span><span class="ident">args</span>)<span class="question-mark">?</span>;
 
     <span class="comment">// Parse command-line options into a format suitable for the</span>
     <span class="comment">// application logic.</span>
     <span class="kw">let</span> <span class="ident">options</span> <span class="op">=</span> <span class="ident">Options::from</span>(<span class="kw-2">&amp;</span><span class="ident">matches</span>);
+
+    <span class="kw">if</span> <span class="ident">env::var</span>(<span class="string">&quot;POSIXLY_CORRECT&quot;</span>).<span class="ident">is_ok</span>() {
+        <span class="comment">// If POSIXLY_CORRECT was set, template MUST be the last argument.</span>
+        <span class="kw">if</span> <span class="ident">is_tmpdir_argument_actually_the_template</span>(<span class="kw-2">&amp;</span><span class="ident">matches</span>) <span class="op">|</span><span class="op">|</span> <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">ARG_TEMPLATE</span>) {
+            <span class="comment">// Template argument was provided, check if was the last one.</span>
+            <span class="kw">if</span> <span class="ident">args</span>.<span class="ident">last</span>().<span class="ident">unwrap</span>() <span class="op">!</span><span class="op">=</span> <span class="kw-2">&amp;</span><span class="ident">options</span>.<span class="ident">template</span> {
+                <span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">Box::new</span>(<span class="ident">MkTempError::TooManyTemplates</span>));
+            }
+        }
+    }
+
     <span class="kw">let</span> <span class="ident">dry_run</span> <span class="op">=</span> <span class="ident">options</span>.<span class="ident">dry_run</span>;
     <span class="kw">let</span> <span class="ident">suppress_file_err</span> <span class="op">=</span> <span class="ident">options</span>.<span class="ident">quiet</span>;
     <span class="kw">let</span> <span class="ident">make_dir</span> <span class="op">=</span> <span class="ident">options</span>.<span class="ident">directory</span>;
diff --git a/dev/uu_mktemp/fn.dry_exec.html b/dev/uu_mktemp/fn.dry_exec.html
@@ -4,5 +4,5 @@
     </nav>
     <nav class="sidebar"><a class="sidebar-logo" href="../uu_mktemp/index.html"><div class="logo-container"><img class="rust-logo" src="../rust-logo.svg" alt="logo"></div>
         </a><div class="sidebar-elems"><h2 class="location"><a href="index.html">In uu_mktemp</a></h2><div id="sidebar-vars" data-name="dry_exec" data-ty="fn" data-relpath=""></div><script defer src="sidebar-items.js"></script></div></nav><main><div class="width-limiter"><div class="sub-container"><a class="sub-logo-container" href="../uu_mktemp/index.html"><img class="rust-logo" src="../rust-logo.svg" alt="logo"></a><nav class="sub"><div class="theme-picker hidden"><button id="theme-picker" aria-label="Pick another theme!" aria-haspopup="menu" title="themes"><img width="22" height="22" alt="Pick another theme!" src="../brush.svg"></button><div id="theme-choices" role="menu"></div></div><form class="search-form"><div class="search-container"><span></span><input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"><button type="button" id="help-button" title="help">?</button><a id="settings-menu" href="../settings.html" title="settings"><img width="22" height="22" alt="Change settings" src="../wheel.svg"></a></div></form></nav></div><section id="main-content" class="content"><div class="main-heading">
-    <h1 class="fqn"><span class="in-band">Function <a href="index.html">uu_mktemp</a>::<wbr><a class="fn" href="#">dry_exec</a><button id="copy-path" onclick="copy_path(this)" title="Copy item path to clipboard"><img src="../clipboard.svg" width="19" height="18" alt="Copy item path"></button></span></h1><span class="out-of-band"><a class="srclink" href="../src/uu_mktemp/mktemp.rs.html#401-423">source</a> · <a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class="inner">&#x2212;</span>]</a></span></div><div class="docblock item-decl"><pre class="rust fn"><code>pub fn dry_exec(<br>&nbsp;&nbsp;&nbsp;&nbsp;tmpdir: &amp;<a class="primitive" href="https://doc.rust-lang.org/1.61.0/std/primitive.str.html">str</a>, <br>&nbsp;&nbsp;&nbsp;&nbsp;prefix: &amp;<a class="primitive" href="https://doc.rust-lang.org/1.61.0/std/primitive.str.html">str</a>, <br>&nbsp;&nbsp;&nbsp;&nbsp;rand: <a class="primitive" href="https://doc.rust-lang.org/1.61.0/std/primitive.usize.html">usize</a>, <br>&nbsp;&nbsp;&nbsp;&nbsp;suffix: &amp;<a class="primitive" href="https://doc.rust-lang.org/1.61.0/std/primitive.str.html">str</a><br>) -&gt; <a class="type" href="../uucore/mods/error/type.UResult.html" title="type uucore::mods::error::UResult">UResult</a>&lt;<a class="primitive" href="https://doc.rust-lang.org/1.61.0/std/primitive.unit.html">()</a>&gt;</code></pre></div></section><section id="search" class="content hidden"></section></div></main><div id="rustdoc-vars" data-root-path="../" data-current-crate="uu_mktemp" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.61.0 (fe5b13d68 2022-05-18)" ></div>
+    <h1 class="fqn"><span class="in-band">Function <a href="index.html">uu_mktemp</a>::<wbr><a class="fn" href="#">dry_exec</a><button id="copy-path" onclick="copy_path(this)" title="Copy item path to clipboard"><img src="../clipboard.svg" width="19" height="18" alt="Copy item path"></button></span></h1><span class="out-of-band"><a class="srclink" href="../src/uu_mktemp/mktemp.rs.html#422-444">source</a> · <a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class="inner">&#x2212;</span>]</a></span></div><div class="docblock item-decl"><pre class="rust fn"><code>pub fn dry_exec(<br>&nbsp;&nbsp;&nbsp;&nbsp;tmpdir: &amp;<a class="primitive" href="https://doc.rust-lang.org/1.61.0/std/primitive.str.html">str</a>, <br>&nbsp;&nbsp;&nbsp;&nbsp;prefix: &amp;<a class="primitive" href="https://doc.rust-lang.org/1.61.0/std/primitive.str.html">str</a>, <br>&nbsp;&nbsp;&nbsp;&nbsp;rand: <a class="primitive" href="https://doc.rust-lang.org/1.61.0/std/primitive.usize.html">usize</a>, <br>&nbsp;&nbsp;&nbsp;&nbsp;suffix: &amp;<a class="primitive" href="https://doc.rust-lang.org/1.61.0/std/primitive.str.html">str</a><br>) -&gt; <a class="type" href="../uucore/mods/error/type.UResult.html" title="type uucore::mods::error::UResult">UResult</a>&lt;<a class="primitive" href="https://doc.rust-lang.org/1.61.0/std/primitive.unit.html">()</a>&gt;</code></pre></div></section><section id="search" class="content hidden"></section></div></main><div id="rustdoc-vars" data-root-path="../" data-current-crate="uu_mktemp" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.61.0 (fe5b13d68 2022-05-18)" ></div>
 </body></html>
diff --git a/dev/uu_mktemp/fn.uu_app.html b/dev/uu_mktemp/fn.uu_app.html
@@ -4,5 +4,5 @@
     </nav>
     <nav class="sidebar"><a class="sidebar-logo" href="../uu_mktemp/index.html"><div class="logo-container"><img class="rust-logo" src="../rust-logo.svg" alt="logo"></div>
         </a><div class="sidebar-elems"><h2 class="location"><a href="index.html">In uu_mktemp</a></h2><div id="sidebar-vars" data-name="uu_app" data-ty="fn" data-relpath=""></div><script defer src="sidebar-items.js"></script></div></nav><main><div class="width-limiter"><div class="sub-container"><a class="sub-logo-container" href="../uu_mktemp/index.html"><img class="rust-logo" src="../rust-logo.svg" alt="logo"></a><nav class="sub"><div class="theme-picker hidden"><button id="theme-picker" aria-label="Pick another theme!" aria-haspopup="menu" title="themes"><img width="22" height="22" alt="Pick another theme!" src="../brush.svg"></button><div id="theme-choices" role="menu"></div></div><form class="search-form"><div class="search-container"><span></span><input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"><button type="button" id="help-button" title="help">?</button><a id="settings-menu" href="../settings.html" title="settings"><img width="22" height="22" alt="Change settings" src="../wheel.svg"></a></div></form></nav></div><section id="main-content" class="content"><div class="main-heading">
-    <h1 class="fqn"><span class="in-band">Function <a href="index.html">uu_mktemp</a>::<wbr><a class="fn" href="#">uu_app</a><button id="copy-path" onclick="copy_path(this)" title="Copy item path to clipboard"><img src="../clipboard.svg" width="19" height="18" alt="Copy item path"></button></span></h1><span class="out-of-band"><a class="srclink" href="../src/uu_mktemp/mktemp.rs.html#343-399">source</a> · <a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class="inner">&#x2212;</span>]</a></span></div><div class="docblock item-decl"><pre class="rust fn"><code>pub fn uu_app&lt;'a&gt;() -&gt; Command&lt;'a&gt;</code></pre></div></section><section id="search" class="content hidden"></section></div></main><div id="rustdoc-vars" data-root-path="../" data-current-crate="uu_mktemp" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.61.0 (fe5b13d68 2022-05-18)" ></div>
+    <h1 class="fqn"><span class="in-band">Function <a href="index.html">uu_mktemp</a>::<wbr><a class="fn" href="#">uu_app</a><button id="copy-path" onclick="copy_path(this)" title="Copy item path to clipboard"><img src="../clipboard.svg" width="19" height="18" alt="Copy item path"></button></span></h1><span class="out-of-band"><a class="srclink" href="../src/uu_mktemp/mktemp.rs.html#364-420">source</a> · <a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class="inner">&#x2212;</span>]</a></span></div><div class="docblock item-decl"><pre class="rust fn"><code>pub fn uu_app&lt;'a&gt;() -&gt; Command&lt;'a&gt;</code></pre></div></section><section id="search" class="content hidden"></section></div></main><div id="rustdoc-vars" data-root-path="../" data-current-crate="uu_mktemp" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.61.0 (fe5b13d68 2022-05-18)" ></div>
 </body></html>
diff --git a/dev/uu_mktemp/fn.uumain.html b/dev/uu_mktemp/fn.uumain.html
@@ -4,5 +4,5 @@
     </nav>
     <nav class="sidebar"><a class="sidebar-logo" href="../uu_mktemp/index.html"><div class="logo-container"><img class="rust-logo" src="../rust-logo.svg" alt="logo"></div>
         </a><div class="sidebar-elems"><h2 class="location"><a href="index.html">In uu_mktemp</a></h2><div id="sidebar-vars" data-name="uumain" data-ty="fn" data-relpath=""></div><script defer src="sidebar-items.js"></script></div></nav><main><div class="width-limiter"><div class="sub-container"><a class="sub-logo-container" href="../uu_mktemp/index.html"><img class="rust-logo" src="../rust-logo.svg" alt="logo"></a><nav class="sub"><div class="theme-picker hidden"><button id="theme-picker" aria-label="Pick another theme!" aria-haspopup="menu" title="themes"><img width="22" height="22" alt="Pick another theme!" src="../brush.svg"></button><div id="theme-choices" role="menu"></div></div><form class="search-form"><div class="search-container"><span></span><input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"><button type="button" id="help-button" title="help">?</button><a id="settings-menu" href="../settings.html" title="settings"><img width="22" height="22" alt="Change settings" src="../wheel.svg"></a></div></form></nav></div><section id="main-content" class="content"><div class="main-heading">
-    <h1 class="fqn"><span class="in-band">Function <a href="index.html">uu_mktemp</a>::<wbr><a class="fn" href="#">uumain</a><button id="copy-path" onclick="copy_path(this)" title="Copy item path to clipboard"><img src="../clipboard.svg" width="19" height="18" alt="Copy item path"></button></span></h1><span class="out-of-band"><a class="srclink" href="../src/uu_mktemp/mktemp.rs.html#309">source</a> · <a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class="inner">&#x2212;</span>]</a></span></div><div class="docblock item-decl"><pre class="rust fn"><code>pub fn uumain(args: impl <a class="trait" href="../uucore/trait.Args.html" title="trait uucore::Args">Args</a>) -&gt; <a class="primitive" href="https://doc.rust-lang.org/1.61.0/std/primitive.i32.html">i32</a></code></pre></div></section><section id="search" class="content hidden"></section></div></main><div id="rustdoc-vars" data-root-path="../" data-current-crate="uu_mktemp" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.61.0 (fe5b13d68 2022-05-18)" ></div>
+    <h1 class="fqn"><span class="in-band">Function <a href="index.html">uu_mktemp</a>::<wbr><a class="fn" href="#">uumain</a><button id="copy-path" onclick="copy_path(this)" title="Copy item path to clipboard"><img src="../clipboard.svg" width="19" height="18" alt="Copy item path"></button></span></h1><span class="out-of-band"><a class="srclink" href="../src/uu_mktemp/mktemp.rs.html#317">source</a> · <a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class="inner">&#x2212;</span>]</a></span></div><div class="docblock item-decl"><pre class="rust fn"><code>pub fn uumain(args: impl <a class="trait" href="../uucore/trait.Args.html" title="trait uucore::Args">Args</a>) -&gt; <a class="primitive" href="https://doc.rust-lang.org/1.61.0/std/primitive.i32.html">i32</a></code></pre></div></section><section id="search" class="content hidden"></section></div></main><div id="rustdoc-vars" data-root-path="../" data-current-crate="uu_mktemp" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.61.0 (fe5b13d68 2022-05-18)" ></div>
 </body></html>
diff --git a/dev/uu_mktemp/index.html b/dev/uu_mktemp/index.html
