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 35d33c0..5123556 100755 Binary files a/wc and b/ww differ 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; }