|
380 | 380 | <span id="380">380</span>
|
381 | 381 | <span id="381">381</span>
|
382 | 382 | <span id="382">382</span>
|
383 |
| -<span id="383">383</span> |
384 | 383 | </pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.</span>
|
385 | 384 | <span class="comment">//</span>
|
386 | 385 | <span class="comment">// (c) Alex Lyon <arcterus@mail.com></span>
|
|
397 | 396 | <span class="kw">use</span> <span class="ident">uucore::display::Quotable</span>;
|
398 | 397 | <span class="kw">use</span> <span class="ident">uucore::error</span>::{<span class="ident">ExitCode</span>, <span class="ident">UResult</span>, <span class="ident">USimpleError</span>, <span class="ident">UUsageError</span>};
|
399 | 398 | <span class="kw">use</span> <span class="ident">uucore::fs::display_permissions_unix</span>;
|
400 |
| -<span class="kw">use</span> <span class="ident">uucore::fs::is_symlink</span>; |
401 | 399 | <span class="kw">use</span> <span class="ident">uucore::libc::mode_t</span>;
|
402 | 400 | <span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">not</span>(<span class="ident">windows</span>))]</span>
|
403 | 401 | <span class="kw">use</span> <span class="ident">uucore::mode</span>;
|
|
578 | 576 | <span class="kw">let</span> <span class="ident">filename</span> <span class="op">=</span> <span class="kw-2">&</span><span class="ident">filename</span>[..];
|
579 | 577 | <span class="kw">let</span> <span class="ident">file</span> <span class="op">=</span> <span class="ident">Path::new</span>(<span class="ident">filename</span>);
|
580 | 578 | <span class="kw">if</span> <span class="op">!</span><span class="ident">file</span>.<span class="ident">exists</span>() {
|
581 |
| - <span class="kw">if</span> <span class="ident">is_symlink</span>(<span class="ident">file</span>) { |
| 579 | + <span class="kw">if</span> <span class="ident">file</span>.<span class="ident">is_symlink</span>() { |
582 | 580 | <span class="macro">println!</span>(
|
583 | 581 | <span class="string">"failed to change mode of {} from 0000 (---------) to 0000 (---------)"</span>,
|
584 | 582 | <span class="ident">filename</span>.<span class="ident">quote</span>()
|
|
620 | 618 |
|
621 | 619 | <span class="kw">fn</span> <span class="ident">walk_dir</span>(<span class="kw-2">&</span><span class="self">self</span>, <span class="ident">file_path</span>: <span class="kw-2">&</span><span class="ident">Path</span>) -> <span class="ident">UResult</span><span class="op"><</span>()<span class="op">></span> {
|
622 | 620 | <span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">r</span> <span class="op">=</span> <span class="self">self</span>.<span class="ident">chmod_file</span>(<span class="ident">file_path</span>);
|
623 |
| - <span class="kw">if</span> <span class="op">!</span><span class="ident">is_symlink</span>(<span class="ident">file_path</span>) <span class="op">&&</span> <span class="ident">file_path</span>.<span class="ident">is_dir</span>() { |
| 621 | + <span class="kw">if</span> <span class="op">!</span><span class="ident">file_path</span>.<span class="ident">is_symlink</span>() <span class="op">&&</span> <span class="ident">file_path</span>.<span class="ident">is_dir</span>() { |
624 | 622 | <span class="kw">for</span> <span class="ident">dir_entry</span> <span class="kw">in</span> <span class="ident">file_path</span>.<span class="ident">read_dir</span>()<span class="question-mark">?</span> {
|
625 | 623 | <span class="kw">let</span> <span class="ident">path</span> <span class="op">=</span> <span class="ident">dir_entry</span><span class="question-mark">?</span>.<span class="ident">path</span>();
|
626 |
| - <span class="kw">if</span> <span class="op">!</span><span class="ident">is_symlink</span>(<span class="kw-2">&</span><span class="ident">path</span>) { |
| 624 | + <span class="kw">if</span> <span class="op">!</span><span class="ident">path</span>.<span class="ident">is_symlink</span>() { |
627 | 625 | <span class="ident">r</span> <span class="op">=</span> <span class="self">self</span>.<span class="ident">walk_dir</span>(<span class="ident">path</span>.<span class="ident">as_path</span>());
|
628 | 626 | }
|
629 | 627 | }
|
|
645 | 643 | <span class="kw">let</span> <span class="ident">fperm</span> <span class="op">=</span> <span class="kw">match</span> <span class="ident">fs::metadata</span>(<span class="ident">file</span>) {
|
646 | 644 | <span class="prelude-val">Ok</span>(<span class="ident">meta</span>) => <span class="ident">meta</span>.<span class="ident">mode</span>() <span class="op">&</span> <span class="number">0o7777</span>,
|
647 | 645 | <span class="prelude-val">Err</span>(<span class="ident">err</span>) => {
|
648 |
| - <span class="kw">if</span> <span class="ident">is_symlink</span>(<span class="ident">file</span>) { |
| 646 | + <span class="kw">if</span> <span class="ident">file</span>.<span class="ident">is_symlink</span>() { |
649 | 647 | <span class="kw">if</span> <span class="self">self</span>.<span class="ident">verbose</span> {
|
650 | 648 | <span class="macro">println!</span>(
|
651 | 649 | <span class="string">"neither symbolic link {} nor referent has been changed"</span>,
|
|
0 commit comments