Skip to content

Commit 82b3552

Browse files
committed
deploy: 055173b
1 parent cf67f76 commit 82b3552

File tree

4 files changed

+72
-4
lines changed

4 files changed

+72
-4
lines changed

dev/src/uu_env/env.rs.html

Lines changed: 69 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,40 @@
327327
<span id="325">325</span>
328328
<span id="326">326</span>
329329
<span id="327">327</span>
330+
<span id="328">328</span>
331+
<span id="329">329</span>
332+
<span id="330">330</span>
333+
<span id="331">331</span>
334+
<span id="332">332</span>
335+
<span id="333">333</span>
336+
<span id="334">334</span>
337+
<span id="335">335</span>
338+
<span id="336">336</span>
339+
<span id="337">337</span>
340+
<span id="338">338</span>
341+
<span id="339">339</span>
342+
<span id="340">340</span>
343+
<span id="341">341</span>
344+
<span id="342">342</span>
345+
<span id="343">343</span>
346+
<span id="344">344</span>
347+
<span id="345">345</span>
348+
<span id="346">346</span>
349+
<span id="347">347</span>
350+
<span id="348">348</span>
351+
<span id="349">349</span>
352+
<span id="350">350</span>
353+
<span id="351">351</span>
354+
<span id="352">352</span>
355+
<span id="353">353</span>
356+
<span id="354">354</span>
357+
<span id="355">355</span>
358+
<span id="356">356</span>
359+
<span id="357">357</span>
360+
<span id="358">358</span>
361+
<span id="359">359</span>
362+
<span id="360">360</span>
363+
<span id="361">361</span>
330364
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.</span>
331365
<span class="comment">//</span>
332366
<span class="comment">// (c) Jordi Boggiano &lt;j.boggiano@seld.be&gt;</span>
@@ -351,10 +385,14 @@
351385
<span class="kw">use</span> <span class="ident">std::env</span>;
352386
<span class="kw">use</span> <span class="ident">std::io</span>::{<span class="self">self</span>, <span class="ident">Write</span>};
353387
<span class="kw">use</span> <span class="ident">std::iter::Iterator</span>;
388+
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">unix</span>)]</span>
389+
<span class="kw">use</span> <span class="ident">std::os::unix::process::ExitStatusExt</span>;
354390
<span class="kw">use</span> <span class="ident">std::process</span>;
355391
<span class="kw">use</span> <span class="ident">uucore::display::Quotable</span>;
356392
<span class="kw">use</span> <span class="ident">uucore::error</span>::{<span class="ident">UResult</span>, <span class="ident">USimpleError</span>, <span class="ident">UUsageError</span>};
357393
<span class="kw">use</span> <span class="ident">uucore::format_usage</span>;
394+
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">unix</span>)]</span>
395+
<span class="kw">use</span> <span class="ident">uucore::signals::signal_name_by_value</span>;
358396

