Skip to content

Commit 73f3be4

Browse files
sylvestresylvestre
committed
deploy: c249eba 
1 parent f36ef57 commit 73f3be4

20 files changed

+204
-85
lines changed

‎dev/search-index.js

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dev/src/uu_cp/cp.rs.html

+1-23
Original file line numberDiff line numberDiff line change
@@ -1681,17 +1681,6 @@
16811681
<span id="1676">1676</span>
16821682
<span id="1677">1677</span>
16831683
<span id="1678">1678</span>
1684-
<span id="1679">1679</span>
1685-
<span id="1680">1680</span>
1686-
<span id="1681">1681</span>
1687-
<span id="1682">1682</span>
1688-
<span id="1683">1683</span>
1689-
<span id="1684">1684</span>
1690-
<span id="1685">1685</span>
1691-
<span id="1686">1686</span>
1692-
<span id="1687">1687</span>
1693-
<span id="1688">1688</span>
1694-
<span id="1689">1689</span>
16951684
</pre><pre class="rust"><code><span class="attribute">#![<span class="ident">allow</span>(<span class="ident">clippy::missing_safety_doc</span>)]</span>
16961685
<span class="attribute">#![<span class="ident">allow</span>(<span class="ident">clippy::extra_unused_lifetimes</span>)]</span>
16971686

@@ -1712,7 +1701,7 @@
17121701

17131702
<span class="kw">use</span> <span class="ident">uucore::display::Quotable</span>;
17141703
<span class="kw">use</span> <span class="ident">uucore::format_usage</span>;
1715-
<span class="kw">use</span> <span class="ident">uucore::fs::FileInformation</span>;
1704+
<span class="kw">use</span> <span class="ident">uucore::fs</span>::{<span class="ident">paths_refer_to_same_file</span>, <span class="ident">FileInformation</span>};
17161705

17171706
<span class="kw">use</span> <span class="ident">std::borrow::Cow</span>;
17181707

@@ -3351,17 +3340,6 @@
33513340
<span class="prelude-val">Ok</span>(<span class="ident">target</span>.<span class="ident">join</span>(<span class="kw-2">&amp;</span><span class="ident">local_to_root</span>))
33523341
}
33533342

3354-
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">paths_refer_to_same_file</span>(<span class="ident">p1</span>: <span class="kw-2">&amp;</span><span class="ident">Path</span>, <span class="ident">p2</span>: <span class="kw-2">&amp;</span><span class="ident">Path</span>, <span class="ident">dereference</span>: <span class="ident">bool</span>) -&gt; <span class="ident">bool</span> {
3355-
<span class="comment">// We have to take symlinks and relative paths into account.</span>
3356-
<span class="kw">let</span> <span class="ident">res1</span> <span class="op">=</span> <span class="ident">FileInformation::from_path</span>(<span class="ident">p1</span>, <span class="ident">dereference</span>);
3357-
<span class="kw">let</span> <span class="ident">res2</span> <span class="op">=</span> <span class="ident">FileInformation::from_path</span>(<span class="ident">p2</span>, <span class="ident">dereference</span>);
3358-
3359-
<span class="kw">match</span> (<span class="ident">res1</span>, <span class="ident">res2</span>) {
3360-
(<span class="prelude-val">Ok</span>(<span class="ident">info1</span>), <span class="prelude-val">Ok</span>(<span class="ident">info2</span>)) =&gt; <span class="ident">info1</span> <span class="op">==</span> <span class="ident">info2</span>,
3361-
<span class="kw">_</span> =&gt; <span class="bool-val">false</span>,
3362-
}
3363-
}
3364-
33653343
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">path_has_prefix</span>(<span class="ident">p1</span>: <span class="kw-2">&amp;</span><span class="ident">Path</span>, <span class="ident">p2</span>: <span class="kw-2">&amp;</span><span class="ident">Path</span>) -&gt; <span class="ident">io::Result</span><span class="op">&lt;</span><span class="ident">bool</span><span class="op">&gt;</span> {
33663344
<span class="kw">let</span> <span class="ident">pathbuf1</span> <span class="op">=</span> <span class="ident">canonicalize</span>(<span class="ident">p1</span>, <span class="ident">MissingHandling::Normal</span>, <span class="ident">ResolveMode::Logical</span>)<span class="question-mark">?</span>;
33673345
<span class="kw">let</span> <span class="ident">pathbuf2</span> <span class="op">=</span> <span class="ident">canonicalize</span>(<span class="ident">p2</span>, <span class="ident">MissingHandling::Normal</span>, <span class="ident">ResolveMode::Logical</span>)<span class="question-mark">?</span>;

