Skip to content

Commit 3ae856c

Browse files
sylvestresylvestre
committed
deploy: c249eba 
1 parent 30bfe10 commit 3ae856c

19 files changed

+82
-50
lines changed

‎dev/src/uu_hashsum/hashsum.rs.html

+9-1
Original file line numberDiff line numberDiff line change
@@ -679,6 +679,10 @@
679679
<span id="673">673</span>
680680
<span id="674">674</span>
681681
<span id="675">675</span>
682+
<span id="676">676</span>
683+
<span id="677">677</span>
684+
<span id="678">678</span>
685+
<span id="679">679</span>
682686
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.</span>
683687
<span class="comment">// *</span>
684688
<span class="comment">// * (c) Alex Lyon &lt;arcterus@mail.com&gt;</span>
@@ -977,7 +981,11 @@
977981
};
978982
<span class="kw">let</span> <span class="ident">check</span> <span class="op">=</span> <span class="ident">matches</span>.<span class="ident">contains_id</span>(<span class="string">&quot;check&quot;</span>);
979983
<span class="kw">let</span> <span class="ident">tag</span> <span class="op">=</span> <span class="ident">matches</span>.<span class="ident">contains_id</span>(<span class="string">&quot;tag&quot;</span>);
980-
<span class="kw">let</span> <span class="ident">nonames</span> <span class="op">=</span> <span class="ident">matches</span>.<span class="ident">contains_id</span>(<span class="string">&quot;no-names&quot;</span>);
984+
<span class="kw">let</span> <span class="ident">nonames</span> <span class="op">=</span> <span class="kw">if</span> <span class="ident">binary_name</span> <span class="op">==</span> <span class="string">&quot;b3sum&quot;</span> {
985+
<span class="ident">matches</span>.<span class="ident">contains_id</span>(<span class="string">&quot;no-names&quot;</span>)
986+
} <span class="kw">else</span> {
987+
<span class="bool-val">false</span>
988+
};
981989
<span class="kw">let</span> <span class="ident">status</span> <span class="op">=</span> <span class="ident">matches</span>.<span class="ident">contains_id</span>(<span class="string">&quot;status&quot;</span>);
982990
<span class="kw">let</span> <span class="ident">quiet</span> <span class="op">=</span> <span class="ident">matches</span>.<span class="ident">contains_id</span>(<span class="string">&quot;quiet&quot;</span>) <span class="op">|</span><span class="op">|</span> <span class="ident">status</span>;
983991
<span class="kw">let</span> <span class="ident">strict</span> <span class="op">=</span> <span class="ident">matches</span>.<span class="ident">contains_id</span>(<span class="string">&quot;strict&quot;</span>);

‎dev/src/uu_id/id.rs.html

+11-3
Original file line numberDiff line numberDiff line change
@@ -678,6 +678,10 @@
678678
<span id="672">672</span>
679679
<span id="673">673</span>
680680
<span id="674">674</span>
681+
<span id="675">675</span>
682+
<span id="676">676</span>
683+
<span id="677">677</span>
684+
<span id="678">678</span>
681685
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.</span>
682686
<span class="comment">//</span>
683687
<span class="comment">// (c) Alan Andrade &lt;alan.andradec@gmail.com&gt;</span>
@@ -1223,14 +1227,18 @@
12231227

