From ebc2f8c50a8daa6ca1dccaae0ec72ba6b7307a38 Mon Sep 17 00:00:00 2001
From: Chris Nutter <cdnutter@gmail.com>
Date: Sat, 11 May 2019 20:03:55 -0700
Subject: [PATCH] woooooo

---
 diff-rcm | Bin 23152 -> 23152 bytes
 diff.c   |  22 ++++++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/diff-rcm b/diff-rcm
index a901bbfea597e18298dc057251d66ac862a328e3..95ae52f29518d926321427489a87a09fb5afb818 100755
GIT binary patch
delta 2013
zcmZ8iZERFU6n*o$Efia~U)zsuVcW8#Vvx3mZnu?3TDlvybrE8UK#2)T4T_pb0%>U^
zi+RPcE+{(11ocNX#6U2y`tS$JM=gyehD5<lMOv}iVjsAMHM9u{l<~}5(h5!9oW1AV
zGw;sKebeL#mOR1w8d!SiJWc(T@@956J6uE23|d9{(kxcRLpk0^5?Ux`G_R0Q(*m$h
zr^w$slcAW;c_z)g^_a7}g0dD;mRDwVq$2Bpkz1~5(O{xavxlaIhz4!bD1ofacy1VK
z<|M%WnLNLjNzXVupG1^t)HFt*!{ntGeM6>G(sVXWz34bhaBNqG5!0~lGrUEHm^54=
zLl+qul;Ki!f5;rHdiI>t6VSAEq3G3+nJA6!<}JA{_9Ne%>x#TwBH!cMsvvW*oM}+b
z6x(fw4%D=f`V6T~seU@Et|GOG)T!lA_sy#Hr20r5mg+XB!Rr1%bl~3nkMqjBw8)Uu
zR?j-U<SZrU5vf)_=*%H8CdHfw#S{{|q&OvapH|~gv`Zs(gH(Tk8o4LmELK}_LqVob
z$|q;d<D`y~`iN9NRBF%;IL~N}s$<%4kfxCXQFrcLq)s(;x?UFG$8H{n7l#?YEyP(J
zBD%qzb4Sb<p;*w4W&ZXAs2|J$7Ij_3&(M~C(P{g5m8&Q+|E>_G(E%3Sl7Z1ag?CpA
z`zy?48eK}*TMfZ9UZOzulxeh5P@sY*DUhGZ_o*^qimoC$Qw0?&P_1tokCL)!i;`Rv
zJ*5H%1&u1WjU}Qmn&G+%_R5dPG_H~2Q9+y(N;^jimZ90b4o%~|B?Wv{{x(;q8%!D&
z8Nzpkqe)`t+O6;MUuDjs619O(-x2~_6XYuk>#{BsD{dZf)5TV-a0g=p@415yp`>g~
zkJSBqt^1HW;Zmu|DcEB*3>QQwwgR)?adF{Z64CON+$QA%Mj4`L@D9$anTQpNxCO#b
z#3n^df~X*(QxQoJ`9!?02zgDU67i)XY!H)^>Ma))AuoloLShn%83l8Zhz34TytrvK
zju6}j#Jz!tii;9)MiH{OP9laBA&c8e#LWV0X~{aqmRsHP({<L)-}byPSI3TE15)^H
z&pT|V6)RoJ*c$8WGCyNY*3I(MnU-C3)Deka7Q%~WnH&}(L*j@KVPM`BAzqR3s1W;s
z@jr$54A?#<#Cc%%xDW}+12fR^-m5|^0d@n!z&P+lV9#Gd>;pO`;0Lw?&jXJD6T0@i
z)?;G=T+rTYm;e|6hJoGJg?J4(2s{Yv`CEt+G6u$hc?lsVfy;n-XtEyQGT@GXglGlE
zfjfW!zTH<*G>T<bqG7baoGb}mJj?JL<zM(J^xk3KR_k8$I*4AZe+czyjSpwNsW)Y&
zrCiW6=FF8Bi}n$o&Ah1AqnG}{>uVRVgM4GH2jeb`{roV-BtHqcYK&j5b>kqW5IDwp
zzQ3HU<#m3UyAfj_--U4xKa3F$HU8>fsAo*@yZ#0Gk_o<`uAE)sjddPo^XKY3jfL1H
z+3+)Eg=JBiD$9#qkb2wyb$y*mkYxv;Z{Xk7dCCg0x2^YOtx;J4aNR14)vt2wK^FhG
zG1nSRKbB(sWb`{&n7_NSfHhdhRyuW7!cPV|SlFr#-bhK`oGa(kv>|J8^XE)2X4d5v
eUj}R8+3PFQXZ}I+=JmDd4L(Y3u%hcH^#1_Z$e+Lf

delta 2026
zcmZ9NZERCj9LDdtdy&qLGDk-pgLbfF66;{dws!22ZLHyLSribrfzxEb#zw}vxH*bK
zs<sts8NQtOh15hpn1Etfa`_<0WCG$FF~pFVA?O4g7pT&O35zTqpK}h`lqEaQeV*U{
z{O`TzoVLj$Bzc4kR1!;5h9dr&Xe~LB6)ur(N{vU=qFKa6^+yVV=fL!sR=a{rNgc!-
zOi`4Owh@<#EuvuzX=|ieB20xe3x#=7nj9FkQQ^=g1!6X&DN59r2x(SP624#ZD>|ZN
z1Y({_dxqDTA?*^sk1d=n+Z>lQgS=)aoj<@=|KoAV-{(9DUOc3SPP?8zWpjqnfWDBO
zPj1jxv+coH9&Xle-z_Awme*fJy&l_T>is1zOWG&tVouLY(=C#2lGM)WfoZxy(gsQI
zRe-(;>MI_qiJrXQf9+;T?{K<pdTxz~?Uj<A=Je?Y=Ps4-6AqU?2p3AYpF=x!&2|I>
z{PHeV{Qj-8MTOla3mZ5co~EgiDw67)elDobtg(HeRD~v<u!Ud3QiimpfT}H0DK;i;
z-g15i57zGcxr#ENnB(^t!)^xC1XuxZ6Cmol3N{ROLdC?WZ^X1t@<N{(%e;)z=y#!$
zBx?VO&)PJm_iO$9Dw=xtI?8beUs4YZ&CsL1<aPBQ#zNXoaGVb-M)ONNYB4j9p?ydT
z3J{DGgM_p$;UWdXte0kvFsr5EAB?ZlxFI4gk#VLlZehZO!Yr2LIbm|8c}f_IG*!YV
z!c>Q4hg;<cZ4uewPhrANQ8z4!Ec-?hyoX|bl!_O|>81XB2VIr3)jp7mG#zh>*Eg}9
zNi1sIIFqxD*w$dfu&`?<u$KMWE?VvI&a%iXLuMs;M$FMm$lveg`W_~>NEU8^($jQx
z?t8ff_y}Tp@-MMx1YZk!jBnYp9LjRtL65{6IPTZh!$p0QsIQelp9m%pcw|6DFpi*5
z1_L5UBFK@!4<bk)NRz=05ts<Z$HiSTusia!Tye;xKqMn5`B4S|dUEcfl@Y|q_RH+3
zDB=$nmBAem@P`Y?V5WmN<`1_;29G<8qP%Ab={3UhEGmi9ea_Yy<#xV2CClkO=Ue1c
zBjze1WVdlF-$TeN#_a`znPn~A{!agvj@BNxtGB(Q$JN*RVo!&^%jIu#ZSH7mbNRbE
zcevVHx;A&V_PBbt`(14vxXLgNFFBYRj9*}^00-^(&x~2QUSzDE>m|lIxsEWl7aG6J
z*deI<3S(!X^;a27@EmHzCny1RL+gLXd}tin4s9M~Y!CD-^bpj24fCO$(1faNRGLjR
zz}I;K>V{gcqXD%324mgOz0kLz%{Li4!aejn^dfW|ItiVP1KONmY#FrT560F(<IrBH
zm3m7H$pP9@I)`-A9i@d;?ReD*96F_H=Bzi=m6_@4ZR<lb6#iAC?Bs_LOE88<oZ=}7
zl^1Xx$NyvWw^C=miG>NnO;xGEsV)~0H_`kuCuyQp828W?jGxih%AE5iu#ozH=i!=n
z4)DdLgJn+j>=pV;*#hFA#KRlpV+_zLj5=+>h&E#U(6dlIKT6Md=BwkQbkwted_XN;
zCmEoNyiRrG8m;rr=d#s1A3vl~o|*JxVZQaQBD#@PzB|P@rwyf&Fny<b4ha|st8FS-
zM~~KQCt;)5cPqtG$$#$fH)brVJxtUI#kf#cY9+7Jtj5Kbsb6ba+gN4^l*-b85pBGt
F{tJ|<n*aa+

diff --git a/diff.c b/diff.c
index 5699436..a178da0 100644
--- a/diff.c
+++ b/diff.c
@@ -5,7 +5,7 @@
 #include "diff.h"
 #include "pa.h"
 
-// ========================================================================== //
+// ================================================================ //
 
 void init(int argc, const char* argv[]);
 void setoption(const char* arg, const char* s, const char* t, int* value);
@@ -21,23 +21,25 @@ int sideside(const char* filename1, const char* filename2);
 void quiet(const char* filename1, const char* filename2);
 void loud(const char* filename1, const char* filename2);
 
-// ================================================================= //
+// ================================================================ //
 
 int main(int argc, const char* argv[]) {
 
   init(--argc, ++argv);
   loadfiles(files[0], files[1]);
 
-  if (!showcontext && !showunified && !showsidebyside && !showleftcolumn) { normal(files[0], files[1]); }
-  if (showsidebyside)                                                     { sideside(files[0], files[1]); printf("\n"); }
-  if (showbrief)                                                          { quiet(files[0], files[1]); printf("\n"); }
-  if (report_identical)                                                   { loud(files[0], files[1]); printf("\n"); }
+  if (**argv != '-')      { normal(files[0], files[1]); printf("\n"); }
+
+  //if (!diffnormal)         { normal(files[0], files[1]); printf("\n"); }
+  if (showsidebyside)     { sideside(files[0], files[1]); printf("\n"); }
+  if (showbrief)          { quiet(files[0], files[1]); printf("\n"); }
+  if (report_identical)   { loud(files[0], files[1]); printf("\n"); }
 
   return 0;
 
 }
 
-// =============================================================== //
+// ================================================================ //
 
 void init(int argc, const char* argv[]) {
 
@@ -58,7 +60,6 @@ void init(int argc, const char* argv[]) {
 
     if (arg[0] != '-') {
       if (cnt == 2) {
-        fprintf(stderr, "apologies, this version of diff only handles two files\n");
         fprintf(stderr, "Usage: ./diff [options] file1 file2\n");
         exit(TOOMANYFILES_ERROR);
       } else { files[cnt++] = arg; }
@@ -75,6 +76,7 @@ void init(int argc, const char* argv[]) {
         (diffnormal || showcontext || showunified)) ||
         (showcontext && showunified) || (diffnormal &&
         (showcontext || showunified)))                   { diff_output_conflict_error(); }
+
 }
 
 void setoption(const char* arg, const char* s, const char* t, int* value) {
@@ -150,6 +152,6 @@ int sideside(const char* filename1, const char* filename2) {
   return 0;
 }
 void quiet(const char* filename1, const char* filename2) { if (pa_equal(p, q) == 0) { printf("The files are not equal.\n"); } }
-void loud(const char* filename1, const char* filename2) { if (pa_equal(p, q) == 1) { printf("The files are equal.\n"); } }
+void loud(const char* filename1, const char* filename2) { if (pa_equal(p, q) != 0) { printf("The files are equal.\n"); } }
 
-// ====================================================== //
+// ================================================================ //