109 lines
11 KiB
Plaintext
109 lines
11 KiB
Plaintext
|
<!DOCTYPE html>
|
||
|
|
<html lang="en">
|
||
|
|
<head>
|
||
|
|
<meta charset="UTF-8">
|
||
|
|
<meta name="generator" content="TempleOS V5.03">
|
||
|
|
<meta name="viewport" content="width=device-width">
|
||
|
|
<link rel="stylesheet" href="/style/templeos.css">
|
||
|
|
<script src="/script/templeos.js"></script>
|
||
|
|
<style type="text/css">
|
||
|
|
.cF0{color:#000000;background-color:#ffffff;}
|
||
|
|
.cF1{color:#0000aa;background-color:#ffffff;}
|
||
|
|
.cF2{color:#00aa00;background-color:#ffffff;}
|
||
|
|
.cF3{color:#00aaaa;background-color:#ffffff;}
|
||
|
|
.cF4{color:#aa0000;background-color:#ffffff;}
|
||
|
|
.cF5{color:#aa00aa;background-color:#ffffff;}
|
||
|
|
.cF6{color:#aa5500;background-color:#ffffff;}
|
||
|
|
.cF7{color:#aaaaaa;background-color:#ffffff;}
|
||
|
|
.cF8{color:#555555;background-color:#ffffff;}
|
||
|
|
.cF9{color:#5555ff;background-color:#ffffff;}
|
||
|
|
.cFA{color:#55ff55;background-color:#ffffff;}
|
||
|
|
.cFB{color:#55ffff;background-color:#ffffff;}
|
||
|
|
.cFC{color:#ff5555;background-color:#ffffff;}
|
||
|
|
.cFD{color:#ff55ff;background-color:#ffffff;}
|
||
|
|
.cFE{color:#ffff55;background-color:#ffffff;}
|
||
|
|
.cFF{color:#ffffff;background-color:#ffffff;}
|
||
|
|
</style>
|
||
|
|
</head>
|
||
|
|
<body>
|
||
|
|
<pre id="content">
|
||
|
|
<a name="l1"></a><span class=cF0>#</span><span class=cF1>help_index</span><span class=cF0> </span><span class=cF6>"Cmd Line (Typically)"</span><span class=cF0>
|
||
|
|
<a name="l2"></a>
|
||
|
|
<a name="l3"></a></span><span class=cF9>CDirEntry</span><span class=cF0> </span><span class=cF5>MGFind</span><span class=cF0>(</span><span class=cF9>CDirEntry</span><span class=cF0> *needle_entry,</span><span class=cF9>CDirEntry</span><span class=cF0> *haystack_lst)
|
||
|
|
<a name="l4"></a>{
|
||
|
|
<a name="l5"></a> </span><span class=cF1>while</span><span class=cF0> (haystack_lst) </span><span class=cF7>{</span><span class=cF0>
|
||
|
|
<a name="l6"></a> </span><span class=cF1>if</span><span class=cF0> (!</span><span class=cF5>StrCmp</span><span class=cF7>(</span><span class=cF0>needle_entry->name,haystack_lst->name</span><span class=cF7>)</span><span class=cF0>)
|
||
|
|
<a name="l7"></a> </span><span class=cF1>return</span><span class=cF0> haystack_lst;
|
||
|
|
<a name="l8"></a> haystack_lst=haystack_lst->next;
|
||
|
|
<a name="l9"></a> </span><span class=cF7>}</span><span class=cF0>
|
||
|
|
<a name="l10"></a> </span><span class=cF1>return</span><span class=cF0> </span><span class=cF3>NULL</span><span class=cF0>;
|
||
|
|
<a name="l11"></a>}
|
||
|
|
<a name="l12"></a>
|
||
|
|
<a name="l13"></a></span><span class=cF1>U0</span><span class=cF0> </span><span class=cF5>Merge2</span><span class=cF0>(</span><span class=cF9>CDirEntry</span><span class=cF0> *tmpde1,</span><span class=cF9>CDirEntry</span><span class=cF0> *tmpde2,</span><span class=cF9>I64</span><span class=cF0> *_fuf_flags,</span><span class=cF9>I64</span><span class=cF0> *_df_flags)
|
||
|
|
<a name="l14"></a>{
|
||
|
|
<a name="l15"></a> </span><span class=cF9>CDirEntry</span><span class=cF0> *tmpde;
|
||
|
|
<a name="l16"></a> </span><span class=cF1>while</span><span class=cF0> (tmpde1 && !</span><span class=cF7>(</span><span class=cF0>*_df_flags & </span><span class=cF3>DF_ABORT_ALL_FILES</span><span class=cF7>)</span><span class=cF0>) </span><span class=cF7>{</span><span class=cF0>
|
||
|
|
<a name="l17"></a> tmpde=</span><span class=cF5>MGFind</span><span class=cF0>(tmpde1,tmpde2);
|
||
|
|
<a name="l18"></a> </span><span class=cF1>if</span><span class=cF0> (!tmpde)
|
||
|
|
<a name="l19"></a> </span><span class=cF6>"$BROWN$Does Not Exist:%s$FG$\n"</span><span class=cF0>,tmpde1->full_name;
|
||
|
|
<a name="l20"></a> </span><span class=cF1>else</span><span class=cF0> {
|
||
|
|
<a name="l21"></a> </span><span class=cF1>if</span><span class=cF0> (tmpde1->attr & </span><span class=cF3>RS_ATTR_DIR</span><span class=cF0>)
|
||
|
|
<a name="l22"></a> </span><span class=cF5>Merge2</span><span class=cF0>(tmpde1->sub,tmpde->sub,_fuf_flags,_df_flags);
|
||
|
|
<a name="l23"></a> </span><span class=cF1>else</span><span class=cF0> </span><span class=cF7>{</span><span class=cF0>
|
||
|
|
<a name="l24"></a> </span><span class=cF1>if</span><span class=cF0> (</span><span class=cF5>AbsI64</span><span class=cF7>(</span><span class=cF0>tmpde1->datetime-tmpde->datetime</span><span class=cF7>)</span><span class=cF0>></span><span class=cF3>CDATE_FREQ</span><span class=cF0>*2) {</span><span class=cF2>//slop</span><span class=cF0>
|
||
|
|
<a name="l25"></a> </span><span class=cF6>"%s"</span><span class=cF0>,tmpde1->full_name;
|
||
|
|
<a name="l26"></a> </span><span class=cF6>'\n'</span><span class=cF0>;
|
||
|
|
<a name="l27"></a> </span><span class=cF1>if</span><span class=cF0> (</span><span class=cF5>Bt</span><span class=cF7>(</span><span class=cF0>_fuf_flags,</span><span class=cF3>FUf_DIFF</span><span class=cF7>)</span><span class=cF0>) </span><span class=cF7>{</span><span class=cF0>
|
||
|
|
<a name="l28"></a> </span><span class=cF1>if</span><span class=cF0> (</span><span class=cF5>FilesFindMatch</span><span class=cF7>(</span><span class=cF0>tmpde1->full_name,</span><span class=cF3>FILEMASK_TXT</span><span class=cF7>)</span><span class=cF0>)
|
||
|
|
<a name="l29"></a> </span><span class=cF5>Diff</span><span class=cF0>(tmpde->full_name,tmpde1->full_name,_df_flags);
|
||
|
|
<a name="l30"></a> </span><span class=cF7>}</span><span class=cF0>
|
||
|
|
<a name="l31"></a> }
|
||
|
|
<a name="l32"></a> </span><span class=cF7>}</span><span class=cF0>
|
||
|
|
<a name="l33"></a> }
|
||
|
|
<a name="l34"></a> tmpde1=tmpde1->next;
|
||
|
|
<a name="l35"></a> </span><span class=cF7>}</span><span class=cF0>
|
||
|
|
<a name="l36"></a>}
|
||
|
|
<a name="l37"></a></span><span class=cF1>public</span><span class=cF0> </span><span class=cF1>U0</span><span class=cF0> </span><span class=cF5>Merge</span><span class=cF0>(</span><span class=cF1>U8</span><span class=cF0> *dst_files_find_mask=</span><span class=cF6>"/*"</span><span class=cF0>,</span><span class=cF1>U8</span><span class=cF0> *src_files_find_mask=</span><span class=cF6>"/*"</span><span class=cF0>,
|
||
|
|
<a name="l38"></a> </span><span class=cF1>U8</span><span class=cF0> *fu_flags=</span><span class=cF3>NULL</span><span class=cF0>)
|
||
|
|
<a name="l39"></a>{</span><span class=cF2>/*Merge text files from one list into another.</span><span class=cF0>
|
||
|
|
<a name="l40"></a></span><span class=cF2>Report files whos date/time is different.</span><span class=cF0>
|
||
|
|
<a name="l41"></a>
|
||
|
|
<a name="l42"></a></span><span class=cF2>"+d" will do </span><a href="/Wb/Adam/Opt/Utils/Diff.HC.HTML#l237"><span class=cF4>Diff</span></a><span class=cF2>() on files and prompt to</span><span class=cF0>
|
||
|
|
<a name="l43"></a></span><span class=cF2>merge changes from source files into</span><span class=cF0>
|
||
|
|
<a name="l44"></a></span><span class=cF2>destination files.</span><span class=cF0>
|
||
|
|
<a name="l45"></a></span><span class=cF2>*/</span><span class=cF0>
|
||
|
|
<a name="l46"></a> </span><span class=cF9>I64</span><span class=cF0> df_flags=0,fuf_flags=0;
|
||
|
|
<a name="l47"></a> </span><span class=cF9>CDirEntry</span><span class=cF0> *tmpde1=</span><span class=cF3>NULL</span><span class=cF0>,*tmpde2=</span><span class=cF3>NULL</span><span class=cF0>;
|
||
|
|
<a name="l48"></a> </span><span class=cF5>ScanFlags</span><span class=cF0>(&fuf_flags,</span><span class=cF5>Define</span><span class=cF7>(</span><span class=cF6>"ST_FILE_UTIL_FLAGS"</span><span class=cF7>)</span><span class=cF0>,</span><span class=cF6>"+r"</span><span class=cF0>);
|
||
|
|
<a name="l49"></a> </span><span class=cF5>ScanFlags</span><span class=cF0>(&fuf_flags,</span><span class=cF5>Define</span><span class=cF7>(</span><span class=cF6>"ST_FILE_UTIL_FLAGS"</span><span class=cF7>)</span><span class=cF0>,fu_flags);
|
||
|
|
<a name="l50"></a> </span><span class=cF1>if</span><span class=cF0> (fuf_flags&~</span><span class=cF7>(</span><span class=cF3>FUG_FILES_FIND</span><span class=cF0>|</span><span class=cF3>FUF_DIFF</span><span class=cF7>)</span><span class=cF0>)
|
||
|
|
<a name="l51"></a> </span><span class=cF5>throw</span><span class=cF0>(</span><span class=cF6>'FUF'</span><span class=cF0>);
|
||
|
|
<a name="l52"></a> </span><span class=cF5>PrintWarn</span><span class=cF0>(</span><span class=cF6>"This is based strictly on file dates.\n"</span><span class=cF0>);
|
||
|
|
<a name="l53"></a> tmpde1=</span><span class=cF5>FilesFind</span><span class=cF0>(src_files_find_mask,fuf_flags&</span><span class=cF3>FUG_FILES_FIND</span><span class=cF0>);
|
||
|
|
<a name="l54"></a> tmpde2=</span><span class=cF5>FilesFind</span><span class=cF0>(dst_files_find_mask,fuf_flags&</span><span class=cF3>FUG_FILES_FIND</span><span class=cF0>);
|
||
|
|
<a name="l55"></a> fuf_flags&=</span><span class=cF3>FUF_DIFF</span><span class=cF0>;
|
||
|
|
<a name="l56"></a> </span><span class=cF5>Merge2</span><span class=cF0>(tmpde1,tmpde2,&fuf_flags,&df_flags);
|
||
|
|
<a name="l57"></a> </span><span class=cF5>DirTreeDel</span><span class=cF0>(tmpde1);
|
||
|
|
<a name="l58"></a> </span><span class=cF5>DirTreeDel</span><span class=cF0>(tmpde2);
|
||
|
|
<a name="l59"></a>}
|
||
|
|
<a name="l60"></a>
|
||
|
|
<a name="l61"></a>#</span><span class=cF1>help_index</span><span class=cF0> </span><span class=cF6>"Utils;Cmd Line (Typically)"</span><span class=cF0>
|
||
|
|
<a name="l62"></a>
|
||
|
|
<a name="l63"></a></span><span class=cF1>public</span><span class=cF0> </span><span class=cF1>U0</span><span class=cF0> </span><span class=cF5>NewFiles</span><span class=cF0>(</span><span class=cF1>U8</span><span class=cF0> *files_find_mask=</span><span class=cF6>"/*"</span><span class=cF0>,</span><span class=cF9>CDate</span><span class=cF0> cdt=0,</span><span class=cF1>U8</span><span class=cF0> *fu_flags=</span><span class=cF3>NULL</span><span class=cF0>)
|
||
|
|
<a name="l64"></a>{</span><span class=cF2>//Report files newer than a certain date.</span><span class=cF0>
|
||
|
|
<a name="l65"></a> </span><span class=cF9>I64</span><span class=cF0> fuf_flags=0;
|
||
|
|
<a name="l66"></a> </span><span class=cF9>CDirEntry</span><span class=cF0> *tmpde,*tmpde1;
|
||
|
|
<a name="l67"></a> </span><span class=cF1>if</span><span class=cF0> (!cdt) cdt=</span><span class=cFB>sys_compile_time</span><span class=cF0>;
|
||
|
|
<a name="l68"></a> </span><span class=cF5>ScanFlags</span><span class=cF0>(&fuf_flags,</span><span class=cF5>Define</span><span class=cF7>(</span><span class=cF6>"ST_FILE_UTIL_FLAGS"</span><span class=cF7>)</span><span class=cF0>,</span><span class=cF6>"+r+F"</span><span class=cF0>);
|
||
|
|
<a name="l69"></a> </span><span class=cF5>ScanFlags</span><span class=cF0>(&fuf_flags,</span><span class=cF5>Define</span><span class=cF7>(</span><span class=cF6>"ST_FILE_UTIL_FLAGS"</span><span class=cF7>)</span><span class=cF0>,fu_flags);
|
||
|
|
<a name="l70"></a> tmpde=tmpde1=</span><span class=cF5>FilesFind</span><span class=cF0>(files_find_mask,fuf_flags);
|
||
|
|
<a name="l71"></a> </span><span class=cF1>while</span><span class=cF0> (tmpde) </span><span class=cF7>{</span><span class=cF0>
|
||
|
|
<a name="l72"></a> </span><span class=cF1>if</span><span class=cF0> (tmpde->datetime>cdt)
|
||
|
|
<a name="l73"></a> </span><span class=cF6>"%s\n"</span><span class=cF0>,tmpde->full_name;
|
||
|
|
<a name="l74"></a> tmpde=tmpde->next;
|
||
|
|
<a name="l75"></a> </span><span class=cF7>}</span><span class=cF0>
|
||
|
|
<a name="l76"></a> </span><span class=cF5>DirTreeDel</span><span class=cF0>(tmpde1);
|
||
|
|
<a name="l77"></a>}
|
||
|
|
</span></pre></body>
|
||
|
|
</html>
|