359397
<span class="kw">const</span> <span class="ident">USAGE</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;{} [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]&quot;</span>;
360398
<span class="kw">const</span> <span class="ident">AFTER_HELP</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;\
@@ -637,7 +675,37 @@
637675
* created. This is much simpler than dealing with the hassles of calling execvp directly.
638676
*/</span>
639677
<span class="kw">match</span> <span class="ident">process::Command::new</span>(<span class="kw-2">&amp;</span><span class="kw-2">*</span><span class="ident">prog</span>).<span class="ident">args</span>(<span class="ident">args</span>).<span class="ident">status</span>() {
640-
<span class="prelude-val">Ok</span>(<span class="ident">exit</span>) <span class="kw">if</span> <span class="op">!</span><span class="ident">exit</span>.<span class="ident">success</span>() =&gt; <span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">exit</span>.<span class="ident">code</span>().<span class="ident">unwrap</span>().<span class="ident">into</span>()),
678+
<span class="prelude-val">Ok</span>(<span class="ident">exit</span>) <span class="kw">if</span> <span class="op">!</span><span class="ident">exit</span>.<span class="ident">success</span>() =&gt; {
679+
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">unix</span>)]</span>
680+
<span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Some</span>(<span class="ident">exit_code</span>) <span class="op">=</span> <span class="ident">exit</span>.<span class="ident">code</span>() {
681+
<span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">exit_code</span>.<span class="ident">into</span>());
682+
} <span class="kw">else</span> {
683+
<span class="comment">// `exit.code()` returns `None` on Unix when the process is terminated by a signal.</span>
684+
<span class="comment">// See std::os::unix::process::ExitStatusExt for more information. This prints out</span>
685+
<span class="comment">// the interrupted process and the signal it received.</span>
686+
<span class="kw">let</span> <span class="ident">signal_code</span> <span class="op">=</span> <span class="ident">exit</span>.<span class="ident">signal</span>().<span class="ident">unwrap</span>();
687+
<span class="macro">eprintln!</span>(
688+
<span class="string">&quot;\&quot;{}\&quot; terminated by signal {}&quot;</span>,
689+
{
690+
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">command</span> <span class="op">=</span> <span class="ident">uucore::util_name</span>().<span class="ident">to_owned</span>();
691+
<span class="ident">command</span>.<span class="ident">push</span>(<span class="string">&#39; &#39;</span>);
692+
<span class="ident">command</span>.<span class="ident">push_str</span>(<span class="kw-2">&amp;</span><span class="ident">opts</span>.<span class="ident">program</span>.<span class="ident">join</span>(<span class="string">&quot; &quot;</span>));
693+
<span class="ident">command</span>
694+
},
695+
<span class="ident">signal_name_by_value</span>(<span class="ident">signal_code</span> <span class="kw">as</span> <span class="ident">usize</span>).<span class="ident">map_or_else</span>(
696+
<span class="op">|</span><span class="op">|</span> <span class="ident">String::from</span>(<span class="string">&quot;UNKNOWN&quot;</span>),
697+
<span class="op">|</span><span class="ident">signal</span><span class="op">|</span> {
698+
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">full_signal_name</span> <span class="op">=</span> <span class="ident">String::from</span>(<span class="string">&quot;SIG&quot;</span>);
699+
<span class="ident">full_signal_name</span>.<span class="ident">push_str</span>(<span class="ident">signal</span>);
700+
<span class="ident">full_signal_name</span>
701+
}
702+
)
703+
);
704+
<span class="kw">return</span> <span class="prelude-val">Err</span>((<span class="number">128</span> <span class="op">+</span> <span class="ident">signal_code</span>).<span class="ident">into</span>());
705+
}
706+
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">not</span>(<span class="ident">unix</span>))]</span>
707+
<span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">exit</span>.<span class="ident">code</span>().<span class="ident">unwrap</span>().<span class="ident">into</span>());
708+
}
641709
<span class="prelude-val">Err</span>(<span class="kw-2">ref</span> <span class="ident">err</span>) <span class="kw">if</span> <span class="ident">err</span>.<span class="ident">kind</span>() <span class="op">==</span> <span class="ident">io::ErrorKind::NotFound</span> =&gt; <span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="number">127</span>.<span class="ident">into</span>()),
642710
<span class="prelude-val">Err</span>(<span class="kw">_</span>) =&gt; <span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="number">126</span>.<span class="ident">into</span>()),
643711
<span class="prelude-val">Ok</span>(<span class="kw">_</span>) =&gt; (),

