Skip to content

Commit 4ea48b9

Browse files
sylvestresylvestre
committed
deploy: c249eba 
1 parent 72f2b31 commit 4ea48b9

File tree

3 files changed

+67
-13
lines changed

3 files changed

+67
-13
lines changed

‎dev/src/uu_chcon/chcon.rs.html

+60-12
Original file line numberDiff line numberDiff line change
@@ -770,6 +770,30 @@
770770
<span id="765">765</span>
771771
<span id="766">766</span>
772772
<span id="767">767</span>
773+
<span id="768">768</span>
774+
<span id="769">769</span>
775+
<span id="770">770</span>
776+
<span id="771">771</span>
777+
<span id="772">772</span>
778+
<span id="773">773</span>
779+
<span id="774">774</span>
780+
<span id="775">775</span>
781+
<span id="776">776</span>
782+
<span id="777">777</span>
783+
<span id="778">778</span>
784+
<span id="779">779</span>
785+
<span id="780">780</span>
786+
<span id="781">781</span>
787+
<span id="782">782</span>
788+
<span id="783">783</span>
789+
<span id="784">784</span>
790+
<span id="785">785</span>
791+
<span id="786">786</span>
792+
<span id="787">787</span>
793+
<span id="788">788</span>
794+
<span id="789">789</span>
795+
<span id="790">790</span>
796+
<span id="791">791</span>
773797
</pre><pre class="rust"><code><span class="comment">// spell-checker:ignore (vars) RFILE</span>
774798

775799
<span class="attribute">#![<span class="ident">allow</span>(<span class="ident">clippy::upper_case_acronyms</span>)]</span>
@@ -1220,10 +1244,39 @@
12201244
},
12211245
}
12221246

