|
778 | 778 | <span id="773">773</span>
|
779 | 779 | <span id="774">774</span>
|
780 | 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 | 781 | </pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.</span>
|
786 | 782 | <span class="comment">//</span>
|
787 | 783 | <span class="comment">// (c) Fangxu Hu <framlog@gmail.com></span>
|
|
845 | 841 | <span class="kw">struct</span> <span class="ident">Options</span> {
|
846 | 842 | <span class="ident">show_local_fs</span>: <span class="ident">bool</span>,
|
847 | 843 | <span class="ident">show_all_fs</span>: <span class="ident">bool</span>,
|
848 |
| - <span class="ident">show_listed_fs</span>: <span class="ident">bool</span>, |
849 | 844 | <span class="ident">block_size</span>: <span class="ident">BlockSize</span>,
|
850 | 845 |
|
851 | 846 | <span class="doccomment">/// Optional list of filesystem types to include in the output table.</span>
|
|
872 | 867 | <span class="self">Self</span> {
|
873 | 868 | <span class="ident">show_local_fs</span>: <span class="ident">Default::default</span>(),
|
874 | 869 | <span class="ident">show_all_fs</span>: <span class="ident">Default::default</span>(),
|
875 |
| - <span class="ident">show_listed_fs</span>: <span class="ident">Default::default</span>(), |
876 | 870 | <span class="ident">block_size</span>: <span class="ident">Default::default</span>(),
|
877 | 871 | <span class="ident">include</span>: <span class="ident">Default::default</span>(),
|
878 | 872 | <span class="ident">exclude</span>: <span class="ident">Default::default</span>(),
|
|
941 | 935 | <span class="prelude-val">Ok</span>(<span class="self">Self</span> {
|
942 | 936 | <span class="ident">show_local_fs</span>: <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">OPT_LOCAL</span>),
|
943 | 937 | <span class="ident">show_all_fs</span>: <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">OPT_ALL</span>),
|
944 |
| - <span class="ident">show_listed_fs</span>: <span class="bool-val">false</span>, |
945 | 938 | <span class="ident">block_size</span>: <span class="ident">block_size_from_matches</span>(<span class="ident">matches</span>)
|
946 | 939 | .<span class="ident">map_err</span>(<span class="op">|</span><span class="kw">_</span><span class="op">|</span> <span class="ident">OptionsError::InvalidBlockSize</span>)<span class="question-mark">?</span>,
|
947 | 940 | <span class="ident">include</span>,
|
|
972 | 965 | }
|
973 | 966 |
|
974 | 967 | <span class="comment">// Don't show pseudo filesystems unless `--all` has been given.</span>
|
975 |
| - <span class="kw">if</span> <span class="ident">mi</span>.<span class="ident">dummy</span> <span class="op">&&</span> <span class="op">!</span><span class="ident">opt</span>.<span class="ident">show_all_fs</span> <span class="op">&&</span> <span class="op">!</span><span class="ident">opt</span>.<span class="ident">show_listed_fs</span> { |
| 968 | + <span class="kw">if</span> <span class="ident">mi</span>.<span class="ident">dummy</span> <span class="op">&&</span> <span class="op">!</span><span class="ident">opt</span>.<span class="ident">show_all_fs</span> { |
976 | 969 | <span class="kw">return</span> <span class="bool-val">false</span>;
|
977 | 970 | }
|
978 | 971 |
|
|
1178 | 1171 | <span class="comment">// If the filesystem is not empty, or if the options require</span>
|
1179 | 1172 | <span class="comment">// showing all filesystems, then print the data as a row in</span>
|
1180 | 1173 | <span class="comment">// the output table.</span>
|
1181 |
| - <span class="kw">if</span> <span class="ident">opt</span>.<span class="ident">show_all_fs</span> <span class="op">|</span><span class="op">|</span> <span class="ident">opt</span>.<span class="ident">show_listed_fs</span> <span class="op">|</span><span class="op">|</span> <span class="ident">filesystem</span>.<span class="ident">usage</span>.<span class="ident">blocks</span> <span class="op">></span> <span class="number">0</span> { |
| 1174 | + <span class="kw">if</span> <span class="ident">opt</span>.<span class="ident">show_all_fs</span> <span class="op">|</span><span class="op">|</span> <span class="ident">filesystem</span>.<span class="ident">usage</span>.<span class="ident">blocks</span> <span class="op">></span> <span class="number">0</span> { |
1182 | 1175 | <span class="kw">let</span> <span class="ident">row</span> <span class="op">=</span> <span class="ident">Row::from</span>(<span class="ident">filesystem</span>);
|
1183 | 1176 | <span class="macro">println!</span>(<span class="string">"{}"</span>, <span class="ident">DisplayRow::new</span>(<span class="kw-2">&</span><span class="ident">row</span>, <span class="kw-2">&</span><span class="ident">opt</span>));
|
1184 | 1177 | <span class="ident">total</span> <span class="op">+</span><span class="op">=</span> <span class="ident">row</span>;
|
|
1451 | 1444 | <span class="kw">fn</span> <span class="ident">test_dummy_included</span>() {
|
1452 | 1445 | <span class="kw">let</span> <span class="ident">opt</span> <span class="op">=</span> <span class="ident">Options</span> {
|
1453 | 1446 | <span class="ident">show_all_fs</span>: <span class="bool-val">true</span>,
|
1454 |
| - <span class="ident">show_listed_fs</span>: <span class="bool-val">true</span>, |
1455 | 1447 | ..<span class="ident">Default::default</span>()
|
1456 | 1448 | };
|
1457 | 1449 | <span class="kw">let</span> <span class="ident">m</span> <span class="op">=</span> <span class="ident">mount_info</span>(<span class="string">"ext4"</span>, <span class="string">"/mnt/foo"</span>, <span class="bool-val">false</span>, <span class="bool-val">true</span>);
|
|
0 commit comments