‎dev/src/uu_ln/ln.rs.html

+5-11
Original file line numberDiff line numberDiff line change
@@ -536,9 +536,6 @@
536536
<span id="531">531</span>
537537
<span id="532">532</span>
538538
<span id="533">533</span>
539-
<span id="534">534</span>
540-
<span id="535">535</span>
541-
<span id="536">536</span>
542539
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.</span>
543540
<span class="comment">// *</span>
544541
<span class="comment">// * (c) Joseph Crail &lt;jbcrail@gmail.com&gt;</span>
@@ -555,7 +552,7 @@
555552
<span class="kw">use</span> <span class="ident">uucore::display::Quotable</span>;
556553
<span class="kw">use</span> <span class="ident">uucore::error</span>::{<span class="ident">UError</span>, <span class="ident">UResult</span>};
557554
<span class="kw">use</span> <span class="ident">uucore::format_usage</span>;
558-
<span class="kw">use</span> <span class="ident">uucore::fs::is_symlink</span>;
555+
<span class="kw">use</span> <span class="ident">uucore::fs</span>::{<span class="ident">is_symlink</span>, <span class="ident">paths_refer_to_same_file</span>};
559556

560557
<span class="kw">use</span> <span class="ident">std::borrow::Cow</span>;
561558
<span class="kw">use</span> <span class="ident">std::error::Error</span>;
@@ -976,13 +973,7 @@
976973
};
977974
<span class="kw">if</span> <span class="ident">settings</span>.<span class="ident">backup</span> <span class="op">==</span> <span class="ident">BackupMode::ExistingBackup</span> <span class="op">&amp;&amp;</span> <span class="op">!</span><span class="ident">settings</span>.<span class="ident">symbolic</span> {
978975
<span class="comment">// when ln --backup f f, it should detect that it is the same file</span>
979-
<span class="kw">let</span> <span class="ident">dst_abs</span> <span class="op">=</span> <span class="ident">canonicalize</span>(<span class="ident">dst</span>, <span class="ident">MissingHandling::Normal</span>, <span class="ident">ResolveMode::Logical</span>)<span class="question-mark">?</span>;
980-
<span class="kw">let</span> <span class="ident">source_abs</span> <span class="op">=</span> <span class="ident">canonicalize</span>(
981-
<span class="ident">source</span>.<span class="ident">clone</span>(),
982-
<span class="ident">MissingHandling::Normal</span>,
983-
<span class="ident">ResolveMode::Logical</span>,
984-
)<span class="question-mark">?</span>;
985-
<span class="kw">if</span> <span class="ident">dst_abs</span> <span class="op">==</span> <span class="ident">source_abs</span> {
976+
<span class="kw">if</span> <span class="ident">paths_refer_to_same_file</span>(<span class="ident">src</span>, <span class="ident">dst</span>, <span class="bool-val">true</span>) {
986977
<span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">LnError::SameFile</span>().<span class="ident">into</span>());
987978
}
988979
}
@@ -1001,6 +992,9 @@
1001992
<span class="comment">// In case of error, don&#39;t do anything</span>
1002993
}
1003994
<span class="ident">OverwriteMode::Force</span> =&gt; {
995+
<span class="kw">if</span> <span class="op">!</span><span class="ident">is_symlink</span>(<span class="ident">dst</span>) <span class="op">&amp;&amp;</span> <span class="ident">paths_refer_to_same_file</span>(<span class="ident">src</span>, <span class="ident">dst</span>, <span class="bool-val">true</span>) {
996+
<span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">LnError::SameFile</span>().<span class="ident">into</span>());
997+
}
1004998
<span class="kw">if</span> <span class="ident">fs::remove_file</span>(<span class="ident">dst</span>).<span class="ident">is_ok</span>() {};
1005999
<span class="comment">// In case of error, don&#39;t do anything</span>
10061000
}

0 commit comments

Comments
 (0)