1247+
<span class="attribute">#[<span class="ident">derive</span>(<span class="ident">Debug</span>, <span class="ident">Clone</span>, <span class="ident">Copy</span>, <span class="ident">PartialEq</span>, <span class="ident">Eq</span>)]</span>
1248+
<span class="kw">struct</span> <span class="ident">DeviceAndINode</span> {
1249+
<span class="ident">device_id</span>: <span class="ident">u64</span>,
1250+
<span class="ident">inode</span>: <span class="ident">u64</span>,
1251+
}
1252+
1253+
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">unix</span>)]</span>
1254+
<span class="kw">impl</span> <span class="ident">From</span><span class="op">&lt;</span><span class="ident">fs::Metadata</span><span class="op">&gt;</span> <span class="kw">for</span> <span class="ident">DeviceAndINode</span> {
1255+
<span class="kw">fn</span> <span class="ident">from</span>(<span class="ident">md</span>: <span class="ident">fs::Metadata</span>) -&gt; <span class="self">Self</span> {
1256+
<span class="kw">use</span> <span class="ident">std::os::unix::fs::MetadataExt</span>;
1257+
1258+
<span class="self">Self</span> {
1259+
<span class="ident">device_id</span>: <span class="ident">md</span>.<span class="ident">dev</span>(),
1260+
<span class="ident">inode</span>: <span class="ident">md</span>.<span class="ident">ino</span>(),
1261+
}
1262+
}
1263+
}
1264+
1265+
<span class="kw">impl</span> <span class="ident">TryFrom</span><span class="op">&lt;</span><span class="kw-2">&amp;</span><span class="ident">libc::stat</span><span class="op">&gt;</span> <span class="kw">for</span> <span class="ident">DeviceAndINode</span> {
1266+
<span class="kw">type</span> <span class="ident">Error</span> <span class="op">=</span> <span class="ident">Error</span>;
1267+
1268+
<span class="attribute">#[<span class="ident">allow</span>(<span class="ident">clippy::useless_conversion</span>)]</span>
1269+
<span class="kw">fn</span> <span class="ident">try_from</span>(<span class="ident">st</span>: <span class="kw-2">&amp;</span><span class="ident">libc::stat</span>) -&gt; <span class="prelude-ty">Result</span><span class="op">&lt;</span><span class="self">Self</span><span class="op">&gt;</span> {
1270+
<span class="kw">let</span> <span class="ident">device_id</span> <span class="op">=</span> <span class="ident">u64::try_from</span>(<span class="ident">st</span>.<span class="ident">st_dev</span>).<span class="ident">map_err</span>(<span class="op">|</span><span class="ident">_r</span><span class="op">|</span> <span class="ident">Error::OutOfRange</span>)<span class="question-mark">?</span>;
1271+
<span class="kw">let</span> <span class="ident">inode</span> <span class="op">=</span> <span class="ident">u64::try_from</span>(<span class="ident">st</span>.<span class="ident">st_ino</span>).<span class="ident">map_err</span>(<span class="op">|</span><span class="ident">_r</span><span class="op">|</span> <span class="ident">Error::OutOfRange</span>)<span class="question-mark">?</span>;
1272+
<span class="prelude-val">Ok</span>(<span class="self">Self</span> { <span class="ident">device_id</span>, <span class="ident">inode</span> })
1273+
}
1274+
}
1275+
12231276
<span class="kw">fn</span> <span class="ident">process_files</span>(
12241277
<span class="ident">options</span>: <span class="kw-2">&amp;</span><span class="ident">Options</span>,
12251278
<span class="ident">context</span>: <span class="kw-2">&amp;</span><span class="ident">SELinuxSecurityContext</span>,
1226-
<span class="ident">root_dev_ino</span>: <span class="prelude-ty">Option</span><span class="op">&lt;</span>(<span class="ident">libc::ino_t</span>, <span class="ident">libc::dev_t</span>)<span class="op">&gt;</span>,
1279+
<span class="ident">root_dev_ino</span>: <span class="prelude-ty">Option</span><span class="op">&lt;</span><span class="ident">DeviceAndINode</span><span class="op">&gt;</span>,
12271280
) -&gt; <span class="ident">Vec</span><span class="op">&lt;</span><span class="ident">Error</span><span class="op">&gt;</span> {
12281281
<span class="kw">let</span> <span class="ident">fts_options</span> <span class="op">=</span> <span class="ident">options</span>.<span class="ident">recursive_mode</span>.<span class="ident">fts_open_options</span>();
12291282
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">fts</span> <span class="op">=</span> <span class="kw">match</span> <span class="ident">fts::FTS::new</span>(<span class="ident">options</span>.<span class="ident">files</span>.<span class="ident">iter</span>(), <span class="ident">fts_options</span>) {
@@ -1255,7 +1308,7 @@
12551308
<span class="ident">options</span>: <span class="kw-2">&amp;</span><span class="ident">Options</span>,
12561309
<span class="ident">context</span>: <span class="kw-2">&amp;</span><span class="ident">SELinuxSecurityContext</span>,
12571310
<span class="ident">fts</span>: <span class="kw-2">&amp;mut</span> <span class="ident">fts::FTS</span>,
1258-
<span class="ident">root_dev_ino</span>: <span class="prelude-ty">Option</span><span class="op">&lt;</span>(<span class="ident">libc::ino_t</span>, <span class="ident">libc::dev_t</span>)<span class="op">&gt;</span>,
1311+
<span class="ident">root_dev_ino</span>: <span class="prelude-ty">Option</span><span class="op">&lt;</span><span class="ident">DeviceAndINode</span><span class="op">&gt;</span>,
12591312
) -&gt; <span class="prelude-ty">Result</span><span class="op">&lt;</span>()<span class="op">&gt;</span> {
12601313
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">entry</span> <span class="op">=</span> <span class="ident">fts</span>.<span class="ident">last_entry_ref</span>().<span class="ident">unwrap</span>();
12611314

@@ -1276,8 +1329,8 @@
12761329
};
12771330

