From 13eb71f4ee2d4231b67d8c4a2532fe63654fea13 Mon Sep 17 00:00:00 2001
From: NunoSempere <nuno.sempere@protonmail.com>
Date: Sat, 9 Sep 2023 00:05:34 +0200
Subject: [PATCH] rework usage a bit.

---
 makefile     |   6 +++---
 wc => ww     | Bin 17040 -> 17072 bytes
 wc.c => ww.c |  13 ++++++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)
 rename wc => ww (65%)
 rename wc.c => ww.c (88%)

diff --git a/makefile b/makefile
index 055c0a1..13bbdf6 100644
--- a/makefile
+++ b/makefile
@@ -8,8 +8,8 @@ CC=gcc
 # CC=tcc # <= faster compilation
 
 # Main file
-SRC=wc.c
-OUT=wc
+SRC=ww.c
+OUT=ww
 
 ## Flags
 DEBUG= #'-g'
@@ -31,7 +31,7 @@ format: $(SRC)
 
 test: $(OUT)
 	/bin/echo -e "123\n45 67" | ./$(OUT)
-	/bin/echo -n "" | ./wc
+	/bin/echo -n "" | ./ww
 	/bin/echo "  xx x" | ./$(OUT) -w
 	./$(OUT) $(SRC)
 	./$(OUT) nonexistent_file || true
diff --git a/wc b/ww
similarity index 65%
rename from wc
rename to ww
index 35d33c0902fd065aaed0e5011c29e172be093667..512355624fb218e3df54042edf909cdf920b4933 100755
GIT binary patch
delta 919
zcmYjPZAep57(VAt)1`BpvqTiVD`72~-)@RuT|e+D3&ONOC@P#K4Hb1YLQ}9=7g?C+
zPX<=j4}*%-8)EfC!AOF@j4+BmED8n+eg<mV={<KD9(eEbzRz>c`#$GzyF7TngS+<O
zh3n?8YEJ-CmWSwZqS}Z3l}|3g#aLbLuTVMZ;U*)7cU}!Qv^px^--_w|vSzS9PqM1z
zX4OZHcDD*4(W|-5G01r)JM{N(t2bvo6d~WEO-g~p8p!(~?>audtc_i-5T&1D`y4N|
z%!!g~roCkjU&<6ai)O_3v0$+iX@^m^#bw&YfPfi$)}<d|zI@%3QYD*h9#x1kXzv+w
zg(_96ulEn7v!|8Lhqm|ere6bNqBP-aVBVynRk6Kg6}b#x^E|VB4(Ji~60`AeZk6rK
z01BX#wbc5@M{JFMHC~;djl0Y&AZ^@1#I7eCGuyp6jb?;|qb1U`P*EcN63PW>qeApr
zs(?OXH*doIgME{~<w?U-NH-r$V)+BD4XB{b<*eds>zeqwdPgl^UE_2>V;rr@It-|W
zcsEZe8&|bJ=|jLKz!!ikfKI^Ai<Eu>l$R*o0GtMlf%`mJrZgKceg)10Mu5f^zF3B^
zTZf}VgUAD36V(QN5}8mKq+<{dkp>}>Dc%${0MiwkNw8R#CW!k)Z;a&D7RY{Mtne5t
z>}6_En685>(CnxT4GM-b2I4iu5a@3J|Lfd@vY`;DIf!~vV=M?v1Cux8L1TXiX|rTt
zxBS#%3czmiEx8!qA^MbEa&F2^jDL_1siU}_^rZEJD5TGGD1xL|Pnh=@*a(D_Nr0*F
zgN7p=qTvdS6o-&zl0IuBwkzM0WXc*D;Dntpz`&snf^7r%f;?pF!GW&EQ)e7<Y355T
zhh=?Nap@|ul$)S-|9eR{G3Q;u<zz4~QGbW`&)7myUd*EyFOWsSrcSc?#k(Xq--h3k
Hntan=BZV?-

delta 768
zcmY+Ce@IhN6vyv*v)pP+pPOt_$+Hk0vF2tvL*|^ee4_<LS`-mNn;?iv=s%$)46R`U
z?Sf4)78Uf5e;7~7NN|-AMN&hP3_|;FprEFKgmyc3L!!$&@AJ<2o?jQ<XgBoXQwX2?
z%?q0RG?F~|R0OLg1}QJ5c%cR~zLZCNbWr$YcxY3-oXNc&?}-k(2Ih+U7dAYvl@8T6
zUB)wk5IL-KCE>iM1jI)`kLdT@oa7A>W7~{%$J(_ikNsh6sWsTS3^z{8y`Dum7*or=
zSYI-w#WtaLiCN5-L!M1J*ttpC^>Wxbf=Xf<!{dCxB|Fw_^2{L&Ax3!1gP0fLc_q9&
z?2Kwj1xc8B5#Qqdn})vijNISu3%;;(#!QI&yf-xGuJeX|xoh2_tvWeunZocnpLtsj
zE~^vPEyZex@1>*Z^>-z8_BB%7(%$5knp@hWmexSC)X>-zpy`t36d|x*RW9QUHQMY7
zV;xBUDr1k4ZO94a2GWoGzQ))rQu)c)2C{aYF$3Oe3VE5{mkz^i`bsjw89FZ&z&M3G
z<Hb?z*@d|~=Ky}(K?CeH$Ag}InLR?aZnrS4O~)m;K7#ff_2_^4KvF+}v5#nFv_G#}
z&8OGnHgv5>udL?v@hh8Ym!%9$$_q<D8kp!0TMb00XwOzE>_Y$(biQ~JGU?#4Cn&m0
zR)hz7YA?MavMfH0kmOKgF^!iR;Us_OT*ALY6mm#rCC~VG8Yno7ySh+4M4t)<YI8*3
zs`9}x2ukDex1bc2FRFwu0?l$A)tC&aIurG}Zh?=+T~;w7rD8iQRK!XK@Rf>H4voo?
P5{K#8DhG_wP*uTS_2&c?

diff --git a/wc.c b/ww.c
similarity index 88%
rename from wc.c
rename to ww.c
index 5671e02..868bf77 100644
--- a/wc.c
+++ b/ww.c
@@ -31,9 +31,17 @@ int process_fn(int fn)
     return 0;
 }
 
+void usage(){
+        printf("Usage: ww file.txt\n");
+				printf("   or: cat file.txt | ww\n");
+}
+
 int main(int argc, char** argv)
 {
-    if (!isatty(STDIN_FILENO)) {
+    if(argc > 1 && argv[1][0] == '-' && argv[1][1] == 'h'){
+			usage();
+			return 0;
+		} else if (!isatty(STDIN_FILENO)) {
         return process_fn(STDIN_FILENO);
     } else if (argc > 1) {
         FILE* fp = fopen(argv[1], "r");
@@ -43,8 +51,7 @@ int main(int argc, char** argv)
         }
         return process_fn(fileno(fp));
     } else {
-        printf("Usage: ww file.txt\n");
-				printf("   or: cat file.txt | ww\n");
+			usage();
     }
     return 0;
 }