Skip to content

Commit 20ae2fa

Browse files
sylvestresylvestre
committed
deploy: 055173b 
1 parent 77c83a9 commit 20ae2fa

22 files changed

+134
-232
lines changed

‎dev/src/uu_df/blocks.rs.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
<span class="comment">// * For the full copyright and license information, please view the LICENSE</span>
203203
<span class="comment">// * file that was distributed with this source code.</span>
204204
<span class="doccomment">//! Types for representing and displaying block sizes.</span>
205-
<span class="kw">use</span> <span class="kw">crate</span>::{<span class="ident">OPT_BLOCKSIZE</span>, <span class="ident">OPT_HUMAN_READABLE</span>, <span class="ident">OPT_HUMAN_READABLE_2</span>};
205+
<span class="kw">use</span> <span class="kw">crate</span>::{<span class="ident">OPT_BLOCKSIZE</span>, <span class="ident">OPT_HUMAN_READABLE_BINARY</span>, <span class="ident">OPT_HUMAN_READABLE_DECIMAL</span>};
206206
<span class="kw">use</span> <span class="ident">clap::ArgMatches</span>;
207207
<span class="kw">use</span> <span class="ident">std::fmt</span>;
208208
<span class="kw">use</span> <span class="ident">std::num::ParseIntError</span>;
@@ -307,9 +307,9 @@
307307
}
308308

