tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2025-03-28 19:05:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Change colors & text of Merge2, DiffSel, and PopUpDiffMenu.

Browse source
This commit is contained in:
TomAwezome 2021-08-13 17:04:00 -04:00
parent b804e25f45
commit 99094f1e31
18 changed files with 7004 additions and 6992 deletions

BIN
ZealOS-2021-08-13-13_24_54.iso → ZealOS-2021-08-13-17_00_37.iso
View file

Binary file not shown.

2
docs/Demo/AcctExample/HomeSys.CC.html
View file

@ -36,7 +36,7 @@ body {background-color:#fef1f0;}
<a name="l9"></a> </span><span class=cF5>WinToTop</span><span class=cF0>;
<a name="l10"></a> </span><span class=cF5>WinZBufUpdate</span><span class=cF0>;
<a name="l11"></a> </span><span class=cF5>Dir</span><span class=cF0>;
<a name="l12"></a> </span><span class=cF6>&quot;95,070LOC:&quot;</span><span class=cF0>;
<a name="l12"></a> </span><span class=cF6>&quot;95,072LOC:&quot;</span><span class=cF0>;
<a name="l13"></a> </span><span class=cF5>CPURep</span><span class=cF0>;
<a name="l14"></a>}
<a name="l15"></a>

2
docs/Demo/AcctExample/PersonalNotes.DD.html
View file

@ -160,7 +160,7 @@ body {background-color:#fef1f0;}
<a name="l133"></a>
<a name="l134"></a>* Unhandled exception messages from MP's get overwritten by WinMgr.
<a name="l135"></a>
<a name="l136"></a>* </span><a href="https://zeal-operating-system.github.io/ZealOS/System/Utils/Diff.CC.html#l259"><span class=cF4>Diff</span></a><span class=cF0>(&quot;C:/Misc/Bible.TXT&quot;,&quot;D:/Misc/Bible.TXT&quot;); Takes too long.
<a name="l136"></a>* </span><a href="https://zeal-operating-system.github.io/ZealOS/System/Utils/Diff.CC.html#l260"><span class=cF4>Diff</span></a><span class=cF0>(&quot;C:/Misc/Bible.TXT&quot;,&quot;D:/Misc/Bible.TXT&quot;); Takes too long.
<a name="l137"></a>
<a name="l138"></a>* Finish Pilgrim game.
<a name="l139"></a>

1630
docs/Doc/ChangeLog.DD.html
View file

File diff suppressed because it is too large Load diff

2
docs/Doc/Charter.DD.html
View file

@ -38,7 +38,7 @@ body {background-color:#fef1f0;}
<a name="l11"></a>* Low line count and code complexity is the highest good, so it is easy to learn the whole thing. Users should see the light
<a name="l12"></a>at the end of the tunnel. One file system, for example, is better than many file systems.
<a name="l13"></a>
<a name="l14"></a>* There is a limit of 100,000 lines of code for all time, not including applications and demos. Currently, there are 95,070
<a name="l14"></a>* There is a limit of 100,000 lines of code for all time, not including applications and demos. Currently, there are 95,072
<a name="l15"></a>lines of code. </span><span class=cF4>3rd party libraries are banned</span><span class=cF0> because they circumvent the intent of this limit. The vision is a Commodore 64
<a name="l16"></a>ROM -- a fixed core API that is the only dependency of applications. Dependency on components and libraries creates a hell
<a name="l17"></a>that is no longer blissful.

2
docs/Doc/Features.DD.html
View file

@ -74,7 +74,7 @@ body {background-color:#fef1f0;}
<a name="l46"></a>
<a name="l47"></a>* File Manager, </span><span class=cF2>&lt;CTRL-d&gt;</span><span class=cF0>.
<a name="l48"></a>
<a name="l49"></a>* Code </span><a href="https://zeal-operating-system.github.io/ZealOS/System/Utils/Profiler.CC.html#l30"><span class=cF4>profiler</span></a><span class=cF0>, </span><a href="https://zeal-operating-system.github.io/ZealOS/System/Utils/Merge.CC.html#l44"><span class=cF4>merge</span></a><span class=cF0>, </span><a href="https://zeal-operating-system.github.io/ZealOS/System/Utils/Diff.CC.html#l259"><span class=cF4>diff</span></a><span class=cF0> utils.
<a name="l49"></a>* Code </span><a href="https://zeal-operating-system.github.io/ZealOS/System/Utils/Profiler.CC.html#l30"><span class=cF4>profiler</span></a><span class=cF0>, </span><a href="https://zeal-operating-system.github.io/ZealOS/System/Utils/Merge.CC.html#l45"><span class=cF4>merge</span></a><span class=cF0>, </span><a href="https://zeal-operating-system.github.io/ZealOS/System/Utils/Diff.CC.html#l260"><span class=cF4>diff</span></a><span class=cF0> utils.
<a name="l50"></a>
<a name="l51"></a>* </span><span class=cF2>PC Speaker</span><span class=cF0> support with many hymns.
<a name="l52"></a>

8
docs/Doc/HelpIndex.DD.html
View file

@ -38,15 +38,15 @@ body {background-color:#fef1f0;}
<a name="l11"></a></span><a href="https://zeal-operating-system.github.io/ZealOS/Doc/Charter.DD.html#l1"><span class=cF4>Charter</span></a><span class=cF0> </span><a href="https://zeal-operating-system.github.io/ZealOS/Doc/Strategy.DD.html#l1"><span class=cF4>Strategic Decisions</span></a><span class=cF4>
<a name="l12"></a></span><a href="https://zeal-operating-system.github.io/ZealOS/Doc/FAQ.DD.html#l1"><span class=cF4>F.A.Q.</span></a><span class=cF0> </span><a href="https://zeal-operating-system.github.io/ZealOS/Doc/Glossary.DD.html#l1"><span class=cF4>Glossary</span></a><span class=cF4>
<a name="l13"></a></span><a href="https://zeal-operating-system.github.io/ZealOS/Doc/CosmiC.DD.html#l1"><span class=cF4>CosmiC</span></a><span class=cF0> </span><a href="https://zeal-operating-system.github.io/ZealOS/Doc/CompilerOverview.DD.html#l1"><span class=cF4>Compiler Index</span></a><span class=cF4>
<a name="l14"></a></span><a href="https://zeal-operating-system.github.io/ZealOS/Doc/WhyNotMore.DD.html#l1"><span class=cF4>Why Not More?</span></a><span class=cF0>
<a name="l15"></a> </span><span class=cF5>
<a name="l16"></a><u>+] User Help
<a name="l14"></a></span><a href="https://zeal-operating-system.github.io/ZealOS/Doc/WhyNotMore.DD.html#l1"><span class=cF4>Why Not More?</span></a><span class=cF0> </span><a href="https://zeal-operating-system.github.io/ZealOS/Doc/ChangeLog.DD.html#l1"><span class=cF4>ChangeLog</span></a><span class=cF0>
<a name="l15"></a></span><span class=cF5>
<a name="l16"></a>+] User Help
<a name="l17"></a>+] Admin Help
<a name="l18"></a>+] Programmer help
<a name="l19"></a>+] System Programmer Help</span><span class=cF0>
<a name="l20"></a>
<a name="l21"></a>
<a name="l22"></a></u></span><span class=cF5> Index</span><span class=cF4>
<a name="l22"></a></span><span class=cF5> Index</span><span class=cF4>
<a name="l23"></a><u>AutoComplete
<a name="l24"></a>Bit
<a name="l25"></a>Boot

2
docs/Doc/Tips.DD.html
View file