dev/uu_env/fn.uu_app.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="API documentation for the Rust `uu_app` fn in crate `uu_env`."><meta name="keywords" content="rust, rustlang, rust-lang, uu_app"><title>uu_app in uu_env - Rust</title><link rel="preload" as="font" type="font/woff2" crossorigin href="../SourceSerif4-Regular.ttf.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../FiraSans-Regular.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../FiraSans-Medium.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../SourceCodePro-Regular.ttf.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../SourceSerif4-Bold.ttf.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="../SourceCodePro-Semibold.ttf.woff2"><link rel="stylesheet" type="text/css" href="../normalize.css"><link rel="stylesheet" type="text/css" href="../rustdoc.css" id="mainThemeStyle"><link rel="stylesheet" type="text/css" href="../ayu.css" disabled><link rel="stylesheet" type="text/css" href="../dark.css" disabled><link rel="stylesheet" type="text/css" href="../light.css" id="themeStyle"><script id="default-settings" ></script><script src="../storage.js"></script><script src="../crates.js"></script><script defer src="../main.js"></script>
22
<noscript><link rel="stylesheet" href="../noscript.css"></noscript><link rel="alternate icon" type="image/png" href="../favicon-16x16.png"><link rel="alternate icon" type="image/png" href="../favicon-32x32.png"><link rel="icon" type="image/svg+xml" href="../favicon.svg"></head><body class="rustdoc fn"><!--[if lte IE 11]><div class="warning">This old browser is unsupported and will most likely display funky things.</div><![endif]--><nav class="sidebar"><div class="sidebar-menu" role="button">&#9776;</div><a class="sidebar-logo" href="../uu_env/index.html"><div class="logo-container"><img class="rust-logo" src="../rust-logo.png" alt="logo"></div>
3-
</a><div class="sidebar-elems"><h2 class="location">Other items in<br><a href="index.html">uu_env</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_env/index.html"><img class="rust-logo" src="../rust-logo.png" alt="logo"></a><nav class="sub"><div class="theme-picker"><button id="theme-picker" aria-label="Pick another theme!" aria-haspopup="menu" title="themes"><img width="18" height="18" alt="Pick another theme!" src="../brush.svg"></button><div id="theme-choices" role="menu"></div></div><form class="search-form"><div class="search-container"><div><select id="crate-search"><option value="All crates">All crates</option></select><input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"></div><button type="button" id="help-button" title="help">?</button><a id="settings-menu" href="../settings.html" title="settings"><img width="18" height="18" alt="Change settings" src="../wheel.svg"></a></div></form></nav></div><section id="main-content" class="content"><h1 class="fqn"><span class="in-band">Function <a href="index.html">uu_env</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><span class="out-of-band"><span id="render-detail"><a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class="inner">&#x2212;</span>]</a></span><a class="srclink" href="../src/uu_env/env.rs.html#124-166" title="goto source code">[src]</a></span></h1><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_env" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.59.0 (9d1b2106e 2022-02-23)" ></div>
3+
</a><div class="sidebar-elems"><h2 class="location">Other items in<br><a href="index.html">uu_env</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_env/index.html"><img class="rust-logo" src="../rust-logo.png" alt="logo"></a><nav class="sub"><div class="theme-picker"><button id="theme-picker" aria-label="Pick another theme!" aria-haspopup="menu" title="themes"><img width="18" height="18" alt="Pick another theme!" src="../brush.svg"></button><div id="theme-choices" role="menu"></div></div><form class="search-form"><div class="search-container"><div><select id="crate-search"><option value="All crates">All crates</option></select><input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"></div><button type="button" id="help-button" title="help">?</button><a id="settings-menu" href="../settings.html" title="settings"><img width="18" height="18" alt="Change settings" src="../wheel.svg"></a></div></form></nav></div><section id="main-content" class="content"><h1 class="fqn"><span class="in-band">Function <a href="index.html">uu_env</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><span class="out-of-band"><span id="render-detail"><a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class="inner">&#x2212;</span>]</a></span><a class="srclink" href="../src/uu_env/env.rs.html#128-170" title="goto source code">[src]</a></span></h1><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_env" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.59.0 (9d1b2106e 2022-02-23)" ></div>
44
</body></html>

0 commit comments

Comments
 (0)