Skip to content

Commit 8a78fe7

Browse files
sylvestresylvestre
committed
deploy: c249eba 
1 parent d058b64 commit 8a78fe7

10 files changed

+87
-25
lines changed

‎dev/src/uu_expand/expand.rs.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,7 @@
399399
<span id="394">394</span>
400400
<span id="395">395</span>
401401
<span id="396">396</span>
402+
<span id="397">397</span>
402403
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.</span>
403404
<span class="comment">//</span>
404405
<span class="comment">// (c) Virgile Andreani &lt;virgile.andreani@anbuco.fr&gt;</span>
@@ -533,8 +534,8 @@
533534

534535
<span class="kw">impl</span> <span class="ident">Options</span> {
535536
<span class="kw">fn</span> <span class="ident">new</span>(<span class="ident">matches</span>: <span class="kw-2">&amp;</span><span class="ident">ArgMatches</span>) -&gt; <span class="self">Self</span> {
536-
<span class="kw">let</span> (<span class="ident">remaining_mode</span>, <span class="ident">tabstops</span>) <span class="op">=</span> <span class="kw">match</span> <span class="ident">matches</span>.<span class="ident">value_of</span>(<span class="ident">options::TABS</span>) {
537-
<span class="prelude-val">Some</span>(<span class="ident">s</span>) =&gt; <span class="ident">tabstops_parse</span>(<span class="ident">s</span>),
537+
<span class="kw">let</span> (<span class="ident">remaining_mode</span>, <span class="ident">tabstops</span>) <span class="op">=</span> <span class="kw">match</span> <span class="ident">matches</span>.<span class="ident">values_of</span>(<span class="ident">options::TABS</span>) {
538+
<span class="prelude-val">Some</span>(<span class="ident">s</span>) =&gt; <span class="ident">tabstops_parse</span>(<span class="kw-2">&amp;</span><span class="ident">s</span>.<span class="ident">collect</span>::<span class="op">&lt;</span><span class="ident">Vec</span><span class="op">&lt;</span><span class="kw-2">&amp;</span><span class="ident">str</span><span class="op">&gt;</span><span class="op">&gt;</span>().<span class="ident">join</span>(<span class="string">&quot;,&quot;</span>)),
538539
<span class="prelude-val">None</span> =&gt; (<span class="ident">RemainingMode::None</span>, <span class="macro">vec!</span>[<span class="ident">DEFAULT_TABSTOP</span>]),
539540
};
540541

@@ -596,6 +597,7 @@
596597
.<span class="ident">short</span>(<span class="string">&#39;t&#39;</span>)
597598
.<span class="ident">value_name</span>(<span class="string">&quot;N, LIST&quot;</span>)
598599
.<span class="ident">takes_value</span>(<span class="bool-val">true</span>)
600+
.<span class="ident">multiple_occurrences</span>(<span class="bool-val">true</span>)
599601
.<span class="ident">help</span>(<span class="string">&quot;have tabs N characters apart, not 8 or use comma separated list of explicit tab positions&quot;</span>),
600602
)
601603
.<span class="ident">arg</span>(

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

Lines changed: 71 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,36 @@
515515
<span id="510">510</span>
516516
<span id="511">511</span>
517517
<span id="512">512</span>
518+
<span id="513">513</span>
519+
<span id="514">514</span>
520+
<span id="515">515</span>
521+
<span id="516">516</span>
522+
<span id="517">517</span>
523+
<span id="518">518</span>
524+
<span id="519">519</span>
525+
<span id="520">520</span>
526+
<span id="521">521</span>
527+
<span id="522">522</span>
528+
<span id="523">523</span>
529+
<span id="524">524</span>
530+
<span id="525">525</span>
531+
<span id="526">526</span>
532+
<span id="527">527</span>
533+
<span id="528">528</span>
534+
<span id="529">529</span>
535+
<span id="530">530</span>
536+
<span id="531">531</span>
537+
<span id="532">532</span>
538+
<span id="533">533</span>
539+
<span id="534">534</span>
540+
<span id="535">535</span>
541+
<span id="536">536</span>
542+
<span id="537">537</span>
543+
<span id="538">538</span>
544+
<span id="539">539</span>
545+
<span id="540">540</span>
546+
<span id="541">541</span>
547+
<span id="542">542</span>
518548
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.</span>
519549
<span class="comment">// *</span>
520550
<span class="comment">// * (c) Joseph Crail &lt;jbcrail@gmail.com&gt;</span>
@@ -553,6 +583,7 @@
553583
<span class="ident">suffix</span>: <span class="ident">String</span>,
554584
<span class="ident">symbolic</span>: <span class="ident">bool</span>,
555585
<span class="ident">relative</span>: <span class="ident">bool</span>,
586+
<span class="ident">logical</span>: <span class="ident">bool</span>,
556587
<span class="ident">target_dir</span>: <span class="prelude-ty">Option</span><span class="op">&lt;</span><span class="ident">String</span><span class="op">&gt;</span>,
557588
<span class="ident">no_target_dir</span>: <span class="ident">bool</span>,
558589
<span class="ident">no_dereference</span>: <span class="ident">bool</span>,
@@ -638,9 +669,12 @@
638669

639670
<span class="kw">mod</span> <span class="ident">options</span> {
640671
<span class="kw">pub</span> <span class="kw">const</span> <span class="ident">FORCE</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;force&quot;</span>;
672+
<span class="comment">//pub const DIRECTORY: &amp;str = &quot;directory&quot;;</span>
641673
<span class="kw">pub</span> <span class="kw">const</span> <span class="ident">INTERACTIVE</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;interactive&quot;</span>;
642674
<span class="kw">pub</span> <span class="kw">const</span> <span class="ident">NO_DEREFERENCE</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;no-dereference&quot;</span>;
643675
<span class="kw">pub</span> <span class="kw">const</span> <span class="ident">SYMBOLIC</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;symbolic&quot;</span>;
676+
<span class="kw">pub</span> <span class="kw">const</span> <span class="ident">LOGICAL</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;logical&quot;</span>;
677+
<span class="kw">pub</span> <span class="kw">const</span> <span class="ident">PHYSICAL</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;physical&quot;</span>;
644678
<span class="kw">pub</span> <span class="kw">const</span> <span class="ident">TARGET_DIRECTORY</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;target-directory&quot;</span>;
645679
<span class="kw">pub</span> <span class="kw">const</span> <span class="ident">NO_TARGET_DIRECTORY</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;no-target-directory&quot;</span>;
646680
<span class="kw">pub</span> <span class="kw">const</span> <span class="ident">RELATIVE</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;relative&quot;</span>;
@@ -669,6 +703,8 @@
669703
.<span class="ident">map</span>(<span class="ident">PathBuf::from</span>)
670704
.<span class="ident">collect</span>();
671705

706+
<span class="kw">let</span> <span class="ident">symbolic</span> <span class="op">=</span> <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">options::SYMBOLIC</span>);
707+
672708
<span class="kw">let</span> <span class="ident">overwrite_mode</span> <span class="op">=</span> <span class="kw">if</span> <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">options::FORCE</span>) {
673709
<span class="ident">OverwriteMode::Force</span>
674710
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">options::INTERACTIVE</span>) {
@@ -680,11 +716,15 @@
680716
<span class="kw">let</span> <span class="ident">backup_mode</span> <span class="op">=</span> <span class="ident">backup_control::determine_backup_mode</span>(<span class="kw-2">&amp;</span><span class="ident">matches</span>)<span class="question-mark">?</span>;
681717
<span class="kw">let</span> <span class="ident">backup_suffix</span> <span class="op">=</span> <span class="ident">backup_control::determine_backup_suffix</span>(<span class="kw-2">&amp;</span><span class="ident">matches</span>);
682718

719+
<span class="comment">// When we have &quot;-L&quot; or &quot;-L -P&quot;, false otherwise</span>
720+
<span class="kw">let</span> <span class="ident">logical</span> <span class="op">=</span> <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">options::LOGICAL</span>);
721+
683722
<span class="kw">let</span> <span class="ident">settings</span> <span class="op">=</span> <span class="ident">Settings</span> {
684723
<span class="ident">overwrite</span>: <span class="ident">overwrite_mode</span>,
685724
<span class="ident">backup</span>: <span class="ident">backup_mode</span>,
686725
<span class="ident">suffix</span>: <span class="ident">backup_suffix</span>,
687-
<span class="ident">symbolic</span>: <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">options::SYMBOLIC</span>),
726+
<span class="ident">symbolic</span>,
727+
<span class="ident">logical</span>,
688728
<span class="ident">relative</span>: <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">options::RELATIVE</span>),
689729
<span class="ident">target_dir</span>: <span class="ident">matches</span>
690730
.<span class="ident">value_of</span>(<span class="ident">options::TARGET_DIRECTORY</span>)
@@ -705,9 +745,12 @@
705745
.<span class="ident">infer_long_args</span>(<span class="bool-val">true</span>)
706746
.<span class="ident">arg</span>(<span class="ident">backup_control::arguments::backup</span>())
707747
.<span class="ident">arg</span>(<span class="ident">backup_control::arguments::backup_no_args</span>())
708-
<span class="comment">// TODO: opts.arg(</span>
709-
<span class="comment">// Arg::new((&quot;d&quot;, &quot;directory&quot;, &quot;allow users with appropriate privileges to attempt \</span>
710-
<span class="comment">// to make hard links to directories&quot;);</span>
748+
<span class="comment">/*.arg(
749+
Arg::new(options::DIRECTORY)
750+
.short(&#39;d&#39;)
751+
.long(options::DIRECTORY)
752+
.help(&quot;allow users with appropriate privileges to attempt to make hard links to directories&quot;)
753+
)*/</span>
711754
.<span class="ident">arg</span>(
712755
<span class="ident">Arg::new</span>(<span class="ident">options::FORCE</span>)
713756
.<span class="ident">short</span>(<span class="string">&#39;f&#39;</span>)
@@ -729,15 +772,24 @@
729772
symbolic link to a directory&quot;</span>,
730773
),
731774
)
732-
<span class="comment">// TODO: opts.arg(</span>
733-
<span class="comment">// Arg::new((&quot;L&quot;, &quot;logical&quot;, &quot;dereference TARGETs that are symbolic links&quot;);</span>
734-
<span class="comment">//</span>
735-
<span class="comment">// TODO: opts.arg(</span>
736-
<span class="comment">// Arg::new((&quot;P&quot;, &quot;physical&quot;, &quot;make hard links directly to symbolic links&quot;);</span>
775+
.<span class="ident">arg</span>(
776+
<span class="ident">Arg::new</span>(<span class="ident">options::LOGICAL</span>)
777+
.<span class="ident">short</span>(<span class="string">&#39;L&#39;</span>)
778+
.<span class="ident">long</span>(<span class="ident">options::LOGICAL</span>)
779+
.<span class="ident">help</span>(<span class="string">&quot;dereference TARGETs that are symbolic links&quot;</span>)
780+
.<span class="ident">overrides_with</span>(<span class="ident">options::PHYSICAL</span>),
781+
)
782+
.<span class="ident">arg</span>(
783+
<span class="comment">// Not implemented yet</span>
784+
<span class="ident">Arg::new</span>(<span class="ident">options::PHYSICAL</span>)
785+
.<span class="ident">short</span>(<span class="string">&#39;P&#39;</span>)
786+
.<span class="ident">long</span>(<span class="ident">options::PHYSICAL</span>)
787+
.<span class="ident">help</span>(<span class="string">&quot;make hard links directly to symbolic links&quot;</span>),
788+
)
737789
.<span class="ident">arg</span>(
738790
<span class="ident">Arg::new</span>(<span class="ident">options::SYMBOLIC</span>)
739791
.<span class="ident">short</span>(<span class="string">&#39;s&#39;</span>)
740-
.<span class="ident">long</span>(<span class="string">&quot;symbolic&quot;</span>)
792+
.<span class="ident">long</span>(<span class="ident">options::SYMBOLIC</span>)
741793
.<span class="ident">help</span>(<span class="string">&quot;make symbolic links instead of hard links&quot;</span>)
742794
<span class="comment">// override added for https://github.com/uutils/coreutils/issues/2359</span>
743795
.<span class="ident">overrides_with</span>(<span class="ident">options::SYMBOLIC</span>),
@@ -963,7 +1015,15 @@
9631015
<span class="kw">if</span> <span class="ident">settings</span>.<span class="ident">symbolic</span> {
9641016
<span class="ident">symlink</span>(<span class="kw-2">&amp;</span><span class="ident">source</span>, <span class="ident">dst</span>)<span class="question-mark">?</span>;
9651017
} <span class="kw">else</span> {
966-
<span class="ident">fs::hard_link</span>(<span class="kw-2">&amp;</span><span class="ident">source</span>, <span class="ident">dst</span>)<span class="question-mark">?</span>;
1018+
<span class="kw">let</span> <span class="ident">p</span> <span class="op">=</span> <span class="kw">if</span> <span class="ident">settings</span>.<span class="ident">logical</span> <span class="op">&amp;&amp;</span> <span class="ident">is_symlink</span>(<span class="kw-2">&amp;</span><span class="ident">source</span>) {
1019+
<span class="comment">// if we want to have an hard link,</span>
1020+
<span class="comment">// source is a symlink and -L is passed</span>
1021+
<span class="comment">// we want to resolve the symlink to create the hardlink</span>
1022+
<span class="ident">std::fs::canonicalize</span>(<span class="kw-2">&amp;</span><span class="ident">source</span>)<span class="question-mark">?</span>
1023+
} <span class="kw">else</span> {
1024+
<span class="ident">source</span>.<span class="ident">to_path_buf</span>()
1025+
};
1026+
<span class="ident">fs::hard_link</span>(<span class="kw-2">&amp;</span><span class="ident">p</span>, <span class="ident">dst</span>)<span class="question-mark">?</span>;
9671027
}
9681028

9691029
<span class="kw">if</span> <span class="ident">settings</span>.<span class="ident">verbose</span> {

‎dev/uu_expand/fn.uu_app.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
</nav>
55
<nav class="sidebar"><a class="sidebar-logo" href="../uu_expand/index.html"><div class="logo-container"><img class="rust-logo" src="../rust-logo.svg" alt="logo"></div>
66
</a><div class="sidebar-elems"><h2 class="location"><a href="index.html">In uu_expand</a></h2><div id="sidebar-vars" data-name="uu_app" data-ty="fn" data-relpath=""></div><script defer src="sidebar-items.js"></script></div></nav><main><div class="width-limiter"><div class="sub-container"><a class="sub-logo-container" href="../uu_expand/index.html"><img class="rust-logo" src="../rust-logo.svg" alt="logo"></a><nav class="sub"><div class="theme-picker hidden"><button id="theme-picker" aria-label="Pick another theme!" aria-haspopup="menu" title="themes"><img width="22" height="22" alt="Pick another theme!" src="../brush.svg"></button><div id="theme-choices" role="menu"></div></div><form class="search-form"><div class="search-container"><span></span><input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"><button type="button" id="help-button" title="help">?</button><a id="settings-menu" href="../settings.html" title="settings"><img width="22" height="22" alt="Change settings" src="../wheel.svg"></a></div></form></nav></div><section id="main-content" class="content"><div class="main-heading">
7-
<h1 class="fqn"><span class="in-band">Function <a href="index.html">uu_expand</a>::<wbr><a class="fn" href="#">uu_app</a><button id="copy-path" onclick="copy_path(this)" title="Copy item path to clipboard"><img src="../clipboard.svg" width="19" height="18" alt="Copy item path"></button></span></h1><span class="out-of-band"><a class="srclink" href="../src/uu_expand/expand.rs.html#179-212">source</a> · <a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class="inner">&#x2212;</span>]</a></span></div><div class="docblock item-decl"><pre class="rust fn"><code>pub fn uu_app&lt;'a&gt;() -&gt; Command&lt;'a&gt;</code></pre></div></section><section id="search" class="content hidden"></section></div></main><div id="rustdoc-vars" data-root-path="../" data-current-crate="uu_expand" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.61.0 (fe5b13d68 2022-05-18)" ></div>
7+
<h1 class="fqn"><span class="in-band">Function <a href="index.html">uu_expand</a>::<wbr><a class="fn" href="#">uu_app</a><button id="copy-path" onclick="copy_path(this)" title="Copy item path to clipboard"><img src="../clipboard.svg" width="19" height="18" alt="Copy item path"></button></span></h1><span class="out-of-band"><a class="srclink" href="../src/uu_expand/expand.rs.html#179-213">source</a> · <a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class="inner">&#x2212;</span>]</a></span></div><div class="docblock item-decl"><pre class="rust fn"><code>pub fn uu_app&lt;'a&gt;() -&gt; Command&lt;'a&gt;</code></pre></div></section><section id="search" class="content hidden"></section></div></main><div id="rustdoc-vars" data-root-path="../" data-current-crate="uu_expand" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.61.0 (fe5b13d68 2022-05-18)" ></div>
88
</body></html>

0 commit comments

Comments
 (0)