@ -90,7 +90,7 @@ body {background-color:#fef1f0;}
<a name="l63"></a>disabling </span><span class=cF2>AutoComplete</span><span class=cF0>; Specify smaller stack sizes when doing </span><a href="https://zeal-operating-system.github.io/ZealOS/Kernel/KTask.CC.html#l264"><span class=cF4>Spawn</span></a><span class=cF0>(), change </span><a href="https://zeal-operating-system.github.io/ZealOS/Kernel/KernelA.HH.html#l3596"><span class=cF4>MEM_DEFAULT_STACK</span></a><span class=cF0>, and using </span><a href="https://zeal-operating-system.github.io/ZealOS/System/DolDoc/DocRecalcLib.CC.html#l202"><span class=cF4>DocMax</span></a><span class=cF0>() to reduce
<a name="l64"></a>the cmd line buffer size.
<a name="l65"></a>
<a name="l66"></a>* </span><a href="https://zeal-operating-system.github.io/ZealOS/System/Utils/Merge.CC.html#l44"><span class=cF4>Merge</span></a><span class=cF0>() can be used to see what's changed. The </span><span class=cF2>+d</span><span class=cF0> flag will show differences of files which have changed and allow you to
<a name="l66"></a>* </span><a href="https://zeal-operating-system.github.io/ZealOS/System/Utils/Merge.CC.html#l45"><span class=cF4>Merge</span></a><span class=cF0>() can be used to see what's changed. The </span><span class=cF2>+d</span><span class=cF0> flag will show differences of files which have changed and allow you to
<a name="l67"></a>merge code. (The </span><span class=cF2>+r</span><span class=cF0> flag will recurse.)
<a name="l68"></a>
<a name="l69"></a>* There is a utility </span><a href="https://zeal-operating-system.github.io/ZealOS/System/Utils/LinkCheck.CC.html#l58"><span class=cF4>LinkCheck</span></a><span class=cF0>() which will check for broken links in documentation.

2
docs/Doc/Welcome.DD.html
View file

@ -37,7 +37,7 @@ body {background-color:#fef1f0;}
<a name="l10"></a>
<a name="l11"></a>Simplicity is a goal to </span><a href="https://zeal-operating-system.github.io/ZealOS/Doc/Strategy.DD.html#l1"><span class=cF4>keep the line count down</span></a><span class=cF0>, so it's easy to tinker with. As it turns-out, simplicity makes it faster in
<a name="l12"></a>some ways, too. It never switches privilege levels, never changes address maps, tends to load whole contiguous files and
<a name="l13"></a>other, similar things which boost speed. It's only 95,070 lines of code including the kernel, the 64-bit compiler, the
<a name="l13"></a>other, similar things which boost speed. It's only 95,072 lines of code including the kernel, the 64-bit compiler, the
<a name="l14"></a>graphics library and all the tools. More importantly, it's designed to keep the user's line count down -- you can do a </span><span class=cF4>
<a name="l15"></a></span><a href="https://zeal-operating-system.github.io/ZealOS/Doc/HelloWorld.DD.html#l1"><span class=cF4>Hello World</span></a><span class=cF0> application in one line of code and can put graphics on the screen with a three line program!
<a name="l16"></a>

2
docs/Misc/OSInstall.CC.html
View file

@ -75,7 +75,7 @@ body {background-color:#fef1f0;}
<a name="l48"></a>}
<a name="l49"></a>
<a name="l50"></a></span><span class=cF1>U0</span><span class=cF0> OSFilesMerge(</span><span class=cF1>U8</span><span class=cF0> *dst_files_find_mask=</span><span class=cF6>&quot;/*&quot;</span><span class=cF0>, </span><span class=cF1>U8</span><span class=cF0> *src_files_find_mask=</span><span class=cF6>&quot;/*&quot;</span><span class=cF0>, </span><span class=cF1>U8</span><span class=cF0> *fu_flags=</span><span class=cF3>NULL</span><span class=cF0>)
<a name="l51"></a>{ </span><span class=cF2>// See </span><a href="https://zeal-operating-system.github.io/ZealOS/System/Utils/Merge.CC.html#l44"><span class=cF4>Merge</span></a><span class=cF2>.</span><span class=cF0>
<a name="l51"></a>{ </span><span class=cF2>// See </span><a href="https://zeal-operating-system.github.io/ZealOS/System/Utils/Merge.CC.html#l45"><span class=cF4>Merge</span></a><span class=cF2>.</span><span class=cF0>
<a name="l52"></a> </span><span class=cF9>I64</span><span class=cF0> df_flags = </span><span class=cFE>0</span><span class=cF0>, fuf_flags = </span><span class=cFE>0</span><span class=cF0>;
<a name="l53"></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="l54"></a>

661
docs/System/Utils/Diff.CC.html
View file

@ -38,335 +38,336 @@ body {background-color:#fef1f0;}
<a name="l11"></a> </span><span class=cF9>I64</span><span class=cF0> i;
<a name="l12"></a> </span><span class=cF9>CDoc</span><span class=cF0> *doc = </span><span class=cF5>DocNew</span><span class=cF0>;
<a name="l13"></a>
<a name="l14"></a> </span><span class=cF5>DocPrint</span><span class=cF0>(doc, </span><span class=cF6>&quot;$CM+LX,2,4$$FG$$BT,\&quot;USE FILE1\&quot;,LE=DS_USE_FILE1$&quot;</span><span class=cF0>
<a name="l15"></a> </span><span class=cF6>&quot;$CM+LX,24,0$$CYAN$$BT,\&quot;USE FILE2\&quot;,LE=DS_USE_FILE2$&quot;</span><span class=cF0>
<a name="l16"></a> </span><span class=cF6>&quot;$CM+LX,2,4$$FG$$BT,\&quot;REMAINDER ALL FILE1\&quot;,LE=DS_REMAINDER_1$&quot;</span><span class=cF0>
<a name="l17"></a> </span><span class=cF6>&quot;$CM+LX,24,0$$CYAN$$BT,\&quot;REMAINDER ALL FILE2\&quot;,LE=DS_REMAINDER_2$&quot;</span><span class=cF0>
<a name="l18"></a> </span><span class=cF6>&quot;$CM+LX,2,4$$FG$$BT,\&quot;ABORT FILE\&quot;,LE=DS_ABORT_FILE$&quot;</span><span class=cF0>
<a name="l19"></a> </span><span class=cF6>&quot;$CM+LX,24,0$$FG$$BT,\&quot;ABORT ALL FILES\&quot;,LE=DOCM_CANCEL$\n&quot;</span><span class=cF0>);
<a name="l20"></a> i = </span><span class=cF5>PopUpMenu</span><span class=cF0>(doc);
<a name="l21"></a> </span><span class=cF5>DocDel</span><span class=cF0>(doc);
<a name="l22"></a>
<a name="l23"></a> </span><span class=cF1>return</span><span class=cF0> i;
<a name="l24"></a>}
<a name="l25"></a>
<a name="l26"></a></span><span class=cF9>I64</span><span class=cF0> </span><span class=cF5>DiffEntriesCompare</span><span class=cF0>(</span><span class=cF9>CDocEntry</span><span class=cF0> *doc_e1, </span><span class=cF9>CDocEntry</span><span class=cF0> *doc_e2)
<a name="l27"></a>{
<a name="l28"></a> </span><span class=cF1>return</span><span class=cF0> </span><span class=cF5>StrCompare</span><span class=cF0>(doc_e1-&gt;tag, doc_e2-&gt;tag);
<a name="l29"></a>}
<a name="l30"></a>
<a name="l31"></a>#</span><span class=cF1>define</span><span class=cF0> </span><span class=cF3>DF_MODIFIED</span><span class=cF0> </span><span class=cFE>0x01</span><span class=cF0>
<a name="l32"></a>#</span><span class=cF1>define</span><span class=cF0> </span><span class=cF3>DF_DONT_MODIFIED</span><span class=cF0> </span><span class=cFE>0x02</span><span class=cF0>
<a name="l33"></a>#</span><span class=cF1>define</span><span class=cF0> </span><span class=cF3>DF_REMAINDER_ALL_FILE1</span><span class=cF0> </span><span class=cFE>0x04</span><span class=cF0>
<a name="l34"></a>#</span><span class=cF1>define</span><span class=cF0> </span><span class=cF3>DF_REMAINDER_ALL_FILE2</span><span class=cF0> </span><span class=cFE>0x08</span><span class=cF0>
<a name="l35"></a>#</span><span class=cF1>define</span><span class=cF0> </span><span class=cF3>DF_ABORT_FILE</span><span class=cF0> </span><span class=cFE>0x10</span><span class=cF0>
<a name="l36"></a>#</span><span class=cF1>define</span><span class=cF0> </span><span class=cF3>DF_ABORT_ALL_FILES</span><span class=cF0> </span><span class=cFE>0x20</span><span class=cF0>
<a name="l37"></a>#</span><span class=cF1>define</span><span class=cF0> </span><span class=cF3>DF_NO_MORE_PROMPTS_THIS_FILE</span><span class=cF0> </span><span class=cFE>0x40</span><span class=cF0>
<a name="l38"></a>
<a name="l39"></a></span><span class=cF1>U0</span><span class=cF0> </span><span class=cF5>DiffSel</span><span class=cF0>(</span><span class=cF9>CDoc</span><span class=cF0> *doc, </span><span class=cF9>I64</span><span class=cF0> *_df_flags, </span><span class=cF9>I64</span><span class=cF0> j1_lo, </span><span class=cF9>I64</span><span class=cF0> j1_hi, </span><span class=cF9>I64</span><span class=cF0> j2_lo, </span><span class=cF9>I64</span><span class=cF0> j2_hi, </span><span class=cF9>I64</span><span class=cF0> count1, </span><span class=cF9>I64</span><span class=cF0> count2,
<a name="l40"></a> </span><span class=cF9>CDocEntry</span><span class=cF0> **doc_unsorted1, </span><span class=cF9>CDocEntry</span><span class=cF0> **doc_unsorted2)
<a name="l41"></a>{
<a name="l42"></a> </span><span class=cF9>CDocEntry</span><span class=cF0> *doc_e, *doc_e1, *doc_e2;
<a name="l43"></a> </span><span class=cF1>Bool</span><span class=cF0> use_file1;
<a name="l44"></a> </span><span class=cF9>I64</span><span class=cF0> i, old_flags;
<a name="l45"></a> </span><span class=cF9>CDoc</span><span class=cF0> *cur_l;
<a name="l46"></a>
<a name="l47"></a> </span><span class=cF1>if</span><span class=cF0> (!</span><span class=cF7>(</span><span class=cF0>*_df_flags &amp; (</span><span class=cF3>DF_ABORT_FILE</span><span class=cF0> | </span><span class=cF3>DF_ABORT_ALL_FILES</span><span class=cF0>)</span><span class=cF7>)</span><span class=cF0>)
<a name="l48"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l49"></a> </span><span class=cF6>&quot;$RED$&quot;</span><span class=cF0>;
<a name="l50"></a> </span><span class=cF1>if</span><span class=cF0> (</span><span class=cFE>0</span><span class=cF0> &lt;= j1_lo &lt; count1)
<a name="l51"></a> </span><span class=cF6>&quot;%d,&quot;</span><span class=cF0>, doc_unsorted1[j1_lo]-&gt;y + </span><span class=cFE>1</span><span class=cF0>;
<a name="l52"></a> </span><span class=cF1>else</span><span class=cF0> </span><span class=cF1>if</span><span class=cF0> (</span><span class=cFE>0</span><span class=cF0> &lt;= j1_hi - </span><span class=cFE>1</span><span class=cF0> &lt; count1)
<a name="l53"></a> </span><span class=cF6>&quot;%d,&quot;</span><span class=cF0>, doc_unsorted1[j1_hi - </span><span class=cFE>1</span><span class=cF0>]-&gt;y + </span><span class=cFE>1</span><span class=cF0>;
<a name="l54"></a> </span><span class=cF1>else</span><span class=cF0>
<a name="l55"></a> </span><span class=cF6>&quot;***,&quot;</span><span class=cF0>;
<a name="l56"></a> </span><span class=cF1>if</span><span class=cF0> (</span><span class=cFE>0</span><span class=cF0> &lt;= j2_lo &lt; count2)
<a name="l57"></a> </span><span class=cF6>&quot;%d&quot;</span><span class=cF0>, doc_unsorted2[j2_lo]-&gt;y + </span><span class=cFE>1</span><span class=cF0>;
<a name="l58"></a> </span><span class=cF1>else</span><span class=cF0> </span><span class=cF1>if</span><span class=cF0> (</span><span class=cFE>0</span><span class=cF0> &lt;= j2_hi - </span><span class=cFE>1</span><span class=cF0> &lt; count2)
<a name="l59"></a> </span><span class=cF6>&quot;%d&quot;</span><span class=cF0>, doc_unsorted2[j2_hi - </span><span class=cFE>1</span><span class=cF0>]-&gt;y + </span><span class=cFE>1</span><span class=cF0>;
<a name="l60"></a> </span><span class=cF1>else</span><span class=cF0>
<a name="l61"></a> </span><span class=cF6>&quot;***&quot;</span><span class=cF0>;
<a name="l62"></a> </span><span class=cF6>&quot;---------------------$FG$\n&quot;</span><span class=cF0>;
<a name="l63"></a> </span><span class=cF1>if</span><span class=cF0> (j1_lo &lt;= </span><span class=cFE>0</span><span class=cF0>)
<a name="l64"></a> i = </span><span class=cFE>0</span><span class=cF0>;
<a name="l65"></a> </span><span class=cF1>else</span><span class=cF0>
<a name="l66"></a> i = j1_lo - </span><span class=cFE>1</span><span class=cF0>;
<a name="l67"></a> </span><span class=cF1>while</span><span class=cF0> (i &lt; j1_hi)
<a name="l68"></a> {
<a name="l69"></a> </span><span class=cF1>if</span><span class=cF0> (cur_l = </span><span class=cF5>DocPut</span><span class=cF0>)
<a name="l70"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l71"></a> old_flags = cur_l-&gt;flags &amp; </span><span class=cF3>DOCF_PLAIN_TEXT</span><span class=cF0>;
<a name="l72"></a> cur_l-&gt;flags |= </span><span class=cF3>DOCF_PLAIN_TEXT</span><span class=cF0>;
<a name="l73"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l74"></a> </span><span class=cF6>&quot;%s&quot;</span><span class=cF0>, doc_unsorted1[i++]-&gt;tag;
<a name="l75"></a> </span><span class=cF1>if</span><span class=cF0> (cur_l)
<a name="l76"></a> cur_l-&gt;flags = cur_l-&gt;flags &amp; ~</span><span class=cF3>DOCF_PLAIN_TEXT</span><span class=cF0> | old_flags;
<a name="l77"></a> </span><span class=cF6>'\n'</span><span class=cF0>;
<a name="l78"></a> }
<a name="l79"></a> </span><span class=cF6>&quot;$CYAN$&quot;</span><span class=cF0>;
<a name="l80"></a> </span><span class=cF1>if</span><span class=cF0> (j2_lo &lt;= </span><span class=cFE>0</span><span class=cF0>)
<a name="l81"></a> i = </span><span class=cFE>0</span><span class=cF0>;
<a name="l82"></a> </span><span class=cF1>else</span><span class=cF0>
<a name="l83"></a> i = j2_lo - </span><span class=cFE>1</span><span class=cF0>;
<a name="l84"></a> </span><span class=cF1>while</span><span class=cF0> (i &lt; j2_hi)
<a name="l85"></a> {
<a name="l86"></a> </span><span class=cF1>if</span><span class=cF0> (cur_l = </span><span class=cF5>DocPut</span><span class=cF0>)
<a name="l87"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l88"></a> old_flags = cur_l-&gt;flags &amp; </span><span class=cF3>DOCF_PLAIN_TEXT</span><span class=cF0>;
<a name="l89"></a> cur_l-&gt;flags |= </span><span class=cF3>DOCF_PLAIN_TEXT</span><span class=cF0>;
<a name="l90"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l91"></a> </span><span class=cF6>&quot;%s&quot;</span><span class=cF0>, doc_unsorted2[i++]-&gt;tag;
<a name="l92"></a> </span><span class=cF1>if</span><span class=cF0> (cur_l)
<a name="l93"></a> cur_l-&gt;flags = cur_l-&gt;flags &amp; ~</span><span class=cF3>DOCF_PLAIN_TEXT</span><span class=cF0> | old_flags;
<a name="l94"></a> </span><span class=cF6>'\n'</span><span class=cF0>;
<a name="l95"></a> }
<a name="l96"></a> </span><span class=cF6>&quot;$FG$&quot;</span><span class=cF0>;
<a name="l97"></a>
<a name="l98"></a> use_file1 = </span><span class=cF3>TRUE</span><span class=cF0>;
<a name="l99"></a> </span><span class=cF1>if</span><span class=cF0> (!</span><span class=cF7>(</span><span class=cF0>*_df_flags &amp; </span><span class=cF3>DF_NO_MORE_PROMPTS_THIS_FILE</span><span class=cF7>)</span><span class=cF0>)
<a name="l100"></a> {
<a name="l101"></a> </span><span class=cF1>switch</span><span class=cF0> (</span><span class=cF5>PopUpDiffMenu</span><span class=cF0>)
<a name="l102"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l103"></a> </span><span class=cF1>case</span><span class=cF0> </span><span class=cF3>DS_USE_FILE1</span><span class=cF0>:
<a name="l104"></a> </span><span class=cF1>break</span><span class=cF0>;
<a name="l105"></a>
<a name="l106"></a> </span><span class=cF1>case</span><span class=cF0> </span><span class=cF3>DS_USE_FILE2</span><span class=cF0>:
<a name="l107"></a> use_file1 = </span><span class=cF3>FALSE</span><span class=cF0>;
<a name="l108"></a> </span><span class=cF1>break</span><span class=cF0>;
<a name="l109"></a>
<a name="l110"></a> </span><span class=cF1>case</span><span class=cF0> </span><span class=cF3>DS_REMAINDER_1</span><span class=cF0>:
<a name="l111"></a> *_df_flags = *_df_flags &amp; ~</span><span class=cF3>DF_REMAINDER_ALL_FILE2</span><span class=cF0> | </span><span class=cF3>DF_REMAINDER_ALL_FILE1</span><span class=cF0> | </span><span class=cF3>DF_NO_MORE_PROMPTS_THIS_FILE</span><span class=cF0>;
<a name="l112"></a> </span><span class=cF1>break</span><span class=cF0>;
<a name="l113"></a>
<a name="l114"></a> </span><span class=cF1>case</span><span class=cF0> </span><span class=cF3>DS_REMAINDER_2</span><span class=cF0>:
<a name="l115"></a> *_df_flags = *_df_flags &amp; ~</span><span class=cF3>DF_REMAINDER_ALL_FILE1</span><span class=cF0> | </span><span class=cF3>DF_REMAINDER_ALL_FILE2</span><span class=cF0> | </span><span class=cF3>DF_NO_MORE_PROMPTS_THIS_FILE</span><span class=cF0>;
<a name="l116"></a> </span><span class=cF1>break</span><span class=cF0>;
<a name="l117"></a>
<a name="l118"></a> </span><span class=cF1>case</span><span class=cF0> </span><span class=cF3>DS_ABORT_FILE</span><span class=cF0>:
<a name="l119"></a> *_df_flags |= </span><span class=cF3>DF_DONT_MODIFIED</span><span class=cF0> | </span><span class=cF3>DF_ABORT_FILE</span><span class=cF0> | </span><span class=cF3>DF_NO_MORE_PROMPTS_THIS_FILE</span><span class=cF0>;
<a name="l120"></a> </span><span class=cF1>break</span><span class=cF0>;
<a name="l121"></a>
<a name="l122"></a> </span><span class=cF1>default</span><span class=cF0>:
<a name="l123"></a> *_df_flags |= </span><span class=cF3>DF_DONT_MODIFIED</span><span class=cF0> | </span><span class=cF3>DF_ABORT_ALL_FILES</span><span class=cF0> | </span><span class=cF3>DF_NO_MORE_PROMPTS_THIS_FILE</span><span class=cF0>;
<a name="l124"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l125"></a> }
<a name="l126"></a> </span><span class=cF1>if</span><span class=cF0> (*_df_flags &amp; </span><span class=cF3>DF_REMAINDER_ALL_FILE2</span><span class=cF0> &amp;&amp; !</span><span class=cF7>(</span><span class=cF0>*_df_flags &amp; (</span><span class=cF3>DF_DONT_MODIFIED</span><span class=cF0> | </span><span class=cF3>DF_REMAINDER_ALL_FILE1</span><span class=cF0>)</span><span class=cF7>)</span><span class=cF0>)
<a name="l127"></a> use_file1 = </span><span class=cF3>FALSE</span><span class=cF0>;
<a name="l128"></a> </span><span class=cF1>if</span><span class=cF0> (!use_file1)
<a name="l129"></a> {
<a name="l130"></a> *_df_flags |= </span><span class=cF3>DF_MODIFIED</span><span class=cF0>;
<a name="l131"></a> doc_e1 = doc_unsorted1[j1_lo]-&gt;last;
<a name="l132"></a> </span><span class=cF1>if</span><span class=cF0> (j1_lo &lt; j1_hi)
<a name="l133"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l134"></a> doc_e = doc_unsorted1[j1_lo];
<a name="l135"></a> </span><span class=cF1>while</span><span class=cF0> (doc_e != doc_unsorted1[j1_hi])
<a name="l136"></a> {
<a name="l137"></a> doc_e2 = doc_e-&gt;next;
<a name="l138"></a> </span><span class=cF5>DocEntryDel</span><span class=cF0>(doc, doc_e);
<a name="l139"></a> doc_e = doc_e2;
<a name="l140"></a> }
<a name="l141"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l142"></a> </span><span class=cF1>if</span><span class=cF0> (j2_lo &lt; j2_hi)
<a name="l143"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l144"></a> doc_e = doc_unsorted2[j2_lo];
<a name="l145"></a> </span><span class=cF1>while</span><span class=cF0> (doc_e != doc_unsorted2[j2_hi])
<a name="l146"></a> {
<a name="l147"></a> doc_e2 = </span><span class=cF5>DocEntryCopy</span><span class=cF0>(doc, doc_e);
<a name="l148"></a> </span><span class=cF5>QueueInsert</span><span class=cF0>(doc_e2, doc_e1);
<a name="l149"></a> doc_e1 = doc_e2;
<a name="l150"></a> doc_e = doc_e-&gt;next;
<a name="l151"></a> }
<a name="l152"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l153"></a> }
<a name="l154"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l155"></a>}
<a name="l156"></a>
<a name="l157"></a></span><span class=cF1>Bool</span><span class=cF0> </span><span class=cF5>DiffSub</span><span class=cF0>(</span><span class=cF9>CDoc</span><span class=cF0> *doc, </span><span class=cF9>I64</span><span class=cF0> *_df_flags, </span><span class=cF9>I64</span><span class=cF0> j1_lo, </span><span class=cF9>I64</span><span class=cF0> j1_hi, </span><span class=cF9>I64</span><span class=cF0> j2_lo, </span><span class=cF9>I64</span><span class=cF0> j2_hi, </span><span class=cF9>I64</span><span class=cF0> count1, </span><span class=cF9>I64</span><span class=cF0> count2,
<a name="l158"></a> </span><span class=cF9>CDocEntry</span><span class=cF0> **doc_sorted1, </span><span class=cF9>CDocEntry</span><span class=cF0> **doc_sorted2, </span><span class=cF9>CDocEntry</span><span class=cF0> **doc_unsorted1, </span><span class=cF9>CDocEntry</span><span class=cF0> **doc_unsorted2)
<a name="l159"></a>{
<a name="l160"></a> </span><span class=cF9>I64</span><span class=cF0> i, i1 = </span><span class=cFE>0</span><span class=cF0>, i2 = </span><span class=cFE>0</span><span class=cF0>, i2b, j1, j2, n, best_j1, best_j2, best_score = </span><span class=cFE>0</span><span class=cF0>, score;
<a name="l161"></a> </span><span class=cF1>Bool</span><span class=cF0> res = </span><span class=cF3>FALSE</span><span class=cF0>;
<a name="l162"></a>
<a name="l163"></a> </span><span class=cF1>if</span><span class=cF0> (j1_lo &gt;= j1_hi || j2_lo &gt;= j2_hi)
<a name="l164"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l165"></a> </span><span class=cF1>if</span><span class=cF0> (j1_lo &lt; j1_hi || j2_lo &lt; j2_hi)
<a name="l166"></a> {
<a name="l167"></a> </span><span class=cF5>DiffSel</span><span class=cF0>(doc, _df_flags, j1_lo, j1_hi, j2_lo, j2_hi, count1, count2, doc_unsorted1, doc_unsorted2);
<a name="l168"></a> </span><span class=cF1>return</span><span class=cF0> </span><span class=cF3>TRUE</span><span class=cF0>;
<a name="l169"></a> }
<a name="l170"></a> </span><span class=cF1>else</span><span class=cF0>
<a name="l171"></a> </span><span class=cF1>return</span><span class=cF0> </span><span class=cF3>FALSE</span><span class=cF0>;
<a name="l172"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l173"></a>
<a name="l174"></a> </span><span class=cF2>//Locate longest matching str in intervals</span><span class=cF0>
<a name="l175"></a> </span><span class=cF1>while</span><span class=cF0> (i1 &lt; count1 &amp;&amp; i2 &lt; count2)
<a name="l176"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l177"></a> </span><span class=cF1>if</span><span class=cF0> (!</span><span class=cF7>(</span><span class=cF0>j1_lo &lt;= doc_sorted1[i1]-&gt;user_data &lt; j1_hi</span><span class=cF7>)</span><span class=cF0>) </span><span class=cF2>//user_data is the new y</span><span class=cF0>
<a name="l178"></a> i1++;
<a name="l179"></a> </span><span class=cF1>else</span><span class=cF0> </span><span class=cF1>if</span><span class=cF0> (!</span><span class=cF7>(</span><span class=cF0>j2_lo &lt;= doc_sorted2[i2]-&gt;user_data &lt; j2_hi</span><span class=cF7>)</span><span class=cF0>) </span><span class=cF2>//user_data is new y</span><span class=cF0>
<a name="l180"></a> i2++;
<a name="l181"></a> </span><span class=cF1>else</span><span class=cF0>
<a name="l182"></a> {
<a name="l183"></a> i = </span><span class=cF5>StrCompare</span><span class=cF0>(doc_sorted1[i1]-&gt;tag, doc_sorted2[i2]-&gt;tag);
<a name="l184"></a> </span><span class=cF1>if</span><span class=cF0> (i &gt; </span><span class=cFE>0</span><span class=cF0>)
<a name="l185"></a> i2++;
<a name="l186"></a> </span><span class=cF1>else</span><span class=cF0> </span><span class=cF1>if</span><span class=cF0> (i &lt; </span><span class=cFE>0</span><span class=cF0>)
<a name="l187"></a> i1++;
<a name="l188"></a> </span><span class=cF1>else</span><span class=cF0>
<a name="l189"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l190"></a> i2b = i2;
<a name="l191"></a> </span><span class=cF1>while</span><span class=cF0> (!</span><span class=cF5>StrCompare</span><span class=cF7>(</span><span class=cF0>doc_sorted1[i1]-&gt;tag, doc_sorted2[i2]-&gt;tag</span><span class=cF7>)</span><span class=cF0>)
<a name="l192"></a> {
<a name="l193"></a> </span><span class=cF1>if</span><span class=cF0> (j2_lo &lt;= doc_sorted2[i2]-&gt;user_data &lt; j2_hi)
<a name="l194"></a> </span><span class=cF7>{</span><span class=cF2>//user_data is the new y</span><span class=cF0>
<a name="l195"></a> score = </span><span class=cFE>0</span><span class=cF0>;
<a name="l196"></a> j1 = doc_sorted1[i1]-&gt;user_data; </span><span class=cF2>//user_data is the new y</span><span class=cF0>
<a name="l197"></a> j2 = doc_sorted2[i2]-&gt;user_data; </span><span class=cF2>//user_data is the new y</span><span class=cF0>
<a name="l198"></a> n = j1_hi - j1;
<a name="l199"></a> </span><span class=cF1>if</span><span class=cF0> (j2_hi - j2 &lt; n)
<a name="l200"></a> n = j2_hi - j2;
<a name="l201"></a> </span><span class=cF1>while</span><span class=cF0> (score &lt; n)
<a name="l202"></a> {
<a name="l203"></a> </span><span class=cF1>if</span><span class=cF0> (!</span><span class=cF5>StrCompare</span><span class=cF7>(</span><span class=cF0>doc_unsorted1[j1 + score]-&gt;tag, doc_unsorted2[j2 + score]-&gt;tag</span><span class=cF7>)</span><span class=cF0>)
<a name="l204"></a> score++;
<a name="l205"></a> </span><span class=cF1>else</span><span class=cF0>
<a name="l206"></a> </span><span class=cF1>break</span><span class=cF0>;
<a name="l207"></a> }
<a name="l208"></a> </span><span class=cF1>if</span><span class=cF0> (score &gt; best_score)
<a name="l209"></a> {
<a name="l210"></a> best_score = score;
<a name="l211"></a> best_j1 = j1;
<a name="l212"></a> best_j2 = j2;
<a name="l213"></a> }
<a name="l214"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l215"></a> i2++;
<a name="l216"></a> </span><span class=cF1>if</span><span class=cF0> (i2 &gt;= count2)
<a name="l217"></a> </span><span class=cF1>break</span><span class=cF0>;
<a name="l218"></a> }
<a name="l219"></a> i2 = i2b;
<a name="l220"></a> i1++;
<a name="l221"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l222"></a> }
<a name="l223"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l224"></a> </span><span class=cF1>if</span><span class=cF0> (!best_score)
<a name="l225"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l226"></a> </span><span class=cF5>DiffSel</span><span class=cF0>(doc, _df_flags, j1_lo, j1_hi, j2_lo, j2_hi, count1, count2, doc_unsorted1, doc_unsorted2);
<a name="l227"></a> </span><span class=cF1>return</span><span class=cF0> </span><span class=cF3>TRUE</span><span class=cF0>;
<a name="l228"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l229"></a> </span><span class=cF1>else</span><span class=cF0>
<a name="l230"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l231"></a> </span><span class=cF1>if</span><span class=cF0> (</span><span class=cF5>DiffSub</span><span class=cF7>(</span><span class=cF0>doc, _df_flags, j1_lo, best_j1, j2_lo, best_j2, count1, count2,
<a name="l232"></a> doc_sorted1, doc_sorted2, doc_unsorted1, doc_unsorted2</span><span class=cF7>)</span><span class=cF0>)
<a name="l233"></a> res = </span><span class=cF3>TRUE</span><span class=cF0>;
<a name="l234"></a> </span><span class=cF1>if</span><span class=cF0> (</span><span class=cF5>DiffSub</span><span class=cF7>(</span><span class=cF0>doc, _df_flags, best_j1 + best_score, j1_hi, best_j2 + best_score, j2_hi, count1, count2,
<a name="l235"></a> doc_sorted1, doc_sorted2, doc_unsorted1, doc_unsorted2</span><span class=cF7>)</span><span class=cF0>)
<a name="l236"></a> res = </span><span class=cF3>TRUE</span><span class=cF0>;
<a name="l237"></a>
<a name="l238"></a> </span><span class=cF1>return</span><span class=cF0> res;
<a name="l239"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l240"></a>}
<a name="l241"></a>
<a name="l242"></a></span><span class=cF1>Bool</span><span class=cF0> </span><span class=cF5>DiffBins</span><span class=cF0>(</span><span class=cF9>CDoc</span><span class=cF0> *doc1, </span><span class=cF9>CDoc</span><span class=cF0> *doc2)
<a name="l243"></a>{
<a name="l244"></a> </span><span class=cF9>CDocBin</span><span class=cF0> *tmpb1 = doc1-&gt;bin_head.next, *tmpb2 = doc2-&gt;bin_head.next;
<a name="l245"></a>
<a name="l246"></a> </span><span class=cF1>if</span><span class=cF0> (tmpb1-&gt;last-&gt;last-&gt;num != tmpb2-&gt;last-&gt;last-&gt;num)
<a name="l247"></a> </span><span class=cF1>return</span><span class=cF0> </span><span class=cF3>TRUE</span><span class=cF0>;
<a name="l248"></a> </span><span class=cF1>while</span><span class=cF0> (tmpb1 != &amp;doc1-&gt;bin_head)
<a name="l249"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l250"></a> </span><span class=cF1>if</span><span class=cF0> (tmpb1-&gt;size != tmpb2-&gt;size || </span><span class=cF5>MemCompare</span><span class=cF7>(</span><span class=cF0>tmpb1-&gt;data, tmpb2-&gt;data, tmpb1-&gt;size</span><span class=cF7>)</span><span class=cF0>)
<a name="l251"></a> </span><span class=cF1>return</span><span class=cF0> </span><span class=cF3>TRUE</span><span class=cF0>;
<a name="l252"></a> tmpb1 = tmpb1-&gt;next;
<a name="l253"></a> tmpb2 = tmpb2-&gt;next;
<a name="l254"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l255"></a>
<a name="l256"></a> </span><span class=cF1>return</span><span class=cF0> </span><span class=cF3>FALSE</span><span class=cF0>;
<a name="l257"></a>}
<a name="l258"></a>
<a name="l259"></a></span><span class=cF1>public</span><span class=cF0> </span><span class=cF1>Bool</span><span class=cF0> </span><span class=cF5>Diff</span><span class=cF0>(</span><span class=cF1>U8</span><span class=cF0> *dst_file, </span><span class=cF1>U8</span><span class=cF0> *src_file, </span><span class=cF9>I64</span><span class=cF0> *_df_flags=</span><span class=cF3>NULL</span><span class=cF0>)
<a name="l260"></a>{</span><span class=cF2>//Report differences between two files and merge differences</span><span class=cF0>
<a name="l261"></a></span><span class=cF2>//from src_file to dst_file.</span><span class=cF0> </span><span class=cF2>Don't use _df_flags arg. (Used by </span><a href="https://zeal-operating-system.github.io/ZealOS/System/Utils/Merge.CC.html#l44"><span class=cF4>Merge</span></a><span class=cF2>().)</span><span class=cF0>
<a name="l262"></a> </span><span class=cF9>CDoc</span><span class=cF0> *doc1 = </span><span class=cF5>DocRead</span><span class=cF0>(dst_file, </span><span class=cF3>DOCF_PLAIN_TEXT_TABS</span><span class=cF0> | </span><span class=cF3>DOCF_NO_CURSOR</span><span class=cF0>),
<a name="l263"></a> *doc2 = </span><span class=cF5>DocRead</span><span class=cF0>(src_file, </span><span class=cF3>DOCF_PLAIN_TEXT_TABS</span><span class=cF0> | </span><span class=cF3>DOCF_NO_CURSOR</span><span class=cF0>);
<a name="l264"></a> </span><span class=cF9>CDocEntry</span><span class=cF0> *doc_e, **doc_sorted1, **doc_sorted2, **doc_unsorted1, **doc_unsorted2;
<a name="l265"></a> </span><span class=cF9>I64</span><span class=cF0> i, count1 = </span><span class=cFE>0</span><span class=cF0>, count2 = </span><span class=cFE>0</span><span class=cF0>,df_flags;
<a name="l266"></a> </span><span class=cF1>Bool</span><span class=cF0> res = </span><span class=cF3>FALSE</span><span class=cF0>;
<a name="l267"></a>
<a name="l268"></a> </span><span class=cF1>if</span><span class=cF0> (_df_flags)
<a name="l269"></a> df_flags = *_df_flags;
<a name="l270"></a> </span><span class=cF1>else</span><span class=cF0>
<a name="l271"></a> df_flags = </span><span class=cFE>0</span><span class=cF0>;
<a name="l272"></a> df_flags &amp;= </span><span class=cF3>DF_ABORT_ALL_FILES</span><span class=cF0>;
<a name="l273"></a>
<a name="l274"></a> doc_e = doc1-&gt;head.next;
<a name="l275"></a> </span><span class=cF1>while</span><span class=cF0> (doc_e != doc1)
<a name="l276"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l277"></a> </span><span class=cF1>if</span><span class=cF0> (doc_e-&gt;type_u8 == </span><span class=cF3>DOCT_TEXT</span><span class=cF0>)
<a name="l278"></a> doc_e-&gt;user_data = count1++; </span><span class=cF2>//user_data is the new y</span><span class=cF0>
<a name="l279"></a> doc_e = doc_e-&gt;next;
<a name="l280"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l281"></a>
<a name="l282"></a> doc_e = doc2-&gt;head.next;
<a name="l283"></a> </span><span class=cF1>while</span><span class=cF0> (doc_e != doc2)
<a name="l284"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l285"></a> </span><span class=cF1>if</span><span class=cF0> (doc_e-&gt;type_u8 == </span><span class=cF3>DOCT_TEXT</span><span class=cF0>)
<a name="l286"></a> doc_e-&gt;user_data = count2++; </span><span class=cF2>//user_data is the new y</span><span class=cF0>
<a name="l287"></a> doc_e = doc_e-&gt;next;
<a name="l288"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l289"></a>
<a name="l290"></a> doc_sorted1 = </span><span class=cF5>MAlloc</span><span class=cF0>(count1 * </span><span class=cF1>sizeof</span><span class=cF7>(</span><span class=cF9>CDocEntry</span><span class=cF0> *</span><span class=cF7>)</span><span class=cF0>);
<a name="l291"></a> doc_unsorted1 = </span><span class=cF5>MAlloc</span><span class=cF0>(</span><span class=cF7>(</span><span class=cF0>count1 + </span><span class=cFE>1</span><span class=cF7>)</span><span class=cF0> * </span><span class=cF1>sizeof</span><span class=cF7>(</span><span class=cF9>CDocEntry</span><span class=cF0> *</span><span class=cF7>)</span><span class=cF0>);
<a name="l292"></a> i = </span><span class=cFE>0</span><span class=cF0>;
<a name="l293"></a> doc_e = doc1-&gt;head.next;
<a name="l294"></a> </span><span class=cF1>while</span><span class=cF0> (doc_e != doc1)
<a name="l295"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l296"></a> </span><span class=cF1>if</span><span class=cF0> (doc_e-&gt;type_u8 == </span><span class=cF3>DOCT_TEXT</span><span class=cF0>)
<a name="l297"></a> {
<a name="l298"></a> doc_sorted1[i] = doc_e;
<a name="l299"></a> doc_unsorted1[i++] = doc_e;
<a name="l300"></a> }
<a name="l301"></a> doc_e = doc_e-&gt;next;
<a name="l302"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l303"></a> doc_unsorted1[i] = doc1;
<a name="l304"></a> </span><span class=cF5>QuickSortI64</span><span class=cF0>(doc_sorted1, count1, &amp;</span><span class=cF5>DiffEntriesCompare</span><span class=cF0>);
<a name="l305"></a>
<a name="l306"></a> doc_sorted2 = </span><span class=cF5>MAlloc</span><span class=cF0>(count2 * </span><span class=cF1>sizeof</span><span class=cF7>(</span><span class=cF9>CDocEntry</span><span class=cF0> *</span><span class=cF7>)</span><span class=cF0>);
<a name="l307"></a> doc_unsorted2 = </span><span class=cF5>MAlloc</span><span class=cF0>(</span><span class=cF7>(</span><span class=cF0>count2 + </span><span class=cFE>1</span><span class=cF7>)</span><span class=cF0> * </span><span class=cF1>sizeof</span><span class=cF7>(</span><span class=cF9>CDocEntry</span><span class=cF0> *</span><span class=cF7>)</span><span class=cF0>);
<a name="l308"></a> i = </span><span class=cFE>0</span><span class=cF0>;
<a name="l309"></a> doc_e = doc2-&gt;head.next;
<a name="l310"></a> </span><span class=cF1>while</span><span class=cF0> (doc_e != doc2)
<a name="l311"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l312"></a> </span><span class=cF1>if</span><span class=cF0> (doc_e-&gt;type_u8 == </span><span class=cF3>DOCT_TEXT</span><span class=cF0>)
<a name="l313"></a> {
<a name="l314"></a> doc_sorted2[i] = doc_e;
<a name="l315"></a> doc_unsorted2[i++] = doc_e;
<a name="l316"></a> }
<a name="l317"></a> doc_e = doc_e-&gt;next;
<a name="l318"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l319"></a> doc_unsorted2[i] = doc2;
<a name="l320"></a> </span><span class=cF5>QuickSortI64</span><span class=cF0>(doc_sorted2, count2, &amp;</span><span class=cF5>DiffEntriesCompare</span><span class=cF0>);
<a name="l321"></a>
<a name="l322"></a> res = </span><span class=cF5>DiffSub</span><span class=cF0>(doc1, &amp;df_flags, </span><span class=cFE>0</span><span class=cF0>, count1, </span><span class=cFE>0</span><span class=cF0>, count2, count1, count2,
<a name="l323"></a> doc_sorted1, doc_sorted2, doc_unsorted1, doc_unsorted2);
<a name="l324"></a> </span><span class=cF1>if</span><span class=cF0> (df_flags &amp; </span><span class=cF3>DF_MODIFIED</span><span class=cF0> &amp;&amp; !</span><span class=cF7>(</span><span class=cF0>df_flags &amp; </span><span class=cF3>DF_DONT_MODIFIED</span><span class=cF7>)</span><span class=cF0>)
<a name="l325"></a> </span><span class=cF5>DocWrite</span><span class=cF0>(doc1);
<a name="l326"></a>
<a name="l327"></a> </span><span class=cF1>if</span><span class=cF0> (</span><span class=cF5>DiffBins</span><span class=cF7>(</span><span class=cF0>doc1, doc2</span><span class=cF7>)</span><span class=cF0>)
<a name="l328"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l329"></a> </span><span class=cF6>&quot;$RED$Bin Data is Different$FG$\n&quot;</span><span class=cF0>;
<a name="l330"></a> res = </span><span class=cF3>TRUE</span><span class=cF0>;
<a name="l331"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l332"></a>
<a name="l333"></a> </span><span class=cF5>DocDel</span><span class=cF0>(doc1);
<a name="l334"></a> </span><span class=cF5>DocDel</span><span class=cF0>(doc2);
<a name="l335"></a> </span><span class=cF5>Free</span><span class=cF0>(doc_sorted1);
<a name="l336"></a> </span><span class=cF5>Free</span><span class=cF0>(doc_sorted2);
<a name="l337"></a> </span><span class=cF5>Free</span><span class=cF0>(doc_unsorted1);
<a name="l338"></a> </span><span class=cF5>Free</span><span class=cF0>(doc_unsorted2);
<a name="l339"></a> </span><span class=cF1>if</span><span class=cF0> (_df_flags)
<a name="l340"></a> *_df_flags = df_flags;
<a name="l341"></a>
<a name="l342"></a> </span><span class=cF1>return</span><span class=cF0> res;
<a name="l343"></a>}
<a name="l14"></a> </span><span class=cF5>DocPrint</span><span class=cF0>(doc, </span><span class=cF6>&quot;$CM+LX,2,2$$LTRED$FILE1$FG$ = DST.$CM+LX,24,0$$LTGREEN$FILE2$FG$ = SRC.&quot;</span><span class=cF0>
<a name="l15"></a> </span><span class=cF6>&quot;$CM+LX,2,4$$RED$$BT,\&quot;USE FILE1\&quot;,LE=DS_USE_FILE1$&quot;</span><span class=cF0>
<a name="l16"></a> </span><span class=cF6>&quot;$CM+LX,24,0$$GREEN$$BT,\&quot;USE FILE2\&quot;,LE=DS_USE_FILE2$&quot;</span><span class=cF0>
<a name="l17"></a> </span><span class=cF6>&quot;$CM+LX,2,4$$RED$$BT,\&quot;REMAINDER ALL FILE1\&quot;,LE=DS_REMAINDER_1$&quot;</span><span class=cF0>
<a name="l18"></a> </span><span class=cF6>&quot;$CM+LX,24,0$$GREEN$$BT,\&quot;REMAINDER ALL FILE2\&quot;,LE=DS_REMAINDER_2$&quot;</span><span class=cF0>
<a name="l19"></a> </span><span class=cF6>&quot;$CM+LX,2,4$$FG$$BT,\&quot;ABORT FILE\&quot;,LE=DS_ABORT_FILE$&quot;</span><span class=cF0>
<a name="l20"></a> </span><span class=cF6>&quot;$CM+LX,24,0$$FG$$BT,\&quot;ABORT ALL FILES\&quot;,LE=DOCM_CANCEL$\n&quot;</span><span class=cF0>);
<a name="l21"></a> i = </span><span class=cF5>PopUpMenu</span><span class=cF0>(doc);
<a name="l22"></a> </span><span class=cF5>DocDel</span><span class=cF0>(doc);
<a name="l23"></a>
<a name="l24"></a> </span><span class=cF1>return</span><span class=cF0> i;
<a name="l25"></a>}
<a name="l26"></a>
<a name="l27"></a></span><span class=cF9>I64</span><span class=cF0> </span><span class=cF5>DiffEntriesCompare</span><span class=cF0>(</span><span class=cF9>CDocEntry</span><span class=cF0> *doc_e1, </span><span class=cF9>CDocEntry</span><span class=cF0> *doc_e2)
<a name="l28"></a>{
<a name="l29"></a> </span><span class=cF1>return</span><span class=cF0> </span><span class=cF5>StrCompare</span><span class=cF0>(doc_e1-&gt;tag, doc_e2-&gt;tag);
<a name="l30"></a>}
<a name="l31"></a>
<a name="l32"></a>#</span><span class=cF1>define</span><span class=cF0> </span><span class=cF3>DF_MODIFIED</span><span class=cF0> </span><span class=cFE>0x01</span><span class=cF0>
<a name="l33"></a>#</span><span class=cF1>define</span><span class=cF0> </span><span class=cF3>DF_DONT_MODIFIED</span><span class=cF0> </span><span class=cFE>0x02</span><span class=cF0>
<a name="l34"></a>#</span><span class=cF1>define</span><span class=cF0> </span><span class=cF3>DF_REMAINDER_ALL_FILE1</span><span class=cF0> </span><span class=cFE>0x04</span><span class=cF0>
<a name="l35"></a>#</span><span class=cF1>define</span><span class=cF0> </span><span class=cF3>DF_REMAINDER_ALL_FILE2</span><span class=cF0> </span><span class=cFE>0x08</span><span class=cF0>
<a name="l36"></a>#</span><span class=cF1>define</span><span class=cF0> </span><span class=cF3>DF_ABORT_FILE</span><span class=cF0> </span><span class=cFE>0x10</span><span class=cF0>
<a name="l37"></a>#</span><span class=cF1>define</span><span class=cF0> </span><span class=cF3>DF_ABORT_ALL_FILES</span><span class=cF0> </span><span class=cFE>0x20</span><span class=cF0>
<a name="l38"></a>#</span><span class=cF1>define</span><span class=cF0> </span><span class=cF3>DF_NO_MORE_PROMPTS_THIS_FILE</span><span class=cF0> </span><span class=cFE>0x40</span><span class=cF0>
<a name="l39"></a>
<a name="l40"></a></span><span class=cF1>U0</span><span class=cF0> </span><span class=cF5>DiffSel</span><span class=cF0>(</span><span class=cF9>CDoc</span><span class=cF0> *doc, </span><span class=cF9>I64</span><span class=cF0> *_df_flags, </span><span class=cF9>I64</span><span class=cF0> j1_lo, </span><span class=cF9>I64</span><span class=cF0> j1_hi, </span><span class=cF9>I64</span><span class=cF0> j2_lo, </span><span class=cF9>I64</span><span class=cF0> j2_hi, </span><span class=cF9>I64</span><span class=cF0> count1, </span><span class=cF9>I64</span><span class=cF0> count2,
<a name="l41"></a> </span><span class=cF9>CDocEntry</span><span class=cF0> **doc_unsorted1, </span><span class=cF9>CDocEntry</span><span class=cF0> **doc_unsorted2)
<a name="l42"></a>{
<a name="l43"></a> </span><span class=cF9>CDocEntry</span><span class=cF0> *doc_e, *doc_e1, *doc_e2;
<a name="l44"></a> </span><span class=cF1>Bool</span><span class=cF0> use_file1;
<a name="l45"></a> </span><span class=cF9>I64</span><span class=cF0> i, old_flags;
<a name="l46"></a> </span><span class=cF9>CDoc</span><span class=cF0> *cur_l;
<a name="l47"></a>
<a name="l48"></a> </span><span class=cF1>if</span><span class=cF0> (!</span><span class=cF7>(</span><span class=cF0>*_df_flags &amp; (</span><span class=cF3>DF_ABORT_FILE</span><span class=cF0> | </span><span class=cF3>DF_ABORT_ALL_FILES</span><span class=cF0>)</span><span class=cF7>)</span><span class=cF0>)
<a name="l49"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l50"></a> </span><span class=cF6>&quot;$PURPLE$&quot;</span><span class=cF0>;
<a name="l51"></a> </span><span class=cF1>if</span><span class=cF0> (</span><span class=cFE>0</span><span class=cF0> &lt;= j1_lo &lt; count1)
<a name="l52"></a> </span><span class=cF6>&quot;%d,&quot;</span><span class=cF0>, doc_unsorted1[j1_lo]-&gt;y + </span><span class=cFE>1</span><span class=cF0>;
<a name="l53"></a> </span><span class=cF1>else</span><span class=cF0> </span><span class=cF1>if</span><span class=cF0> (</span><span class=cFE>0</span><span class=cF0> &lt;= j1_hi - </span><span class=cFE>1</span><span class=cF0> &lt; count1)
<a name="l54"></a> </span><span class=cF6>&quot;%d,&quot;</span><span class=cF0>, doc_unsorted1[j1_hi - </span><span class=cFE>1</span><span class=cF0>]-&gt;y + </span><span class=cFE>1</span><span class=cF0>;
<a name="l55"></a> </span><span class=cF1>else</span><span class=cF0>
<a name="l56"></a> </span><span class=cF6>&quot;***,&quot;</span><span class=cF0>;
<a name="l57"></a> </span><span class=cF1>if</span><span class=cF0> (</span><span class=cFE>0</span><span class=cF0> &lt;= j2_lo &lt; count2)
<a name="l58"></a> </span><span class=cF6>&quot;%d&quot;</span><span class=cF0>, doc_unsorted2[j2_lo]-&gt;y + </span><span class=cFE>1</span><span class=cF0>;
<a name="l59"></a> </span><span class=cF1>else</span><span class=cF0> </span><span class=cF1>if</span><span class=cF0> (</span><span class=cFE>0</span><span class=cF0> &lt;= j2_hi - </span><span class=cFE>1</span><span class=cF0> &lt; count2)
<a name="l60"></a> </span><span class=cF6>&quot;%d&quot;</span><span class=cF0>, doc_unsorted2[j2_hi - </span><span class=cFE>1</span><span class=cF0>]-&gt;y + </span><span class=cFE>1</span><span class=cF0>;
<a name="l61"></a> </span><span class=cF1>else</span><span class=cF0>
<a name="l62"></a> </span><span class=cF6>&quot;***&quot;</span><span class=cF0>;
<a name="l63"></a> </span><span class=cF6>&quot;---------------------$RED$\n&quot;</span><span class=cF0>;
<a name="l64"></a> </span><span class=cF1>if</span><span class=cF0> (j1_lo &lt;= </span><span class=cFE>0</span><span class=cF0>)
<a name="l65"></a> i = </span><span class=cFE>0</span><span class=cF0>;
<a name="l66"></a> </span><span class=cF1>else</span><span class=cF0>
<a name="l67"></a> i = j1_lo - </span><span class=cFE>1</span><span class=cF0>;
<a name="l68"></a> </span><span class=cF1>while</span><span class=cF0> (i &lt; j1_hi)
<a name="l69"></a> {
<a name="l70"></a> </span><span class=cF1>if</span><span class=cF0> (cur_l = </span><span class=cF5>DocPut</span><span class=cF0>)
<a name="l71"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l72"></a> old_flags = cur_l-&gt;flags &amp; </span><span class=cF3>DOCF_PLAIN_TEXT</span><span class=cF0>;
<a name="l73"></a> cur_l-&gt;flags |= </span><span class=cF3>DOCF_PLAIN_TEXT</span><span class=cF0>;
<a name="l74"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l75"></a> </span><span class=cF6>&quot;%s&quot;</span><span class=cF0>, doc_unsorted1[i++]-&gt;tag;
<a name="l76"></a> </span><span class=cF1>if</span><span class=cF0> (cur_l)
<a name="l77"></a> cur_l-&gt;flags = cur_l-&gt;flags &amp; ~</span><span class=cF3>DOCF_PLAIN_TEXT</span><span class=cF0> | old_flags;
<a name="l78"></a> </span><span class=cF6>'\n'</span><span class=cF0>;
<a name="l79"></a> }
<a name="l80"></a> </span><span class=cF6>&quot;$GREEN$&quot;</span><span class=cF0>;
<a name="l81"></a> </span><span class=cF1>if</span><span class=cF0> (j2_lo &lt;= </span><span class=cFE>0</span><span class=cF0>)
<a name="l82"></a> i = </span><span class=cFE>0</span><span class=cF0>;
<a name="l83"></a> </span><span class=cF1>else</span><span class=cF0>
<a name="l84"></a> i = j2_lo - </span><span class=cFE>1</span><span class=cF0>;
<a name="l85"></a> </span><span class=cF1>while</span><span class=cF0> (i &lt; j2_hi)
<a name="l86"></a> {
<a name="l87"></a> </span><span class=cF1>if</span><span class=cF0> (cur_l = </span><span class=cF5>DocPut</span><span class=cF0>)
<a name="l88"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l89"></a> old_flags = cur_l-&gt;flags &amp; </span><span class=cF3>DOCF_PLAIN_TEXT</span><span class=cF0>;
<a name="l90"></a> cur_l-&gt;flags |= </span><span class=cF3>DOCF_PLAIN_TEXT</span><span class=cF0>;
<a name="l91"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l92"></a> </span><span class=cF6>&quot;%s&quot;</span><span class=cF0>, doc_unsorted2[i++]-&gt;tag;
<a name="l93"></a> </span><span class=cF1>if</span><span class=cF0> (cur_l)
<a name="l94"></a> cur_l-&gt;flags = cur_l-&gt;flags &amp; ~</span><span class=cF3>DOCF_PLAIN_TEXT</span><span class=cF0> | old_flags;
<a name="l95"></a> </span><span class=cF6>'\n'</span><span class=cF0>;
<a name="l96"></a> }
<a name="l97"></a> </span><span class=cF6>&quot;$FG$&quot;</span><span class=cF0>;
<a name="l98"></a>
<a name="l99"></a> use_file1 = </span><span class=cF3>TRUE</span><span class=cF0>;
<a name="l100"></a> </span><span class=cF1>if</span><span class=cF0> (!</span><span class=cF7>(</span><span class=cF0>*_df_flags &amp; </span><span class=cF3>DF_NO_MORE_PROMPTS_THIS_FILE</span><span class=cF7>)</span><span class=cF0>)
<a name="l101"></a> {
<a name="l102"></a> </span><span class=cF1>switch</span><span class=cF0> (</span><span class=cF5>PopUpDiffMenu</span><span class=cF0>)
<a name="l103"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l104"></a> </span><span class=cF1>case</span><span class=cF0> </span><span class=cF3>DS_USE_FILE1</span><span class=cF0>:
<a name="l105"></a> </span><span class=cF1>break</span><span class=cF0>;
<a name="l106"></a>
<a name="l107"></a> </span><span class=cF1>case</span><span class=cF0> </span><span class=cF3>DS_USE_FILE2</span><span class=cF0>:
<a name="l108"></a> use_file1 = </span><span class=cF3>FALSE</span><span class=cF0>;
<a name="l109"></a> </span><span class=cF1>break</span><span class=cF0>;
<a name="l110"></a>
<a name="l111"></a> </span><span class=cF1>case</span><span class=cF0> </span><span class=cF3>DS_REMAINDER_1</span><span class=cF0>:
<a name="l112"></a> *_df_flags = *_df_flags &amp; ~</span><span class=cF3>DF_REMAINDER_ALL_FILE2</span><span class=cF0> | </span><span class=cF3>DF_REMAINDER_ALL_FILE1</span><span class=cF0> | </span><span class=cF3>DF_NO_MORE_PROMPTS_THIS_FILE</span><span class=cF0>;
<a name="l113"></a> </span><span class=cF1>break</span><span class=cF0>;
<a name="l114"></a>
<a name="l115"></a> </span><span class=cF1>case</span><span class=cF0> </span><span class=cF3>DS_REMAINDER_2</span><span class=cF0>:
<a name="l116"></a> *_df_flags = *_df_flags &amp; ~</span><span class=cF3>DF_REMAINDER_ALL_FILE1</span><span class=cF0> | </span><span class=cF3>DF_REMAINDER_ALL_FILE2</span><span class=cF0> | </span><span class=cF3>DF_NO_MORE_PROMPTS_THIS_FILE</span><span class=cF0>;
<a name="l117"></a> </span><span class=cF1>break</span><span class=cF0>;
<a name="l118"></a>
<a name="l119"></a> </span><span class=cF1>case</span><span class=cF0> </span><span class=cF3>DS_ABORT_FILE</span><span class=cF0>:
<a name="l120"></a> *_df_flags |= </span><span class=cF3>DF_DONT_MODIFIED</span><span class=cF0> | </span><span class=cF3>DF_ABORT_FILE</span><span class=cF0> | </span><span class=cF3>DF_NO_MORE_PROMPTS_THIS_FILE</span><span class=cF0>;
<a name="l121"></a> </span><span class=cF1>break</span><span class=cF0>;
<a name="l122"></a>
<a name="l123"></a> </span><span class=cF1>default</span><span class=cF0>:
<a name="l124"></a> *_df_flags |= </span><span class=cF3>DF_DONT_MODIFIED</span><span class=cF0> | </span><span class=cF3>DF_ABORT_ALL_FILES</span><span class=cF0> | </span><span class=cF3>DF_NO_MORE_PROMPTS_THIS_FILE</span><span class=cF0>;
<a name="l125"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l126"></a> }
<a name="l127"></a> </span><span class=cF1>if</span><span class=cF0> (*_df_flags &amp; </span><span class=cF3>DF_REMAINDER_ALL_FILE2</span><span class=cF0> &amp;&amp; !</span><span class=cF7>(</span><span class=cF0>*_df_flags &amp; (</span><span class=cF3>DF_DONT_MODIFIED</span><span class=cF0> | </span><span class=cF3>DF_REMAINDER_ALL_FILE1</span><span class=cF0>)</span><span class=cF7>)</span><span class=cF0>)
<a name="l128"></a> use_file1 = </span><span class=cF3>FALSE</span><span class=cF0>;
<a name="l129"></a> </span><span class=cF1>if</span><span class=cF0> (!use_file1)
<a name="l130"></a> {
<a name="l131"></a> *_df_flags |= </span><span class=cF3>DF_MODIFIED</span><span class=cF0>;
<a name="l132"></a> doc_e1 = doc_unsorted1[j1_lo]-&gt;last;
<a name="l133"></a> </span><span class=cF1>if</span><span class=cF0> (j1_lo &lt; j1_hi)
<a name="l134"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l135"></a> doc_e = doc_unsorted1[j1_lo];
<a name="l136"></a> </span><span class=cF1>while</span><span class=cF0> (doc_e != doc_unsorted1[j1_hi])
<a name="l137"></a> {
<a name="l138"></a> doc_e2 = doc_e-&gt;next;
<a name="l139"></a> </span><span class=cF5>DocEntryDel</span><span class=cF0>(doc, doc_e);
<a name="l140"></a> doc_e = doc_e2;
<a name="l141"></a> }
<a name="l142"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l143"></a> </span><span class=cF1>if</span><span class=cF0> (j2_lo &lt; j2_hi)
<a name="l144"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l145"></a> doc_e = doc_unsorted2[j2_lo];
<a name="l146"></a> </span><span class=cF1>while</span><span class=cF0> (doc_e != doc_unsorted2[j2_hi])
<a name="l147"></a> {
<a name="l148"></a> doc_e2 = </span><span class=cF5>DocEntryCopy</span><span class=cF0>(doc, doc_e);
<a name="l149"></a> </span><span class=cF5>QueueInsert</span><span class=cF0>(doc_e2, doc_e1);
<a name="l150"></a> doc_e1 = doc_e2;
<a name="l151"></a> doc_e = doc_e-&gt;next;
<a name="l152"></a> }
<a name="l153"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l154"></a> }
<a name="l155"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l156"></a>}
<a name="l157"></a>
<a name="l158"></a></span><span class=cF1>Bool</span><span class=cF0> </span><span class=cF5>DiffSub</span><span class=cF0>(</span><span class=cF9>CDoc</span><span class=cF0> *doc, </span><span class=cF9>I64</span><span class=cF0> *_df_flags, </span><span class=cF9>I64</span><span class=cF0> j1_lo, </span><span class=cF9>I64</span><span class=cF0> j1_hi, </span><span class=cF9>I64</span><span class=cF0> j2_lo, </span><span class=cF9>I64</span><span class=cF0> j2_hi, </span><span class=cF9>I64</span><span class=cF0> count1, </span><span class=cF9>I64</span><span class=cF0> count2,
<a name="l159"></a> </span><span class=cF9>CDocEntry</span><span class=cF0> **doc_sorted1, </span><span class=cF9>CDocEntry</span><span class=cF0> **doc_sorted2, </span><span class=cF9>CDocEntry</span><span class=cF0> **doc_unsorted1, </span><span class=cF9>CDocEntry</span><span class=cF0> **doc_unsorted2)
<a name="l160"></a>{
<a name="l161"></a> </span><span class=cF9>I64</span><span class=cF0> i, i1 = </span><span class=cFE>0</span><span class=cF0>, i2 = </span><span class=cFE>0</span><span class=cF0>, i2b, j1, j2, n, best_j1, best_j2, best_score = </span><span class=cFE>0</span><span class=cF0>, score;
<a name="l162"></a> </span><span class=cF1>Bool</span><span class=cF0> res = </span><span class=cF3>FALSE</span><span class=cF0>;
<a name="l163"></a>
<a name="l164"></a> </span><span class=cF1>if</span><span class=cF0> (j1_lo &gt;= j1_hi || j2_lo &gt;= j2_hi)
<a name="l165"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l166"></a> </span><span class=cF1>if</span><span class=cF0> (j1_lo &lt; j1_hi || j2_lo &lt; j2_hi)
<a name="l167"></a> {
<a name="l168"></a> </span><span class=cF5>DiffSel</span><span class=cF0>(doc, _df_flags, j1_lo, j1_hi, j2_lo, j2_hi, count1, count2, doc_unsorted1, doc_unsorted2);
<a name="l169"></a> </span><span class=cF1>return</span><span class=cF0> </span><span class=cF3>TRUE</span><span class=cF0>;
<a name="l170"></a> }
<a name="l171"></a> </span><span class=cF1>else</span><span class=cF0>
<a name="l172"></a> </span><span class=cF1>return</span><span class=cF0> </span><span class=cF3>FALSE</span><span class=cF0>;
<a name="l173"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l174"></a>
<a name="l175"></a> </span><span class=cF2>//Locate longest matching str in intervals</span><span class=cF0>
<a name="l176"></a> </span><span class=cF1>while</span><span class=cF0> (i1 &lt; count1 &amp;&amp; i2 &lt; count2)
<a name="l177"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l178"></a> </span><span class=cF1>if</span><span class=cF0> (!</span><span class=cF7>(</span><span class=cF0>j1_lo &lt;= doc_sorted1[i1]-&gt;user_data &lt; j1_hi</span><span class=cF7>)</span><span class=cF0>) </span><span class=cF2>//user_data is the new y</span><span class=cF0>
<a name="l179"></a> i1++;
<a name="l180"></a> </span><span class=cF1>else</span><span class=cF0> </span><span class=cF1>if</span><span class=cF0> (!</span><span class=cF7>(</span><span class=cF0>j2_lo &lt;= doc_sorted2[i2]-&gt;user_data &lt; j2_hi</span><span class=cF7>)</span><span class=cF0>) </span><span class=cF2>//user_data is new y</span><span class=cF0>
<a name="l181"></a> i2++;
<a name="l182"></a> </span><span class=cF1>else</span><span class=cF0>
<a name="l183"></a> {
<a name="l184"></a> i = </span><span class=cF5>StrCompare</span><span class=cF0>(doc_sorted1[i1]-&gt;tag, doc_sorted2[i2]-&gt;tag);
<a name="l185"></a> </span><span class=cF1>if</span><span class=cF0> (i &gt; </span><span class=cFE>0</span><span class=cF0>)
<a name="l186"></a> i2++;
<a name="l187"></a> </span><span class=cF1>else</span><span class=cF0> </span><span class=cF1>if</span><span class=cF0> (i &lt; </span><span class=cFE>0</span><span class=cF0>)
<a name="l188"></a> i1++;
<a name="l189"></a> </span><span class=cF1>else</span><span class=cF0>
<a name="l190"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l191"></a> i2b = i2;
<a name="l192"></a> </span><span class=cF1>while</span><span class=cF0> (!</span><span class=cF5>StrCompare</span><span class=cF7>(</span><span class=cF0>doc_sorted1[i1]-&gt;tag, doc_sorted2[i2]-&gt;tag</span><span class=cF7>)</span><span class=cF0>)
<a name="l193"></a> {
<a name="l194"></a> </span><span class=cF1>if</span><span class=cF0> (j2_lo &lt;= doc_sorted2[i2]-&gt;user_data &lt; j2_hi)
<a name="l195"></a> </span><span class=cF7>{</span><span class=cF2>//user_data is the new y</span><span class=cF0>
<a name="l196"></a> score = </span><span class=cFE>0</span><span class=cF0>;
<a name="l197"></a> j1 = doc_sorted1[i1]-&gt;user_data; </span><span class=cF2>//user_data is the new y</span><span class=cF0>
<a name="l198"></a> j2 = doc_sorted2[i2]-&gt;user_data; </span><span class=cF2>//user_data is the new y</span><span class=cF0>
<a name="l199"></a> n = j1_hi - j1;
<a name="l200"></a> </span><span class=cF1>if</span><span class=cF0> (j2_hi - j2 &lt; n)
<a name="l201"></a> n = j2_hi - j2;
<a name="l202"></a> </span><span class=cF1>while</span><span class=cF0> (score &lt; n)
<a name="l203"></a> {
<a name="l204"></a> </span><span class=cF1>if</span><span class=cF0> (!</span><span class=cF5>StrCompare</span><span class=cF7>(</span><span class=cF0>doc_unsorted1[j1 + score]-&gt;tag, doc_unsorted2[j2 + score]-&gt;tag</span><span class=cF7>)</span><span class=cF0>)
<a name="l205"></a> score++;
<a name="l206"></a> </span><span class=cF1>else</span><span class=cF0>
<a name="l207"></a> </span><span class=cF1>break</span><span class=cF0>;
<a name="l208"></a> }
<a name="l209"></a> </span><span class=cF1>if</span><span class=cF0> (score &gt; best_score)
<a name="l210"></a> {
<a name="l211"></a> best_score = score;
<a name="l212"></a> best_j1 = j1;
<a name="l213"></a> best_j2 = j2;
<a name="l214"></a> }
<a name="l215"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l216"></a> i2++;
<a name="l217"></a> </span><span class=cF1>if</span><span class=cF0> (i2 &gt;= count2)
<a name="l218"></a> </span><span class=cF1>break</span><span class=cF0>;
<a name="l219"></a> }
<a name="l220"></a> i2 = i2b;
<a name="l221"></a> i1++;
<a name="l222"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l223"></a> }
<a name="l224"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l225"></a> </span><span class=cF1>if</span><span class=cF0> (!best_score)
<a name="l226"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l227"></a> </span><span class=cF5>DiffSel</span><span class=cF0>(doc, _df_flags, j1_lo, j1_hi, j2_lo, j2_hi, count1, count2, doc_unsorted1, doc_unsorted2);
<a name="l228"></a> </span><span class=cF1>return</span><span class=cF0> </span><span class=cF3>TRUE</span><span class=cF0>;
<a name="l229"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l230"></a> </span><span class=cF1>else</span><span class=cF0>
<a name="l231"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l232"></a> </span><span class=cF1>if</span><span class=cF0> (</span><span class=cF5>DiffSub</span><span class=cF7>(</span><span class=cF0>doc, _df_flags, j1_lo, best_j1, j2_lo, best_j2, count1, count2,
<a name="l233"></a> doc_sorted1, doc_sorted2, doc_unsorted1, doc_unsorted2</span><span class=cF7>)</span><span class=cF0>)
<a name="l234"></a> res = </span><span class=cF3>TRUE</span><span class=cF0>;
<a name="l235"></a> </span><span class=cF1>if</span><span class=cF0> (</span><span class=cF5>DiffSub</span><span class=cF7>(</span><span class=cF0>doc, _df_flags, best_j1 + best_score, j1_hi, best_j2 + best_score, j2_hi, count1, count2,
<a name="l236"></a> doc_sorted1, doc_sorted2, doc_unsorted1, doc_unsorted2</span><span class=cF7>)</span><span class=cF0>)
<a name="l237"></a> res = </span><span class=cF3>TRUE</span><span class=cF0>;
<a name="l238"></a>
<a name="l239"></a> </span><span class=cF1>return</span><span class=cF0> res;
<a name="l240"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l241"></a>}
<a name="l242"></a>
<a name="l243"></a></span><span class=cF1>Bool</span><span class=cF0> </span><span class=cF5>DiffBins</span><span class=cF0>(</span><span class=cF9>CDoc</span><span class=cF0> *doc1, </span><span class=cF9>CDoc</span><span class=cF0> *doc2)
<a name="l244"></a>{
<a name="l245"></a> </span><span class=cF9>CDocBin</span><span class=cF0> *tmpb1 = doc1-&gt;bin_head.next, *tmpb2 = doc2-&gt;bin_head.next;
<a name="l246"></a>
<a name="l247"></a> </span><span class=cF1>if</span><span class=cF0> (tmpb1-&gt;last-&gt;last-&gt;num != tmpb2-&gt;last-&gt;last-&gt;num)
<a name="l248"></a> </span><span class=cF1>return</span><span class=cF0> </span><span class=cF3>TRUE</span><span class=cF0>;
<a name="l249"></a> </span><span class=cF1>while</span><span class=cF0> (tmpb1 != &amp;doc1-&gt;bin_head)
<a name="l250"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l251"></a> </span><span class=cF1>if</span><span class=cF0> (tmpb1-&gt;size != tmpb2-&gt;size || </span><span class=cF5>MemCompare</span><span class=cF7>(</span><span class=cF0>tmpb1-&gt;data, tmpb2-&gt;data, tmpb1-&gt;size</span><span class=cF7>)</span><span class=cF0>)
<a name="l252"></a> </span><span class=cF1>return</span><span class=cF0> </span><span class=cF3>TRUE</span><span class=cF0>;
<a name="l253"></a> tmpb1 = tmpb1-&gt;next;
<a name="l254"></a> tmpb2 = tmpb2-&gt;next;
<a name="l255"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l256"></a>
<a name="l257"></a> </span><span class=cF1>return</span><span class=cF0> </span><span class=cF3>FALSE</span><span class=cF0>;
<a name="l258"></a>}
<a name="l259"></a>
<a name="l260"></a></span><span class=cF1>public</span><span class=cF0> </span><span class=cF1>Bool</span><span class=cF0> </span><span class=cF5>Diff</span><span class=cF0>(</span><span class=cF1>U8</span><span class=cF0> *dst_file, </span><span class=cF1>U8</span><span class=cF0> *src_file, </span><span class=cF9>I64</span><span class=cF0> *_df_flags=</span><span class=cF3>NULL</span><span class=cF0>)
<a name="l261"></a>{</span><span class=cF2>//Report differences between two files and merge differences</span><span class=cF0>
<a name="l262"></a></span><span class=cF2>//from src_file to dst_file.</span><span class=cF0> </span><span class=cF2>Don't use _df_flags arg. (Used by </span><a href="https://zeal-operating-system.github.io/ZealOS/System/Utils/Merge.CC.html#l45"><span class=cF4>Merge</span></a><span class=cF2>().)</span><span class=cF0>
<a name="l263"></a> </span><span class=cF9>CDoc</span><span class=cF0> *doc1 = </span><span class=cF5>DocRead</span><span class=cF0>(dst_file, </span><span class=cF3>DOCF_PLAIN_TEXT_TABS</span><span class=cF0> | </span><span class=cF3>DOCF_NO_CURSOR</span><span class=cF0>),
<a name="l264"></a> *doc2 = </span><span class=cF5>DocRead</span><span class=cF0>(src_file, </span><span class=cF3>DOCF_PLAIN_TEXT_TABS</span><span class=cF0> | </span><span class=cF3>DOCF_NO_CURSOR</span><span class=cF0>);
<a name="l265"></a> </span><span class=cF9>CDocEntry</span><span class=cF0> *doc_e, **doc_sorted1, **doc_sorted2, **doc_unsorted1, **doc_unsorted2;
<a name="l266"></a> </span><span class=cF9>I64</span><span class=cF0> i, count1 = </span><span class=cFE>0</span><span class=cF0>, count2 = </span><span class=cFE>0</span><span class=cF0>,df_flags;
<a name="l267"></a> </span><span class=cF1>Bool</span><span class=cF0> res = </span><span class=cF3>FALSE</span><span class=cF0>;
<a name="l268"></a>
<a name="l269"></a> </span><span class=cF1>if</span><span class=cF0> (_df_flags)
<a name="l270"></a> df_flags = *_df_flags;
<a name="l271"></a> </span><span class=cF1>else</span><span class=cF0>
<a name="l272"></a> df_flags = </span><span class=cFE>0</span><span class=cF0>;
<a name="l273"></a> df_flags &amp;= </span><span class=cF3>DF_ABORT_ALL_FILES</span><span class=cF0>;
<a name="l274"></a>
<a name="l275"></a> doc_e = doc1-&gt;head.next;
<a name="l276"></a> </span><span class=cF1>while</span><span class=cF0> (doc_e != doc1)
<a name="l277"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l278"></a> </span><span class=cF1>if</span><span class=cF0> (doc_e-&gt;type_u8 == </span><span class=cF3>DOCT_TEXT</span><span class=cF0>)
<a name="l279"></a> doc_e-&gt;user_data = count1++; </span><span class=cF2>//user_data is the new y</span><span class=cF0>
<a name="l280"></a> doc_e = doc_e-&gt;next;
<a name="l281"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l282"></a>
<a name="l283"></a> doc_e = doc2-&gt;head.next;
<a name="l284"></a> </span><span class=cF1>while</span><span class=cF0> (doc_e != doc2)
<a name="l285"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l286"></a> </span><span class=cF1>if</span><span class=cF0> (doc_e-&gt;type_u8 == </span><span class=cF3>DOCT_TEXT</span><span class=cF0>)
<a name="l287"></a> doc_e-&gt;user_data = count2++; </span><span class=cF2>//user_data is the new y</span><span class=cF0>
<a name="l288"></a> doc_e = doc_e-&gt;next;
<a name="l289"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l290"></a>
<a name="l291"></a> doc_sorted1 = </span><span class=cF5>MAlloc</span><span class=cF0>(count1 * </span><span class=cF1>sizeof</span><span class=cF7>(</span><span class=cF9>CDocEntry</span><span class=cF0> *</span><span class=cF7>)</span><span class=cF0>);
<a name="l292"></a> doc_unsorted1 = </span><span class=cF5>MAlloc</span><span class=cF0>(</span><span class=cF7>(</span><span class=cF0>count1 + </span><span class=cFE>1</span><span class=cF7>)</span><span class=cF0> * </span><span class=cF1>sizeof</span><span class=cF7>(</span><span class=cF9>CDocEntry</span><span class=cF0> *</span><span class=cF7>)</span><span class=cF0>);
<a name="l293"></a> i = </span><span class=cFE>0</span><span class=cF0>;
<a name="l294"></a> doc_e = doc1-&gt;head.next;
<a name="l295"></a> </span><span class=cF1>while</span><span class=cF0> (doc_e != doc1)
<a name="l296"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l297"></a> </span><span class=cF1>if</span><span class=cF0> (doc_e-&gt;type_u8 == </span><span class=cF3>DOCT_TEXT</span><span class=cF0>)
<a name="l298"></a> {
<a name="l299"></a> doc_sorted1[i] = doc_e;
<a name="l300"></a> doc_unsorted1[i++] = doc_e;
<a name="l301"></a> }
<a name="l302"></a> doc_e = doc_e-&gt;next;
<a name="l303"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l304"></a> doc_unsorted1[i] = doc1;
<a name="l305"></a> </span><span class=cF5>QuickSortI64</span><span class=cF0>(doc_sorted1, count1, &amp;</span><span class=cF5>DiffEntriesCompare</span><span class=cF0>);
<a name="l306"></a>
<a name="l307"></a> doc_sorted2 = </span><span class=cF5>MAlloc</span><span class=cF0>(count2 * </span><span class=cF1>sizeof</span><span class=cF7>(</span><span class=cF9>CDocEntry</span><span class=cF0> *</span><span class=cF7>)</span><span class=cF0>);
<a name="l308"></a> doc_unsorted2 = </span><span class=cF5>MAlloc</span><span class=cF0>(</span><span class=cF7>(</span><span class=cF0>count2 + </span><span class=cFE>1</span><span class=cF7>)</span><span class=cF0> * </span><span class=cF1>sizeof</span><span class=cF7>(</span><span class=cF9>CDocEntry</span><span class=cF0> *</span><span class=cF7>)</span><span class=cF0>);
<a name="l309"></a> i = </span><span class=cFE>0</span><span class=cF0>;
<a name="l310"></a> doc_e = doc2-&gt;head.next;
<a name="l311"></a> </span><span class=cF1>while</span><span class=cF0> (doc_e != doc2)
<a name="l312"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l313"></a> </span><span class=cF1>if</span><span class=cF0> (doc_e-&gt;type_u8 == </span><span class=cF3>DOCT_TEXT</span><span class=cF0>)
<a name="l314"></a> {
<a name="l315"></a> doc_sorted2[i] = doc_e;
<a name="l316"></a> doc_unsorted2[i++] = doc_e;
<a name="l317"></a> }
<a name="l318"></a> doc_e = doc_e-&gt;next;
<a name="l319"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l320"></a> doc_unsorted2[i] = doc2;
<a name="l321"></a> </span><span class=cF5>QuickSortI64</span><span class=cF0>(doc_sorted2, count2, &amp;</span><span class=cF5>DiffEntriesCompare</span><span class=cF0>);
<a name="l322"></a>
<a name="l323"></a> res = </span><span class=cF5>DiffSub</span><span class=cF0>(doc1, &amp;df_flags, </span><span class=cFE>0</span><span class=cF0>, count1, </span><span class=cFE>0</span><span class=cF0>, count2, count1, count2,
<a name="l324"></a> doc_sorted1, doc_sorted2, doc_unsorted1, doc_unsorted2);
<a name="l325"></a> </span><span class=cF1>if</span><span class=cF0> (df_flags &amp; </span><span class=cF3>DF_MODIFIED</span><span class=cF0> &amp;&amp; !</span><span class=cF7>(</span><span class=cF0>df_flags &amp; </span><span class=cF3>DF_DONT_MODIFIED</span><span class=cF7>)</span><span class=cF0>)
<a name="l326"></a> </span><span class=cF5>DocWrite</span><span class=cF0>(doc1);
<a name="l327"></a>
<a name="l328"></a> </span><span class=cF1>if</span><span class=cF0> (</span><span class=cF5>DiffBins</span><span class=cF7>(</span><span class=cF0>doc1, doc2</span><span class=cF7>)</span><span class=cF0>)
<a name="l329"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l330"></a> </span><span class=cF6>&quot;$RED$Bin Data is Different$FG$\n&quot;</span><span class=cF0>;
<a name="l331"></a> res = </span><span class=cF3>TRUE</span><span class=cF0>;
<a name="l332"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l333"></a>
<a name="l334"></a> </span><span class=cF5>DocDel</span><span class=cF0>(doc1);
<a name="l335"></a> </span><span class=cF5>DocDel</span><span class=cF0>(doc2);
<a name="l336"></a> </span><span class=cF5>Free</span><span class=cF0>(doc_sorted1);
<a name="l337"></a> </span><span class=cF5>Free</span><span class=cF0>(doc_sorted2);
<a name="l338"></a> </span><span class=cF5>Free</span><span class=cF0>(doc_unsorted1);
<a name="l339"></a> </span><span class=cF5>Free</span><span class=cF0>(doc_unsorted2);
<a name="l340"></a> </span><span class=cF1>if</span><span class=cF0> (_df_flags)
<a name="l341"></a> *_df_flags = df_flags;
<a name="l342"></a>
<a name="l343"></a> </span><span class=cF1>return</span><span class=cF0> res;
<a name="l344"></a>}
</span></pre></body>
</html>

115
docs/System/Utils/Merge.CC.html
View file

@ -55,62 +55,63 @@ body {background-color:#fef1f0;}
<a name="l28"></a> </span><span class=cF1>else</span><span class=cF0>
<a name="l29"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l30"></a> </span><span class=cF1>if</span><span class=cF0> (</span><span class=cF5>AbsI64</span><span class=cF7>(</span><span class=cF0>tmpde1-&gt;datetime - tmpde-&gt;datetime</span><span class=cF7>)</span><span class=cF0> &gt; </span><span class=cF3>CDATE_FREQ</span><span class=cF0> * </span><span class=cFE>2</span><span class=cF0>) {</span><span class=cF2>//slop</span><span class=cF0>
<a name="l31"></a> </span><span class=cF6>&quot;%s&quot;</span><span class=cF0>, tmpde1-&gt;full_name;
<a name="l32"></a> </span><span class=cF6>'\n'</span><span class=cF0>;
<a name="l33"></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>)
<a name="l34"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l35"></a> </span><span class=cF1>if</span><span class=cF0> (</span><span class=cF5>FilesFindMatch</span><span class=cF7>(</span><span class=cF0>tmpde1-&gt;full_name, </span><span class=cF3>FILEMASK_TXT</span><span class=cF7>)</span><span class=cF0>)
<a name="l36"></a> </span><span class=cF5>Diff</span><span class=cF0>(tmpde-&gt;full_name, tmpde1-&gt;full_name, _df_flags);
<a name="l37"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l38"></a> }
<a name="l39"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l40"></a> }
<a name="l41"></a> tmpde1 = tmpde1-&gt;next;
<a name="l42"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l43"></a>}
<a name="l44"></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>&quot;/*&quot;</span><span class=cF0>, </span><span class=cF1>U8</span><span class=cF0> *src_files_find_mask=</span><span class=cF6>&quot;/*&quot;</span><span class=cF0>, </span><span class=cF1>U8</span><span class=cF0> *fu_flags=</span><span class=cF3>NULL</span><span class=cF0>)
<a name="l45"></a>{</span><span class=cF2>/*Merge text files from one list into another.</span><span class=cF0>
<a name="l46"></a></span><span class=cF2>Report files whos date/time is different.</span><span class=cF0>
<a name="l47"></a>
<a name="l48"></a></span><span class=cF2>&quot;+d&quot; will do </span><a href="https://zeal-operating-system.github.io/ZealOS/System/Utils/Diff.CC.html#l259"><span class=cF4>Diff</span></a><span class=cF2>() on files and prompt to</span><span class=cF0>
<a name="l49"></a></span><span class=cF2>merge changes from source files into</span><span class=cF0>
<a name="l50"></a></span><span class=cF2>destination files.</span><span class=cF0>
<a name="l51"></a></span><span class=cF2>*/</span><span class=cF0>
<a name="l52"></a> </span><span class=cF9>I64</span><span class=cF0> df_flags = </span><span class=cFE>0</span><span class=cF0>, fuf_flags = </span><span class=cFE>0</span><span class=cF0>;
<a name="l53"></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="l54"></a>
<a name="l55"></a> </span><span class=cF5>FlagsScan</span><span class=cF0>(&amp;fuf_flags, </span><span class=cF5>Define</span><span class=cF7>(</span><span class=cF6>&quot;ST_FILE_UTIL_FLAGS&quot;</span><span class=cF7>)</span><span class=cF0>, </span><span class=cF6>&quot;+r&quot;</span><span class=cF0>);
<a name="l56"></a> </span><span class=cF5>FlagsScan</span><span class=cF0>(&amp;fuf_flags, </span><span class=cF5>Define</span><span class=cF7>(</span><span class=cF6>&quot;ST_FILE_UTIL_FLAGS&quot;</span><span class=cF7>)</span><span class=cF0>, fu_flags);
<a name="l57"></a> </span><span class=cF1>if</span><span class=cF0> (fuf_flags &amp; ~</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="l58"></a> </span><span class=cF5>throw</span><span class=cF0>(</span><span class=cF6>'FUF'</span><span class=cF0>);
<a name="l59"></a> </span><span class=cF5>PrintWarn</span><span class=cF0>(</span><span class=cF6>&quot;This is based strictly on file dates.\n&quot;</span><span class=cF0>);
<a name="l60"></a> tmpde1 = </span><span class=cF5>FilesFind</span><span class=cF0>(src_files_find_mask, fuf_flags &amp; </span><span class=cF3>FUG_FILES_FIND</span><span class=cF0>);
<a name="l61"></a> tmpde2 = </span><span class=cF5>FilesFind</span><span class=cF0>(dst_files_find_mask, fuf_flags &amp; </span><span class=cF3>FUG_FILES_FIND</span><span class=cF0>);
<a name="l62"></a> fuf_flags &amp;= </span><span class=cF3>FUF_DIFF</span><span class=cF0>;
<a name="l63"></a> </span><span class=cF5>Merge2</span><span class=cF0>(tmpde1, tmpde2, &amp;fuf_flags, &amp;df_flags);
<a name="l64"></a> </span><span class=cF5>DirTreeDel</span><span class=cF0>(tmpde1);
<a name="l65"></a> </span><span class=cF5>DirTreeDel</span><span class=cF0>(tmpde2);
<a name="l66"></a>}
<a name="l67"></a>
<a name="l68"></a>#</span><span class=cF1>help_index</span><span class=cF0> </span><span class=cF6>&quot;Utils;Cmd Line (Typically)&quot;</span><span class=cF0>
<a name="l69"></a>
<a name="l70"></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>&quot;/*&quot;</span><span class=cF0>, </span><span class=cF9>CDate</span><span class=cF0> cdt=</span><span class=cFE>0</span><span class=cF0>, </span><span class=cF1>U8</span><span class=cF0> *fu_flags=</span><span class=cF3>NULL</span><span class=cF0>)
<a name="l71"></a>{</span><span class=cF2>//Report files newer than a certain date.</span><span class=cF0>
<a name="l72"></a> </span><span class=cF9>I64</span><span class=cF0> fuf_flags = </span><span class=cFE>0</span><span class=cF0>;
<a name="l73"></a> </span><span class=cF9>CDirEntry</span><span class=cF0> *tmpde, *tmpde1;
<a name="l74"></a>
<a name="l75"></a> </span><span class=cF1>if</span><span class=cF0> (!cdt)
<a name="l76"></a> cdt = </span><span class=cFB>sys_compile_time</span><span class=cF0>;
<a name="l77"></a> </span><span class=cF5>FlagsScan</span><span class=cF0>(&amp;fuf_flags, </span><span class=cF5>Define</span><span class=cF7>(</span><span class=cF6>&quot;ST_FILE_UTIL_FLAGS&quot;</span><span class=cF7>)</span><span class=cF0>, </span><span class=cF6>&quot;+r+F&quot;</span><span class=cF0>);
<a name="l78"></a> </span><span class=cF5>FlagsScan</span><span class=cF0>(&amp;fuf_flags, </span><span class=cF5>Define</span><span class=cF7>(</span><span class=cF6>&quot;ST_FILE_UTIL_FLAGS&quot;</span><span class=cF7>)</span><span class=cF0>, fu_flags);
<a name="l79"></a> tmpde = tmpde1 = </span><span class=cF5>FilesFind</span><span class=cF0>(files_find_mask, fuf_flags);
<a name="l80"></a> </span><span class=cF1>while</span><span class=cF0> (tmpde)
<a name="l81"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l82"></a> </span><span class=cF1>if</span><span class=cF0> (tmpde-&gt;datetime &gt; cdt)
<a name="l83"></a> </span><span class=cF6>&quot;%s\n&quot;</span><span class=cF0>, tmpde-&gt;full_name;
<a name="l84"></a> tmpde = tmpde-&gt;next;
<a name="l85"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l86"></a> </span><span class=cF5>DirTreeDel</span><span class=cF0>(tmpde1);
<a name="l87"></a>}
<a name="l31"></a> </span><span class=cF6>&quot;\n$LTRED$%s$FG$\n&quot;</span><span class=cF0>, tmpde-&gt;full_name;
<a name="l32"></a> </span><span class=cF6>&quot;$LTGREEN$%s$FG$&quot;</span><span class=cF0>, tmpde1-&gt;full_name;
<a name="l33"></a> </span><span class=cF6>'\n'</span><span class=cF0>;
<a name="l34"></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>)
<a name="l35"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l36"></a> </span><span class=cF1>if</span><span class=cF0> (</span><span class=cF5>FilesFindMatch</span><span class=cF7>(</span><span class=cF0>tmpde1-&gt;full_name, </span><span class=cF3>FILEMASK_TXT</span><span class=cF7>)</span><span class=cF0>)
<a name="l37"></a> </span><span class=cF5>Diff</span><span class=cF0>(tmpde-&gt;full_name, tmpde1-&gt;full_name, _df_flags);
<a name="l38"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l39"></a> }
<a name="l40"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l41"></a> }
<a name="l42"></a> tmpde1 = tmpde1-&gt;next;
<a name="l43"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l44"></a>}
<a name="l45"></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>&quot;/*&quot;</span><span class=cF0>, </span><span class=cF1>U8</span><span class=cF0> *src_files_find_mask=</span><span class=cF6>&quot;/*&quot;</span><span class=cF0>, </span><span class=cF1>U8</span><span class=cF0> *fu_flags=</span><span class=cF3>NULL</span><span class=cF0>)
<a name="l46"></a>{</span><span class=cF2>/*Merge text files from one list into another.</span><span class=cF0>
<a name="l47"></a></span><span class=cF2>Report files whos date/time is different.</span><span class=cF0>
<a name="l48"></a>
<a name="l49"></a></span><span class=cF2>&quot;+d&quot; will do </span><a href="https://zeal-operating-system.github.io/ZealOS/System/Utils/Diff.CC.html#l260"><span class=cF4>Diff</span></a><span class=cF2>() on files and prompt to</span><span class=cF0>
<a name="l50"></a></span><span class=cF2>merge changes from source files into</span><span class=cF0>
<a name="l51"></a></span><span class=cF2>destination files.</span><span class=cF0>
<a name="l52"></a></span><span class=cF2>*/</span><span class=cF0>
<a name="l53"></a> </span><span class=cF9>I64</span><span class=cF0> df_flags = </span><span class=cFE>0</span><span class=cF0>, fuf_flags = </span><span class=cFE>0</span><span class=cF0>;
<a name="l54"></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="l55"></a>
<a name="l56"></a> </span><span class=cF5>FlagsScan</span><span class=cF0>(&amp;fuf_flags, </span><span class=cF5>Define</span><span class=cF7>(</span><span class=cF6>&quot;ST_FILE_UTIL_FLAGS&quot;</span><span class=cF7>)</span><span class=cF0>, </span><span class=cF6>&quot;+r&quot;</span><span class=cF0>);
<a name="l57"></a> </span><span class=cF5>FlagsScan</span><span class=cF0>(&amp;fuf_flags, </span><span class=cF5>Define</span><span class=cF7>(</span><span class=cF6>&quot;ST_FILE_UTIL_FLAGS&quot;</span><span class=cF7>)</span><span class=cF0>, fu_flags);
<a name="l58"></a> </span><span class=cF1>if</span><span class=cF0> (fuf_flags &amp; ~</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="l59"></a> </span><span class=cF5>throw</span><span class=cF0>(</span><span class=cF6>'FUF'</span><span class=cF0>);
<a name="l60"></a> </span><span class=cF3>ST_WARN_ST</span><span class=cF0> </span><span class=cF6>&quot;This is based strictly on file dates.\n&quot;</span><span class=cF0>;
<a name="l61"></a> tmpde1 = </span><span class=cF5>FilesFind</span><span class=cF0>(src_files_find_mask, fuf_flags &amp; </span><span class=cF3>FUG_FILES_FIND</span><span class=cF0>);
<a name="l62"></a> tmpde2 = </span><span class=cF5>FilesFind</span><span class=cF0>(dst_files_find_mask, fuf_flags &amp; </span><span class=cF3>FUG_FILES_FIND</span><span class=cF0>);
<a name="l63"></a> fuf_flags &amp;= </span><span class=cF3>FUF_DIFF</span><span class=cF0>;
<a name="l64"></a> </span><span class=cF5>Merge2</span><span class=cF0>(tmpde1, tmpde2, &amp;fuf_flags, &amp;df_flags);
<a name="l65"></a> </span><span class=cF5>DirTreeDel</span><span class=cF0>(tmpde1);
<a name="l66"></a> </span><span class=cF5>DirTreeDel</span><span class=cF0>(tmpde2);
<a name="l67"></a>}
<a name="l68"></a>
<a name="l69"></a>#</span><span class=cF1>help_index</span><span class=cF0> </span><span class=cF6>&quot;Utils;Cmd Line (Typically)&quot;</span><span class=cF0>
<a name="l70"></a>
<a name="l71"></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>&quot;/*&quot;</span><span class=cF0>, </span><span class=cF9>CDate</span><span class=cF0> cdt=</span><span class=cFE>0</span><span class=cF0>, </span><span class=cF1>U8</span><span class=cF0> *fu_flags=</span><span class=cF3>NULL</span><span class=cF0>)
<a name="l72"></a>{</span><span class=cF2>//Report files newer than a certain date.</span><span class=cF0>
<a name="l73"></a> </span><span class=cF9>I64</span><span class=cF0> fuf_flags = </span><span class=cFE>0</span><span class=cF0>;
<a name="l74"></a> </span><span class=cF9>CDirEntry</span><span class=cF0> *tmpde, *tmpde1;
<a name="l75"></a>
<a name="l76"></a> </span><span class=cF1>if</span><span class=cF0> (!cdt)
<a name="l77"></a> cdt = </span><span class=cFB>sys_compile_time</span><span class=cF0>;
<a name="l78"></a> </span><span class=cF5>FlagsScan</span><span class=cF0>(&amp;fuf_flags, </span><span class=cF5>Define</span><span class=cF7>(</span><span class=cF6>&quot;ST_FILE_UTIL_FLAGS&quot;</span><span class=cF7>)</span><span class=cF0>, </span><span class=cF6>&quot;+r+F&quot;</span><span class=cF0>);
<a name="l79"></a> </span><span class=cF5>FlagsScan</span><span class=cF0>(&amp;fuf_flags, </span><span class=cF5>Define</span><span class=cF7>(</span><span class=cF6>&quot;ST_FILE_UTIL_FLAGS&quot;</span><span class=cF7>)</span><span class=cF0>, fu_flags);
<a name="l80"></a> tmpde = tmpde1 = </span><span class=cF5>FilesFind</span><span class=cF0>(files_find_mask, fuf_flags);
<a name="l81"></a> </span><span class=cF1>while</span><span class=cF0> (tmpde)
<a name="l82"></a> </span><span class=cF7>{</span><span class=cF0>
<a name="l83"></a> </span><span class=cF1>if</span><span class=cF0> (tmpde-&gt;datetime &gt; cdt)
<a name="l84"></a> </span><span class=cF6>&quot;%s\n&quot;</span><span class=cF0>, tmpde-&gt;full_name;
<a name="l85"></a> tmpde = tmpde-&gt;next;
<a name="l86"></a> </span><span class=cF7>}</span><span class=cF0>
<a name="l87"></a> </span><span class=cF5>DirTreeDel</span><span class=cF0>(tmpde1);
<a name="l88"></a>}
</span></pre></body>
</html>

11543
docs/index.html
View file

File diff suppressed because it is too large Load diff

3
src/Doc/ChangeLog.DD
View file

@ -1,4 +1,7 @@
$WW,1$$FG,5$$TX+CX,"ChangeLog"$$FG$
$IV,1$----08/13/21 15:57:12----$IV,0$
* Changed $LK+PU,"Merge2",A="MN:Merge2"$, $LK+PU,"DiffSel",A="MN:DiffSel"$, and $LK+PU,"PopUpDiffMenu",A="MN:PopUpDiffMenu"$ colors, added printing source and destination files along with some explanatory text in the popup window.
$IV,1$----08/13/21 13:21:32----$IV,0$
* Raised version number to 0.15.
* Fixed $LK+PU,"DVDImageWrite",A="MN:DVDImageWrite"$ bare-metal AHCI disc burning, needs some cleanup.

BIN
src/Doc/HelpIndex.DD
View file

Binary file not shown.

2
src/System/Define.CC
View file

@ -15,7 +15,7 @@ U0 LoadDocDefines()
//$LK,"DD_BOOT_HIGH_LOC_DVD",A="FF:::/System/Boot/BootDVD.CC,DD_BOOT_HIGH_LOC_DVD"$
$TR,"LineRep"$
$ID,2$DefinePrint("DD_ZEALOS_LOC","95,070");
$ID,2$DefinePrint("DD_ZEALOS_LOC","95,072");
$ID,-2$
DefinePrint("DD_MP_VECT", "%08X", MP_VECT_ADDR);
DefinePrint("DD_MP_VECT_END", "%08X", MP_VECT_ADDR + COREAP_16BIT_INIT_END - COREAP_16BIT_INIT - 1);

15
src/System/Utils/Diff.CC
View file

@ -11,10 +11,11 @@ I64 PopUpDiffMenu()
I64 i;
CDoc *doc = DocNew;
DocPrint(doc, "$$CM+LX,2,4$$$$FG$$$$BT,\"USE FILE1\",LE=DS_USE_FILE1$$"
"$$CM+LX,24,0$$$$CYAN$$$$BT,\"USE FILE2\",LE=DS_USE_FILE2$$"
"$$CM+LX,2,4$$$$FG$$$$BT,\"REMAINDER ALL FILE1\",LE=DS_REMAINDER_1$$"
"$$CM+LX,24,0$$$$CYAN$$$$BT,\"REMAINDER ALL FILE2\",LE=DS_REMAINDER_2$$"
DocPrint(doc, "$$CM+LX,2,2$$$$LTRED$$FILE1$$FG$$ = DST.$$CM+LX,24,0$$$$LTGREEN$$FILE2$$FG$$ = SRC."
"$$CM+LX,2,4$$$$RED$$$$BT,\"USE FILE1\",LE=DS_USE_FILE1$$"
"$$CM+LX,24,0$$$$GREEN$$$$BT,\"USE FILE2\",LE=DS_USE_FILE2$$"
"$$CM+LX,2,4$$$$RED$$$$BT,\"REMAINDER ALL FILE1\",LE=DS_REMAINDER_1$$"
"$$CM+LX,24,0$$$$GREEN$$$$BT,\"REMAINDER ALL FILE2\",LE=DS_REMAINDER_2$$"
"$$CM+LX,2,4$$$$FG$$$$BT,\"ABORT FILE\",LE=DS_ABORT_FILE$$"
"$$CM+LX,24,0$$$$FG$$$$BT,\"ABORT ALL FILES\",LE=DOCM_CANCEL$$\n");
i = PopUpMenu(doc);
@ -46,7 +47,7 @@ U0 DiffSel(CDoc *doc, I64 *_df_flags, I64 j1_lo, I64 j1_hi, I64 j2_lo, I64 j2_hi
if (!(*_df_flags & (DF_ABORT_FILE | DF_ABORT_ALL_FILES)))
{
"$$RED$$";
"$$PURPLE$$";
if (0 <= j1_lo < count1)
"%d,", doc_unsorted1[j1_lo]->y + 1;
else if (0 <= j1_hi - 1 < count1)
@ -59,7 +60,7 @@ U0 DiffSel(CDoc *doc, I64 *_df_flags, I64 j1_lo, I64 j1_hi, I64 j2_lo, I64 j2_hi
"%d", doc_unsorted2[j2_hi - 1]->y + 1;
else
"***";
"---------------------$$FG$$\n";
"---------------------$$RED$$\n";
if (j1_lo <= 0)
i = 0;
else
@ -76,7 +77,7 @@ U0 DiffSel(CDoc *doc, I64 *_df_flags, I64 j1_lo, I64 j1_hi, I64 j2_lo, I64 j2_hi
cur_l->flags = cur_l->flags & ~DOCF_PLAIN_TEXT | old_flags;
'\n';
}
"$$CYAN$$";
"$$GREEN$$";
if (j2_lo <= 0)
i = 0;
else

5
src/System/Utils/Merge.CC
View file

@ -28,7 +28,8 @@ U0 Merge2(CDirEntry *tmpde1, CDirEntry *tmpde2, I64 *_fuf_flags, I64 *_df_flags)
else
{
if (AbsI64(tmpde1->datetime - tmpde->datetime) > CDATE_FREQ * 2) {//slop
"%s", tmpde1->full_name;
"\n$$LTRED$$%s$$FG$$\n", tmpde->full_name;
"$$LTGREEN$$%s$$FG$$", tmpde1->full_name;
'\n';
if (Bt(_fuf_flags, FUf_DIFF))
{
@ -56,7 +57,7 @@ destination files.
FlagsScan(&fuf_flags, Define("ST_FILE_UTIL_FLAGS"), fu_flags);
if (fuf_flags & ~(FUG_FILES_FIND | FUF_DIFF))
throw('FUF');
PrintWarn("This is based strictly on file dates.\n");
ST_WARN_ST "This is based strictly on file dates.\n";
tmpde1 = FilesFind(src_files_find_mask, fuf_flags & FUG_FILES_FIND);
tmpde2 = FilesFind(dst_files_find_mask, fuf_flags & FUG_FILES_FIND);
fuf_flags &= FUF_DIFF;