12241228
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">not</span>(<span class="ident">any</span>(<span class="ident">target_os</span> <span class="op">=</span> <span class="string">&quot;linux&quot;</span>, <span class="ident">target_os</span> <span class="op">=</span> <span class="string">&quot;android&quot;</span>)))]</span>
12251229
<span class="kw">fn</span> <span class="ident">auditid</span>() {
1226-
<span class="attribute">#[<span class="ident">allow</span>(<span class="ident">deprecated</span>)]</span>
1227-
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">auditinfo</span>: <span class="ident">audit::c_auditinfo_addr_t</span> <span class="op">=</span> <span class="kw">unsafe</span> { <span class="ident">std::mem::uninitialized</span>() };
1228-
<span class="kw">let</span> <span class="ident">address</span> <span class="op">=</span> <span class="kw-2">&amp;mut</span> <span class="ident">auditinfo</span> <span class="kw">as</span> <span class="kw-2">*mut</span> <span class="ident">audit::c_auditinfo_addr_t</span>;
1230+
<span class="kw">use</span> <span class="ident">std::mem::MaybeUninit</span>;
1231+
1232+
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">auditinfo</span>: <span class="ident">MaybeUninit</span><span class="op">&lt;</span><span class="ident">audit::c_auditinfo_addr_t</span><span class="op">&gt;</span> <span class="op">=</span> <span class="ident">MaybeUninit::uninit</span>();
1233+
<span class="kw">let</span> <span class="ident">address</span> <span class="op">=</span> <span class="ident">auditinfo</span>.<span class="ident">as_mut_ptr</span>();
12291234
<span class="kw">if</span> <span class="kw">unsafe</span> { <span class="ident">audit::getaudit</span>(<span class="ident">address</span>) } <span class="op">&lt;</span> <span class="number">0</span> {
12301235
<span class="macro">println!</span>(<span class="string">&quot;couldn&#39;t retrieve information&quot;</span>);
12311236
<span class="kw">return</span>;
12321237
}
12331238

1239+
<span class="comment">// SAFETY: getaudit wrote a valid struct to auditinfo</span>
1240+
<span class="kw">let</span> <span class="ident">auditinfo</span> <span class="op">=</span> <span class="kw">unsafe</span> { <span class="ident">auditinfo</span>.<span class="ident">assume_init</span>() };
1241+
12341242
<span class="macro">println!</span>(<span class="string">&quot;auid={}&quot;</span>, <span class="ident">auditinfo</span>.<span class="ident">ai_auid</span>);
12351243
<span class="macro">println!</span>(<span class="string">&quot;mask.success=0x{:x}&quot;</span>, <span class="ident">auditinfo</span>.<span class="ident">ai_mask</span>.<span class="ident">am_success</span>);
12361244
<span class="macro">println!</span>(<span class="string">&quot;mask.failure=0x{:x}&quot;</span>, <span class="ident">auditinfo</span>.<span class="ident">ai_mask</span>.<span class="ident">am_failure</span>);

‎dev/src/uu_mv/mv.rs.html

+40-14
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,19 @@
492492
<span id="486">486</span>
493493
<span id="487">487</span>
494494
<span id="488">488</span>
495+
<span id="489">489</span>
496+
<span id="490">490</span>
497+
<span id="491">491</span>
498+
<span id="492">492</span>
499+
<span id="493">493</span>
500+
<span id="494">494</span>
501+
<span id="495">495</span>
502+
<span id="496">496</span>
503+
<span id="497">497</span>
504+
<span id="498">498</span>
505+
<span id="499">499</span>
506+
<span id="500">500</span>
507+
<span id="501">501</span>
495508
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.</span>
496509
<span class="comment">//</span>
497510
<span class="comment">// (c) Orvar Segerström &lt;orvarsegerstrom@gmail.com&gt;</span>
@@ -796,20 +809,6 @@
796809
<span class="kw">let</span> <span class="ident">target_dir</span> <span class="op">=</span> <span class="ident">paths</span>.<span class="ident">last</span>().<span class="ident">unwrap</span>();
797810
<span class="kw">let</span> <span class="ident">sources</span> <span class="op">=</span> <span class="kw-2">&amp;</span><span class="ident">paths</span>[..<span class="ident">paths</span>.<span class="ident">len</span>() <span class="op">-</span> <span class="number">1</span>];
798811

799-
<span class="comment">// Check if we have mv dir1 dir2 dir2</span>
800-
<span class="comment">// And generate an error if this is the case</span>
801-
<span class="kw">if</span> <span class="ident">sources</span>.<span class="ident">contains</span>(<span class="ident">target_dir</span>) {
802-
<span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">USimpleError::new</span>(
803-
<span class="number">1</span>,
804-
<span class="macro">format!</span>(
805-
<span class="string">&quot;cannot move {} to a subdirectory of itself, &#39;{}/{}&#39;&quot;</span>,
806-
<span class="ident">target_dir</span>.<span class="ident">quote</span>(),
807-
<span class="ident">target_dir</span>.<span class="ident">display</span>(),
808-
<span class="ident">target_dir</span>.<span class="ident">display</span>()
809-
),
810-
));
811-
}
812-
813812
<span class="ident">move_files_into_dir</span>(<span class="ident">sources</span>, <span class="ident">target_dir</span>, <span class="ident">b</span>)
814813
}
815814
}
@@ -820,6 +819,10 @@
820819
<span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">MvError::NotADirectory</span>(<span class="ident">target_dir</span>.<span class="ident">quote</span>().<span class="ident">to_string</span>()).<span class="ident">into</span>());
821820
}
822821