12781331
<span class="comment">// SAFETY: If `entry.fts_statp` is not null, then is is assumed to be valid.</span>
1279-
<span class="kw">let</span> <span class="ident">file_dev_ino</span> <span class="op">=</span> <span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Some</span>(<span class="ident">stat</span>) <span class="op">=</span> <span class="ident">entry</span>.<span class="ident">stat</span>() {
1280-
(<span class="ident">stat</span>.<span class="ident">st_ino</span>, <span class="ident">stat</span>.<span class="ident">st_dev</span>)
1332+
<span class="kw">let</span> <span class="ident">file_dev_ino</span>: <span class="ident">DeviceAndINode</span> <span class="op">=</span> <span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Some</span>(<span class="ident">st</span>) <span class="op">=</span> <span class="ident">entry</span>.<span class="ident">stat</span>() {
1333+
<span class="ident">st</span>.<span class="ident">try_into</span>()<span class="question-mark">?</span>
12811334
} <span class="kw">else</span> {
12821335
<span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">err</span>(<span class="string">&quot;Getting meta data&quot;</span>, <span class="ident">io::ErrorKind::InvalidInput</span>));
12831336
};
@@ -1464,18 +1517,13 @@
14641517

14651518
<span class="doccomment">/// Call `lstat()` to get the device and inode numbers for `/`.</span>
14661519
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">unix</span>)]</span>
1467-
<span class="kw">fn</span> <span class="ident">get_root_dev_ino</span>() -&gt; <span class="prelude-ty">Result</span><span class="op">&lt;</span>(<span class="ident">libc::ino_t</span>, <span class="ident">libc::dev_t</span>)<span class="op">&gt;</span> {
1468-
<span class="kw">use</span> <span class="ident">std::os::unix::fs::MetadataExt</span>;
1469-
1520+
<span class="kw">fn</span> <span class="ident">get_root_dev_ino</span>() -&gt; <span class="prelude-ty">Result</span><span class="op">&lt;</span><span class="ident">DeviceAndINode</span><span class="op">&gt;</span> {
14701521
<span class="ident">fs::symlink_metadata</span>(<span class="string">&quot;/&quot;</span>)
1471-
.<span class="ident">map</span>(<span class="op">|</span><span class="ident">md</span><span class="op">|</span> (<span class="ident">md</span>.<span class="ident">ino</span>(), <span class="ident">md</span>.<span class="ident">dev</span>()))
1522+
.<span class="ident">map</span>(<span class="ident">DeviceAndINode::from</span>)
14721523
.<span class="ident">map_err</span>(<span class="op">|</span><span class="ident">r</span><span class="op">|</span> <span class="ident">Error::from_io1</span>(<span class="string">&quot;std::fs::symlink_metadata&quot;</span>, <span class="string">&quot;/&quot;</span>, <span class="ident">r</span>))
14731524
}
14741525

1475-
<span class="kw">fn</span> <span class="ident">root_dev_ino_check</span>(
1476-
<span class="ident">root_dev_ino</span>: <span class="prelude-ty">Option</span><span class="op">&lt;</span>(<span class="ident">libc::ino_t</span>, <span class="ident">libc::dev_t</span>)<span class="op">&gt;</span>,
1477-
<span class="ident">dir_dev_ino</span>: (<span class="ident">libc::ino_t</span>, <span class="ident">libc::dev_t</span>),
1478-
) -&gt; <span class="ident">bool</span> {
1526+
<span class="kw">fn</span> <span class="ident">root_dev_ino_check</span>(<span class="ident">root_dev_ino</span>: <span class="prelude-ty">Option</span><span class="op">&lt;</span><span class="ident">DeviceAndINode</span><span class="op">&gt;</span>, <span class="ident">dir_dev_ino</span>: <span class="ident">DeviceAndINode</span>) -&gt; <span class="ident">bool</span> {
14791527
<span class="ident">root_dev_ino</span>.<span class="ident">map_or</span>(<span class="bool-val">false</span>, <span class="op">|</span><span class="ident">root_dev_ino</span><span class="op">|</span> <span class="ident">root_dev_ino</span> <span class="op">==</span> <span class="ident">dir_dev_ino</span>)
14801528
}
14811529

‎dev/src/uu_chcon/errors.rs.html

+6
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@
7676
<span id="71">71</span>
7777
<span id="72">72</span>
7878
<span id="73">73</span>
79+
<span id="74">74</span>
80+
<span id="75">75</span>
81+
<span id="76">76</span>
7982
</pre><pre class="rust"><code><span class="kw">use</span> <span class="ident">std::ffi::OsString</span>;
8083
<span class="kw">use</span> <span class="ident">std::fmt::Write</span>;
8184
<span class="kw">use</span> <span class="ident">std::io</span>;
@@ -92,6 +95,9 @@
9295
<span class="attribute">#[<span class="ident">error</span>(<span class="string">&quot;No files are specified&quot;</span>)]</span>
9396
<span class="ident">MissingFiles</span>,
9497

98+
<span class="attribute">#[<span class="ident">error</span>(<span class="string">&quot;Data is out of range&quot;</span>)]</span>
99+
<span class="ident">OutOfRange</span>,
100+
95101
<span class="attribute">#[<span class="ident">error</span>(<span class="string">&quot;{0}&quot;</span>)]</span>
96102
<span class="ident">ArgumentsMismatch</span>(<span class="ident">String</span>),
97103

‎dev/uu_chcon/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</nav>
55
<nav class="sidebar"><a class="sidebar-logo" href="../uu_chcon/index.html"><div class="logo-container"><img class="rust-logo" src="../rust-logo.svg" alt="logo"></div>
66
</a><h2 class="location"><a href="#">Crate uu_chcon</a></h2><div class="sidebar-elems"><div class="block"><ul><li class="version">Version 0.0.14</li><li><a id="all-types" href="all.html">All Items</a></li></div></ul><section><div class="block"><ul><li><a href="#modules">Modules</a></li><li><a href="#functions">Functions</a></li></ul></div></section><div id="sidebar-vars" data-name="uu_chcon" data-ty="mod" 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_chcon/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">
7-
<h1 class="fqn"><span class="in-band">Crate <a class="mod" href="#">uu_chcon</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_chcon/chcon.rs.html#3-767">source</a> · <a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class="inner">&#x2212;</span>]</a></span></div><h2 id="modules" class="small-section-header"><a href="#modules">Modules</a></h2>
7+
<h1 class="fqn"><span class="in-band">Crate <a class="mod" href="#">uu_chcon</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_chcon/chcon.rs.html#3-791">source</a> · <a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class="inner">&#x2212;</span>]</a></span></div><h2 id="modules" class="small-section-header"><a href="#modules">Modules</a></h2>
88
<div class="item-table"><div class="item-row"><div class="item-left module-item"><a class="mod" href="options/index.html" title="uu_chcon::options mod">options</a></div><div class="item-right docblock-short"></div></div></div><h2 id="functions" class="small-section-header"><a href="#functions">Functions</a></h2>
99
<div class="item-table"><div class="item-row"><div class="item-left module-item"><a class="fn" href="fn.uu_app.html" title="uu_chcon::uu_app fn">uu_app</a></div><div class="item-right docblock-short"></div></div><div class="item-row"><div class="item-left module-item"><a class="fn" href="fn.uumain.html" title="uu_chcon::uumain fn">uumain</a></div><div class="item-right docblock-short"></div></div></div></section></div></main><div id="rustdoc-vars" data-root-path="../" data-current-crate="uu_chcon" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.62.1 (e092d0b6b 2022-07-16)" ></div>
1010
</body></html>

0 commit comments

Comments
 (0)