309309
<span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn</span> <span class="ident">block_size_from_matches</span>(<span class="ident">matches</span>: <span class="kw-2">&amp;</span><span class="ident">ArgMatches</span>) -&gt; <span class="prelude-ty">Result</span><span class="op">&lt;</span><span class="ident">BlockSize</span>, <span class="ident">ParseIntError</span><span class="op">&gt;</span> {
310-
<span class="kw">if</span> <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">OPT_HUMAN_READABLE</span>) {
310+
<span class="kw">if</span> <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">OPT_HUMAN_READABLE_BINARY</span>) {
311311
<span class="prelude-val">Ok</span>(<span class="ident">BlockSize::HumanReadableBinary</span>)
312-
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">OPT_HUMAN_READABLE_2</span>) {
312+
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">OPT_HUMAN_READABLE_DECIMAL</span>) {
313313
<span class="prelude-val">Ok</span>(<span class="ident">BlockSize::HumanReadableDecimal</span>)
314314
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">OPT_BLOCKSIZE</span>) {
315315
<span class="kw">let</span> <span class="ident">s</span> <span class="op">=</span> <span class="ident">matches</span>.<span class="ident">value_of</span>(<span class="ident">OPT_BLOCKSIZE</span>).<span class="ident">unwrap</span>();

‎dev/src/uu_df/df.rs.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -777,8 +777,8 @@
777777
<span class="kw">static</span> <span class="ident">OPT_ALL</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;all&quot;</span>;
778778
<span class="kw">static</span> <span class="ident">OPT_BLOCKSIZE</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;blocksize&quot;</span>;
779779
<span class="kw">static</span> <span class="ident">OPT_TOTAL</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;total&quot;</span>;
780-
<span class="kw">static</span> <span class="ident">OPT_HUMAN_READABLE</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;human-readable&quot;</span>;
781-
<span class="kw">static</span> <span class="ident">OPT_HUMAN_READABLE_2</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;human-readable-2&quot;</span>;
780+
<span class="kw">static</span> <span class="ident">OPT_HUMAN_READABLE_BINARY</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;human-readable-binary&quot;</span>;
781+
<span class="kw">static</span> <span class="ident">OPT_HUMAN_READABLE_DECIMAL</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;human-readable-decimal&quot;</span>;
782782
<span class="kw">static</span> <span class="ident">OPT_INODES</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;inodes&quot;</span>;
783783
<span class="kw">static</span> <span class="ident">OPT_KILO</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;kilo&quot;</span>;
784784
<span class="kw">static</span> <span class="ident">OPT_LOCAL</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;local&quot;</span>;
@@ -1127,17 +1127,17 @@
11271127
.<span class="ident">help</span>(<span class="string">&quot;produce a grand total&quot;</span>),
11281128
)
11291129
.<span class="ident">arg</span>(
1130-
<span class="ident">Arg::new</span>(<span class="ident">OPT_HUMAN_READABLE</span>)
1130+
<span class="ident">Arg::new</span>(<span class="ident">OPT_HUMAN_READABLE_BINARY</span>)
11311131
.<span class="ident">short</span>(<span class="string">&#39;h&#39;</span>)
11321132
.<span class="ident">long</span>(<span class="string">&quot;human-readable&quot;</span>)
1133-
.<span class="ident">conflicts_with</span>(<span class="ident">OPT_HUMAN_READABLE_2</span>)
1133+
.<span class="ident">conflicts_with</span>(<span class="ident">OPT_HUMAN_READABLE_DECIMAL</span>)
11341134
.<span class="ident">help</span>(<span class="string">&quot;print sizes in human readable format (e.g., 1K 234M 2G)&quot;</span>),
11351135
)
11361136
.<span class="ident">arg</span>(
1137-
<span class="ident">Arg::new</span>(<span class="ident">OPT_HUMAN_READABLE_2</span>)
1137+
<span class="ident">Arg::new</span>(<span class="ident">OPT_HUMAN_READABLE_DECIMAL</span>)
11381138
.<span class="ident">short</span>(<span class="string">&#39;H&#39;</span>)
11391139
.<span class="ident">long</span>(<span class="string">&quot;si&quot;</span>)
1140-
.<span class="ident">conflicts_with</span>(<span class="ident">OPT_HUMAN_READABLE</span>)
1140+
.<span class="ident">conflicts_with</span>(<span class="ident">OPT_HUMAN_READABLE_BINARY</span>)
11411141
.<span class="ident">help</span>(<span class="string">&quot;likewise, but use powers of 1000 not 1024&quot;</span>),
11421142
)
11431143
.<span class="ident">arg</span>(

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

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,26 @@
482482
<span id="480">480</span>
483483
<span id="481">481</span>
484484
<span id="482">482</span>
485+
<span id="483">483</span>
486+
<span id="484">484</span>
487+
<span id="485">485</span>
488+
<span id="486">486</span>
489+
<span id="487">487</span>
490+
<span id="488">488</span>
491+
<span id="489">489</span>
492+
<span id="490">490</span>
493+
<span id="491">491</span>
494+
<span id="492">492</span>
495+
<span id="493">493</span>
496+
<span id="494">494</span>
497+
<span id="495">495</span>
498+
<span id="496">496</span>
499+
<span id="497">497</span>
500+
<span id="498">498</span>
501+
<span id="499">499</span>
502+
<span id="500">500</span>
503+
<span id="501">501</span>
504+
<span id="502">502</span>
485505
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.</span>
486506
<span class="comment">// *</span>
487507
<span class="comment">// * (c) Joseph Crail &lt;jbcrail@gmail.com&gt;</span>
@@ -538,6 +558,7 @@
538558
<span class="ident">TargetIsDirectory</span>(<span class="ident">PathBuf</span>),
539559
<span class="ident">SomeLinksFailed</span>,
540560
<span class="ident">FailedToLink</span>(<span class="ident">String</span>),
561+
<span class="ident">SameFile</span>(<span class="ident">PathBuf</span>, <span class="ident">PathBuf</span>),
541562
<span class="ident">MissingDestination</span>(<span class="ident">PathBuf</span>),
542563
<span class="ident">ExtraOperand</span>(<span class="ident">OsString</span>),
543564
}
@@ -547,6 +568,12 @@
547568
<span class="kw">match</span> <span class="self">self</span> {
548569
<span class="ident"><span class="self">Self</span>::TargetIsDirectory</span>(<span class="ident">s</span>) =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;target {} is not a directory&quot;</span>, <span class="ident">s</span>.<span class="ident">quote</span>()),
549570
<span class="ident"><span class="self">Self</span>::FailedToLink</span>(<span class="ident">e</span>) =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;failed to link: {}&quot;</span>, <span class="ident">e</span>),
571+
<span class="ident"><span class="self">Self</span>::SameFile</span>(<span class="ident">e</span>, <span class="ident">e2</span>) =&gt; <span class="macro">write!</span>(
572+
<span class="ident">f</span>,
573+
<span class="string">&quot;&#39;{}&#39; and &#39;{}&#39; are the same file&quot;</span>,
574+
<span class="ident">e2</span>.<span class="ident">display</span>(),
575+
<span class="ident">e</span>.<span class="ident">display</span>()
576+
),
550577
<span class="ident"><span class="self">Self</span>::SomeLinksFailed</span> =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;some links failed to create&quot;</span>),
551578
<span class="ident"><span class="self">Self</span>::MissingDestination</span>(<span class="ident">s</span>) =&gt; {
552579
<span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;missing destination file operand after {}&quot;</span>, <span class="ident">s</span>.<span class="ident">quote</span>())
@@ -569,6 +596,7 @@
569596
<span class="ident"><span class="self">Self</span>::TargetIsDirectory</span>(<span class="kw">_</span>)
570597
<span class="op">|</span> <span class="ident"><span class="self">Self</span>::SomeLinksFailed</span>
571598
<span class="op">|</span> <span class="ident"><span class="self">Self</span>::FailedToLink</span>(<span class="kw">_</span>)
599+
<span class="op">|</span> <span class="ident"><span class="self">Self</span>::SameFile</span>(<span class="kw">_</span>, <span class="kw">_</span>)
572600
<span class="op">|</span> <span class="ident"><span class="self">Self</span>::MissingDestination</span>(<span class="kw">_</span>)
573601
<span class="op">|</span> <span class="ident"><span class="self">Self</span>::ExtraOperand</span>(<span class="kw">_</span>) =&gt; <span class="number">1</span>,
574602
}
@@ -865,7 +893,7 @@
865893
<span class="prelude-val">Ok</span>(<span class="ident">result</span>.<span class="ident">into</span>())
866894
}
867895