822+
<span class="kw">let</span> <span class="ident">canonized_target_dir</span> <span class="op">=</span> <span class="ident">target_dir</span>
823+
.<span class="ident">canonicalize</span>()
824+
.<span class="ident">unwrap_or_else</span>(<span class="op">|</span><span class="kw">_</span><span class="op">|</span> <span class="ident">target_dir</span>.<span class="ident">to_path_buf</span>());
825+
823826
<span class="kw">for</span> <span class="ident">sourcepath</span> <span class="kw">in</span> <span class="ident">files</span>.<span class="ident">iter</span>() {
824827
<span class="kw">let</span> <span class="ident">targetpath</span> <span class="op">=</span> <span class="kw">match</span> <span class="ident">sourcepath</span>.<span class="ident">file_name</span>() {
825828
<span class="prelude-val">Some</span>(<span class="ident">name</span>) =&gt; <span class="ident">target_dir</span>.<span class="ident">join</span>(<span class="ident">name</span>),
@@ -828,6 +831,29 @@
828831
<span class="kw">continue</span>;
829832
}
830833
};
834+
835+
<span class="comment">// Check if we have mv dir1 dir2 dir2</span>
836+
<span class="comment">// And generate an error if this is the case</span>
837+
<span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Ok</span>(<span class="ident">canonized_source</span>) <span class="op">=</span> <span class="ident">sourcepath</span>.<span class="ident">canonicalize</span>() {
838+
<span class="kw">if</span> <span class="ident">canonized_source</span> <span class="op">==</span> <span class="ident">canonized_target_dir</span> {
839+
<span class="comment">// User tried to move directory to itself, warning is shown</span>
840+
<span class="comment">// and process of moving files is continued.</span>
841+
<span class="macro">show!</span>(<span class="ident">USimpleError::new</span>(
842+
<span class="number">1</span>,
843+
<span class="macro">format!</span>(
844+
<span class="string">&quot;cannot move &#39;{}&#39; to a subdirectory of itself, &#39;{}/{}&#39;&quot;</span>,
845+
<span class="ident">sourcepath</span>.<span class="ident">display</span>(),
846+
<span class="ident">target_dir</span>.<span class="ident">display</span>(),
847+
<span class="ident">canonized_target_dir</span>.<span class="ident">components</span>().<span class="ident">last</span>().<span class="ident">map_or_else</span>(
848+
<span class="op">|</span><span class="op">|</span> <span class="ident">target_dir</span>.<span class="ident">display</span>().<span class="ident">to_string</span>(),
849+
<span class="op">|</span><span class="ident">dir</span><span class="op">|</span> { <span class="ident">PathBuf::from</span>(<span class="ident">dir</span>.<span class="ident">as_os_str</span>()).<span class="ident">display</span>().<span class="ident">to_string</span>() }
850+
)
851+
)
852+
));
853+
<span class="kw">continue</span>;
854+
}
855+
}
856+
831857
<span class="macro">show_if_err!</span>(
832858
<span class="ident">rename</span>(<span class="ident">sourcepath</span>, <span class="kw-2">&amp;</span><span class="ident">targetpath</span>, <span class="ident">b</span>).<span class="ident">map_err_context</span>(<span class="op">|</span><span class="op">|</span> <span class="macro">format!</span>(
833859
<span class="string">&quot;cannot move {} to {}&quot;</span>,

‎dev/src/uu_sync/sync.rs.html

+2-8
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,6 @@
238238
<span id="232">232</span>
239239
<span id="233">233</span>
240240
<span id="234">234</span>
241-
<span id="235">235</span>
242-
<span id="236">236</span>
243-
<span id="237">237</span>
244241
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.</span>
245242
<span class="comment">// *</span>
246243
<span class="comment">// * (c) Alexander Fomin &lt;xander.fomin@ya.ru&gt;</span>
@@ -314,7 +311,6 @@
314311
<span class="kw">use</span> <span class="ident"><span class="self">self</span>::winapi::um::winbase</span>;
315312
<span class="kw">use</span> <span class="ident"><span class="self">self</span>::winapi::um::winnt</span>;
316313
<span class="kw">use</span> <span class="ident">std::fs::OpenOptions</span>;
317-
<span class="kw">use</span> <span class="ident">std::mem</span>;
318314
<span class="kw">use</span> <span class="ident">std::os::windows::prelude</span>::<span class="kw-2">*</span>;
319315
<span class="kw">use</span> <span class="ident">std::path::Path</span>;
320316
<span class="kw">use</span> <span class="ident">uucore::crash</span>;
@@ -342,8 +338,7 @@
342338
}
343339

344340
<span class="kw">unsafe</span> <span class="kw">fn</span> <span class="ident">find_first_volume</span>() -&gt; (<span class="ident">String</span>, <span class="ident">winnt::HANDLE</span>) {
345-
<span class="attribute">#[<span class="ident">allow</span>(<span class="ident">deprecated</span>)]</span>
346-
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">name</span>: [<span class="ident">winnt::WCHAR</span>; <span class="ident">minwindef::MAX_PATH</span>] <span class="op">=</span> <span class="ident">mem::uninitialized</span>();
341+
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">name</span>: [<span class="ident">winnt::WCHAR</span>; <span class="ident">minwindef::MAX_PATH</span>] <span class="op">=</span> [<span class="number">0</span>; <span class="ident">minwindef::MAX_PATH</span>];
347342
<span class="kw">let</span> <span class="ident">handle</span> <span class="op">=</span> <span class="ident">winapi::um::fileapi::FindFirstVolumeW</span>(
348343
<span class="ident">name</span>.<span class="ident">as_mut_ptr</span>(),
349344
<span class="ident">name</span>.<span class="ident">len</span>() <span class="kw">as</span> <span class="ident">minwindef::DWORD</span>,
@@ -361,8 +356,7 @@
361356
<span class="kw">let</span> (<span class="ident">first_volume</span>, <span class="ident">next_volume_handle</span>) <span class="op">=</span> <span class="ident">find_first_volume</span>();
362357
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">volumes</span> <span class="op">=</span> <span class="macro">vec!</span>[<span class="ident">first_volume</span>];
363358
<span class="kw">loop</span> {
364-
<span class="attribute">#[<span class="ident">allow</span>(<span class="ident">deprecated</span>)]</span>
365-
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">name</span>: [<span class="ident">winnt::WCHAR</span>; <span class="ident">minwindef::MAX_PATH</span>] <span class="op">=</span> <span class="ident">mem::uninitialized</span>();
359+
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">name</span>: [<span class="ident">winnt::WCHAR</span>; <span class="ident">minwindef::MAX_PATH</span>] <span class="op">=</span> [<span class="number">0</span>; <span class="ident">minwindef::MAX_PATH</span>];
366360
<span class="kw">if</span> <span class="ident">winapi::um::fileapi::FindNextVolumeW</span>(
367361
<span class="ident">next_volume_handle</span>,
368362
<span class="ident">name</span>.<span class="ident">as_mut_ptr</span>(),

0 commit comments

Comments
 (0)