This commit is contained in:
sylvestre
2022-03-15 02:45:58 +00:00
parent 10b1a9ecfe
commit 8d8b7d053c
8 changed files with 136 additions and 79 deletions
+1 -1
View File
@@ -115,7 +115,7 @@ sourcesIndex["uu_csplit"] = {"name":"","files":["csplit.rs","csplit_error.rs","p
sourcesIndex["uu_cut"] = {"name":"","files":["cut.rs","searcher.rs"]};
sourcesIndex["uu_date"] = {"name":"","files":["date.rs"]};
sourcesIndex["uu_dd"] = {"name":"","files":["blocks.rs","conversion_tables.rs","datastructures.rs","dd.rs","parseargs.rs","progress.rs"]};
sourcesIndex["uu_df"] = {"name":"","files":["blocks.rs","columns.rs","df.rs","table.rs"]};
sourcesIndex["uu_df"] = {"name":"","files":["blocks.rs","columns.rs","df.rs","filesystem.rs","table.rs"]};
sourcesIndex["uu_dircolors"] = {"name":"","files":["colors.rs","dircolors.rs"]};
sourcesIndex["uu_dirname"] = {"name":"","files":["dirname.rs"]};
sourcesIndex["uu_du"] = {"name":"","files":["du.rs"]};
+3 -63
View File
@@ -685,36 +685,6 @@
<span id="683">683</span>
<span id="684">684</span>
<span id="685">685</span>
<span id="686">686</span>
<span id="687">687</span>
<span id="688">688</span>
<span id="689">689</span>
<span id="690">690</span>
<span id="691">691</span>
<span id="692">692</span>
<span id="693">693</span>
<span id="694">694</span>
<span id="695">695</span>
<span id="696">696</span>
<span id="697">697</span>
<span id="698">698</span>
<span id="699">699</span>
<span id="700">700</span>
<span id="701">701</span>
<span id="702">702</span>
<span id="703">703</span>
<span id="704">704</span>
<span id="705">705</span>
<span id="706">706</span>
<span id="707">707</span>
<span id="708">708</span>
<span id="709">709</span>
<span id="710">710</span>
<span id="711">711</span>
<span id="712">712</span>
<span id="713">713</span>
<span id="714">714</span>
<span id="715">715</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) Fangxu Hu &lt;framlog@gmail.com&gt;</span>
@@ -725,13 +695,12 @@
<span class="comment">// spell-checker:ignore itotal iused iavail ipcent pcent tmpfs squashfs lofs</span>
<span class="kw">mod</span> <span class="ident">blocks</span>;
<span class="kw">mod</span> <span class="ident">columns</span>;
<span class="kw">mod</span> <span class="ident">filesystem</span>;
<span class="kw">mod</span> <span class="ident">table</span>;
<span class="kw">use</span> <span class="ident">uucore::error</span>::{<span class="ident">UResult</span>, <span class="ident">USimpleError</span>};
<span class="kw">use</span> <span class="ident">uucore::format_usage</span>;
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">unix</span>)]</span>
<span class="kw">use</span> <span class="ident">uucore::fsext::statfs</span>;
<span class="kw">use</span> <span class="ident">uucore::fsext</span>::{<span class="ident">read_fs_list</span>, <span class="ident">FsUsage</span>, <span class="ident">MountInfo</span>};
<span class="kw">use</span> <span class="ident">uucore::fsext</span>::{<span class="ident">read_fs_list</span>, <span class="ident">MountInfo</span>};
<span class="kw">use</span> <span class="ident">clap</span>::{<span class="ident">crate_version</span>, <span class="ident">App</span>, <span class="ident">AppSettings</span>, <span class="ident">Arg</span>, <span class="ident">ArgMatches</span>};
@@ -740,6 +709,7 @@
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::blocks</span>::{<span class="ident">block_size_from_matches</span>, <span class="ident">BlockSize</span>};
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::columns::Column</span>;
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::filesystem::Filesystem</span>;
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::table</span>::{<span class="ident">DisplayRow</span>, <span class="ident">Header</span>, <span class="ident">Row</span>};
<span class="kw">static</span> <span class="ident">ABOUT</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;Show information about the file system on which each FILE resides,\n\
@@ -853,36 +823,6 @@
}
}
<span class="attribute">#[<span class="ident">derive</span>(<span class="ident">Debug</span>, <span class="ident">Clone</span>)]</span>
<span class="kw">struct</span> <span class="ident">Filesystem</span> {
<span class="ident">mount_info</span>: <span class="ident">MountInfo</span>,
<span class="ident">usage</span>: <span class="ident">FsUsage</span>,
}
<span class="kw">impl</span> <span class="ident">Filesystem</span> {
<span class="comment">// TODO: resolve uuid in `mount_info.dev_name` if exists</span>
<span class="kw">fn</span> <span class="ident">new</span>(<span class="ident">mount_info</span>: <span class="ident">MountInfo</span>) -&gt; <span class="prelude-ty">Option</span><span class="op">&lt;</span><span class="self">Self</span><span class="op">&gt;</span> {
<span class="kw">let</span> <span class="ident">_stat_path</span> <span class="op">=</span> <span class="kw">if</span> <span class="op">!</span><span class="ident">mount_info</span>.<span class="ident">mount_dir</span>.<span class="ident">is_empty</span>() {
<span class="ident">mount_info</span>.<span class="ident">mount_dir</span>.<span class="ident">clone</span>()
} <span class="kw">else</span> {
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">unix</span>)]</span>
{
<span class="ident">mount_info</span>.<span class="ident">dev_name</span>.<span class="ident">clone</span>()
}
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">windows</span>)]</span>
{
<span class="comment">// On windows, we expect the volume id</span>
<span class="ident">mount_info</span>.<span class="ident">dev_id</span>.<span class="ident">clone</span>()
}
};
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">unix</span>)]</span>
<span class="kw">let</span> <span class="ident">usage</span> <span class="op">=</span> <span class="ident">FsUsage::new</span>(<span class="ident">statfs</span>(<span class="ident">_stat_path</span>).<span class="ident">ok</span>()<span class="question-mark">?</span>);
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">windows</span>)]</span>
<span class="kw">let</span> <span class="ident">usage</span> <span class="op">=</span> <span class="ident">FsUsage::new</span>(<span class="ident">Path::new</span>(<span class="kw-2">&amp;</span><span class="ident">_stat_path</span>));
<span class="prelude-val">Some</span>(<span class="self">Self</span> { <span class="ident">mount_info</span>, <span class="ident">usage</span> })
}
}
<span class="doccomment">/// Whether to display the mount info given the inclusion settings.</span>
<span class="kw">fn</span> <span class="ident">is_included</span>(<span class="ident">mi</span>: <span class="kw-2">&amp;</span><span class="ident">MountInfo</span>, <span class="ident">opt</span>: <span class="kw-2">&amp;</span><span class="ident">Options</span>) -&gt; <span class="ident">bool</span> {
<span class="comment">// Don&#39;t show remote filesystems if `--local` has been given.</span>
+115
View File
@@ -0,0 +1,115 @@
<!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="Source of the Rust file `src&#x2F;uu&#x2F;df&#x2F;src&#x2F;filesystem.rs`."><meta name="keywords" content="rust, rustlang, rust-lang"><title>filesystem.rs - source</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><script defer src="../../source-script.js"></script><script defer src="../../source-files.js"></script>
<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 source"><!--[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_df/index.html"><div class="logo-container"><img class="rust-logo" src="../../rust-logo.png" alt="logo"></div>
</a></nav><main><div class="width-limiter"><div class="sub-container"><a class="sub-logo-container" href="../../uu_df/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"><div class="example-wrap"><pre class="line-numbers"><span id="1"> 1</span>
<span id="2"> 2</span>
<span id="3"> 3</span>
<span id="4"> 4</span>
<span id="5"> 5</span>
<span id="6"> 6</span>
<span id="7"> 7</span>
<span id="8"> 8</span>
<span id="9"> 9</span>
<span id="10">10</span>
<span id="11">11</span>
<span id="12">12</span>
<span id="13">13</span>
<span id="14">14</span>
<span id="15">15</span>
<span id="16">16</span>
<span id="17">17</span>
<span id="18">18</span>
<span id="19">19</span>
<span id="20">20</span>
<span id="21">21</span>
<span id="22">22</span>
<span id="23">23</span>
<span id="24">24</span>
<span id="25">25</span>
<span id="26">26</span>
<span id="27">27</span>
<span id="28">28</span>
<span id="29">29</span>
<span id="30">30</span>
<span id="31">31</span>
<span id="32">32</span>
<span id="33">33</span>
<span id="34">34</span>
<span id="35">35</span>
<span id="36">36</span>
<span id="37">37</span>
<span id="38">38</span>
<span id="39">39</span>
<span id="40">40</span>
<span id="41">41</span>
<span id="42">42</span>
<span id="43">43</span>
<span id="44">44</span>
<span id="45">45</span>
<span id="46">46</span>
<span id="47">47</span>
<span id="48">48</span>
<span id="49">49</span>
<span id="50">50</span>
<span id="51">51</span>
<span id="52">52</span>
<span id="53">53</span>
<span id="54">54</span>
<span id="55">55</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">// * For the full copyright and license information, please view the LICENSE</span>
<span class="comment">// * file that was distributed with this source code.</span>
<span class="doccomment">//! Provides a summary representation of a filesystem.</span>
<span class="doccomment">//!</span>
<span class="doccomment">//! A [`Filesystem`] struct represents a device containing a</span>
<span class="doccomment">//! filesystem mounted at a particular directory. It also includes</span>
<span class="doccomment">//! information on amount of space available and amount of space used.</span>
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">windows</span>)]</span>
<span class="kw">use</span> <span class="ident">std::path::Path</span>;
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">unix</span>)]</span>
<span class="kw">use</span> <span class="ident">uucore::fsext::statfs</span>;
<span class="kw">use</span> <span class="ident">uucore::fsext</span>::{<span class="ident">FsUsage</span>, <span class="ident">MountInfo</span>};
<span class="doccomment">/// Summary representation of a filesystem.</span>
<span class="doccomment">///</span>
<span class="doccomment">/// A [`Filesystem`] struct represents a device containing a</span>
<span class="doccomment">/// filesystem mounted at a particular directory. The</span>
<span class="doccomment">/// [`Filesystem::mount_info`] field exposes that information. The</span>
<span class="doccomment">/// [`Filesystem::usage`] field provides information on the amount of</span>
<span class="doccomment">/// space available on the filesystem and the amount of space used.</span>
<span class="attribute">#[<span class="ident">derive</span>(<span class="ident">Debug</span>, <span class="ident">Clone</span>)]</span>
<span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">struct</span> <span class="ident">Filesystem</span> {
<span class="doccomment">/// Information about the mounted device, mount directory, and related options.</span>
<span class="kw">pub</span> <span class="ident">mount_info</span>: <span class="ident">MountInfo</span>,
<span class="doccomment">/// Information about the amount of space used on the filesystem.</span>
<span class="kw">pub</span> <span class="ident">usage</span>: <span class="ident">FsUsage</span>,
}
<span class="kw">impl</span> <span class="ident">Filesystem</span> {
<span class="comment">// TODO: resolve uuid in `mount_info.dev_name` if exists</span>
<span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn</span> <span class="ident">new</span>(<span class="ident">mount_info</span>: <span class="ident">MountInfo</span>) -&gt; <span class="prelude-ty">Option</span><span class="op">&lt;</span><span class="self">Self</span><span class="op">&gt;</span> {
<span class="kw">let</span> <span class="ident">_stat_path</span> <span class="op">=</span> <span class="kw">if</span> <span class="op">!</span><span class="ident">mount_info</span>.<span class="ident">mount_dir</span>.<span class="ident">is_empty</span>() {
<span class="ident">mount_info</span>.<span class="ident">mount_dir</span>.<span class="ident">clone</span>()
} <span class="kw">else</span> {
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">unix</span>)]</span>
{
<span class="ident">mount_info</span>.<span class="ident">dev_name</span>.<span class="ident">clone</span>()
}
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">windows</span>)]</span>
{
<span class="comment">// On windows, we expect the volume id</span>
<span class="ident">mount_info</span>.<span class="ident">dev_id</span>.<span class="ident">clone</span>()
}
};
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">unix</span>)]</span>
<span class="kw">let</span> <span class="ident">usage</span> <span class="op">=</span> <span class="ident">FsUsage::new</span>(<span class="ident">statfs</span>(<span class="ident">_stat_path</span>).<span class="ident">ok</span>()<span class="question-mark">?</span>);
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">windows</span>)]</span>
<span class="kw">let</span> <span class="ident">usage</span> <span class="op">=</span> <span class="ident">FsUsage::new</span>(<span class="ident">Path::new</span>(<span class="kw-2">&amp;</span><span class="ident">_stat_path</span>));
<span class="prelude-val">Some</span>(<span class="self">Self</span> { <span class="ident">mount_info</span>, <span class="ident">usage</span> })
}
}
</code></pre></div>
</section><section id="search" class="content hidden"></section></div></main><div id="rustdoc-vars" data-root-path="../../" data-current-crate="uu_df" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.59.0 (9d1b2106e 2022-02-23)" ></div>
</body></html>
+3 -1
View File
@@ -585,6 +585,7 @@
<span id="583">583</span>
<span id="584">584</span>
<span id="585">585</span>
<span id="586">586</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">// * For the full copyright and license information, please view the LICENSE</span>
@@ -599,7 +600,8 @@
<span class="kw">use</span> <span class="ident">number_prefix::NumberPrefix</span>;
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::columns::Column</span>;
<span class="kw">use</span> <span class="kw">crate</span>::{<span class="ident">BlockSize</span>, <span class="ident">Filesystem</span>, <span class="ident">Options</span>};
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::filesystem::Filesystem</span>;
<span class="kw">use</span> <span class="kw">crate</span>::{<span class="ident">BlockSize</span>, <span class="ident">Options</span>};
<span class="kw">use</span> <span class="ident">uucore::fsext</span>::{<span class="ident">FsUsage</span>, <span class="ident">MountInfo</span>};
<span class="kw">use</span> <span class="ident">std::fmt</span>;
+11 -11
View File
@@ -152,8 +152,8 @@
<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">get_matches_from</span>(<span class="ident">args</span>);
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">ignore</span> <span class="op">=</span> <span class="kw">match</span> <span class="ident">matches</span>.<span class="ident">value_of</span>(<span class="ident">OPT_IGNORE</span>) {
<span class="prelude-val">Some</span>(<span class="ident">numstr</span>) =&gt; <span class="kw">match</span> <span class="ident">numstr</span>.<span class="ident">parse</span>() {
<span class="kw">let</span> <span class="ident">ignore</span> <span class="op">=</span> <span class="kw">match</span> <span class="ident">matches</span>.<span class="ident">value_of</span>(<span class="ident">OPT_IGNORE</span>) {
<span class="prelude-val">Some</span>(<span class="ident">numstr</span>) =&gt; <span class="kw">match</span> <span class="ident">numstr</span>.<span class="ident">trim</span>().<span class="ident">parse</span>() {
<span class="prelude-val">Ok</span>(<span class="ident">num</span>) =&gt; <span class="ident">num</span>,
<span class="prelude-val">Err</span>(<span class="ident">e</span>) =&gt; {
<span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">USimpleError::new</span>(
@@ -165,18 +165,18 @@
<span class="prelude-val">None</span> =&gt; <span class="number">0</span>,
};
<span class="kw">if</span> <span class="op">!</span><span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">OPT_ALL</span>) {
<span class="comment">// OMP_NUM_THREADS doesn&#39;t have an impact on --all</span>
<span class="ident">ignore</span> <span class="op">+</span><span class="op">=</span> <span class="kw">match</span> <span class="ident">env::var</span>(<span class="string">&quot;OMP_NUM_THREADS&quot;</span>) {
<span class="prelude-val">Ok</span>(<span class="ident">threadstr</span>) =&gt; <span class="ident">threadstr</span>.<span class="ident">parse</span>().<span class="ident">unwrap_or</span>(<span class="number">0</span>),
<span class="prelude-val">Err</span>(<span class="kw">_</span>) =&gt; <span class="number">0</span>,
};
}
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">cores</span> <span class="op">=</span> <span class="kw">if</span> <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">OPT_ALL</span>) {
<span class="ident">num_cpus_all</span>()
} <span class="kw">else</span> {
<span class="ident">num_cpus::get</span>()
<span class="comment">// OMP_NUM_THREADS doesn&#39;t have an impact on --all</span>
<span class="kw">match</span> <span class="ident">env::var</span>(<span class="string">&quot;OMP_NUM_THREADS&quot;</span>) {
<span class="comment">// Uses the OpenMP variable to force the number of threads</span>
<span class="comment">// If the parsing fails, returns the number of CPU</span>
<span class="prelude-val">Ok</span>(<span class="ident">threadstr</span>) =&gt; <span class="ident">threadstr</span>.<span class="ident">parse</span>().<span class="ident">unwrap_or_else</span>(<span class="op">|</span><span class="kw">_</span><span class="op">|</span> <span class="ident">num_cpus::get</span>()),
<span class="comment">// the variable &#39;OMP_NUM_THREADS&#39; doesn&#39;t exit</span>
<span class="comment">// fallback to the regular CPU detection</span>
<span class="prelude-val">Err</span>(<span class="kw">_</span>) =&gt; <span class="ident">num_cpus::get</span>(),
}
};
<span class="kw">if</span> <span class="ident">cores</span> <span class="op">&lt;</span><span class="op">=</span> <span class="ident">ignore</span> {
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long