868-
<span class="kw">fn</span> <span class="ident">link</span>(<span class="ident">src</span>: <span class="kw-2">&amp;</span><span class="ident">Path</span>, <span class="ident">dst</span>: <span class="kw-2">&amp;</span><span class="ident">Path</span>, <span class="ident">settings</span>: <span class="kw-2">&amp;</span><span class="ident">Settings</span>) -&gt; <span class="prelude-ty">Result</span><span class="op">&lt;</span>()<span class="op">&gt;</span> {
896+
<span class="kw">fn</span> <span class="ident">link</span>(<span class="ident">src</span>: <span class="kw-2">&amp;</span><span class="ident">Path</span>, <span class="ident">dst</span>: <span class="kw-2">&amp;</span><span class="ident">Path</span>, <span class="ident">settings</span>: <span class="kw-2">&amp;</span><span class="ident">Settings</span>) -&gt; <span class="ident">UResult</span><span class="op">&lt;</span>()<span class="op">&gt;</span> {
869897
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">backup_path</span> <span class="op">=</span> <span class="prelude-val">None</span>;
870898
<span class="kw">let</span> <span class="ident">source</span>: <span class="ident">Cow</span><span class="op">&lt;</span><span class="lifetime">&#39;_</span>, <span class="ident">Path</span><span class="op">&gt;</span> <span class="op">=</span> <span class="kw">if</span> <span class="ident">settings</span>.<span class="ident">relative</span> {
871899
<span class="ident">relative_path</span>(<span class="ident">src</span>, <span class="ident">dst</span>)<span class="question-mark">?</span>
@@ -892,6 +920,18 @@
892920
<span class="ident">BackupMode::NumberedBackup</span> =&gt; <span class="prelude-val">Some</span>(<span class="ident">numbered_backup_path</span>(<span class="ident">dst</span>)),
893921
<span class="ident">BackupMode::ExistingBackup</span> =&gt; <span class="prelude-val">Some</span>(<span class="ident">existing_backup_path</span>(<span class="ident">dst</span>, <span class="kw-2">&amp;</span><span class="ident">settings</span>.<span class="ident">suffix</span>)),
894922
};
923+
<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> {
924+
<span class="comment">// when ln --backup f f, it should detect that it is the same file</span>
925+
<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>;
926+
<span class="kw">let</span> <span class="ident">source_abs</span> <span class="op">=</span> <span class="ident">canonicalize</span>(
927+
<span class="ident">source</span>.<span class="ident">clone</span>(),
928+
<span class="ident">MissingHandling::Normal</span>,
929+
<span class="ident">ResolveMode::Logical</span>,
930+
)<span class="question-mark">?</span>;
931+
<span class="kw">if</span> <span class="ident">dst_abs</span> <span class="op">==</span> <span class="ident">source_abs</span> {
932+
<span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">LnError::SameFile</span>(<span class="ident">dst</span>.<span class="ident">to_path_buf</span>(), <span class="ident">source</span>.<span class="ident">to_path_buf</span>()).<span class="ident">into</span>());
933+
}
934+
}
895935
<span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Some</span>(<span class="kw-2">ref</span> <span class="ident">p</span>) <span class="op">=</span> <span class="ident">backup_path</span> {
896936
<span class="ident">fs::rename</span>(<span class="ident">dst</span>, <span class="ident">p</span>)<span class="question-mark">?</span>;
897937
}

0 commit comments

Comments
 (0)