Added wc command, accept multiple files or wildcards on grep, improved option parsing

Author: lennart-benschop

Makefile

@@ -1,7 +1,7 @@
 ASM=ez80asm
 
 .PHONY: binaries
-binaries: mos/memfill.bin mos/more.bin mos/font.bin mos/fontctl.bin mos/comp.bin mos/nano.bin bin/loadfont.bin bin/recode.bin mos/find.bin mos/grep.bin bin/sort.bin  bin/mc.bin bin/12amc.ovl 
+binaries: mos/memfill.bin mos/more.bin mos/font.bin mos/fontctl.bin mos/comp.bin mos/nano.bin bin/loadfont.bin bin/recode.bin mos/find.bin mos/grep.bin mos/wc.bin bin/sort.bin  bin/mc.bin bin/12amc.ovl 
 
 loadfont/src/codepages.h: loadfont/src/gen_codepages.py
 	cd loadfont/src;python3 gen_codepages.py >codepages.h
@@ -40,6 +40,10 @@ mos/grep.bin: grep/src/*.[ch]
 	mkdir -p bin
 	cd grep;make;mv bin/grep.bin ../mos
 
+mos/wc.bin: wc/src/*.[ch]
+	mkdir -p bin
+	cd wc;make;mv bin/wc.bin ../mos
+
 bin/sort.bin: sort/src/*.[ch]
 	mkdir -p bin
 	cd sort;make;mv bin/sort.bin ../bin

README.md

@@ -161,19 +161,22 @@ This program finds files (in the entire file system) whose name matches a
 specific pattern.
 
 Example:
+
 `find *.c`
 
 This will find all files whose name matches the pattern `*.c` in the whole
 file system.
 
 You can use the '>' character to redirect the output to a file. Example:
+
 `find *.asm >all_asmfiles.txt`
 
 ### grep
 
 This program searches test files for specific strings.
 
 Example:
+
 `grep dirlist *.c`
 
 This will find all lines containing "dirlist" in all C source files.
@@ -183,10 +186,13 @@ ASCII letters. You can also enclose the search string in double quotes to
 search for a string containint spaces"
 
 Example:
+
 `grep -i "these few words" *.txt`
 
-You can use the '>' character to redirect the output to a file. Example:
-`grep dirlist *.c >results.txt`
+You can use the '>' character to redirect the output to a file and you
+can have multiple file names or wildcards. Example:
+
+`grep dirlist *.c *.h  >results.txt`
 
 ### sort
 
@@ -201,6 +207,24 @@ Example:
 
 `sort myfile.txt >sorted.txt`
 
+THe proghram has the follwoignoptions: -f to sort case-insensitive and -r
+to sort in reverse order.
+
+### wc
+
+This program counts lines, words and characters in one or more files.
+It uses the options -l, -w and -c to specify that lines words and characters
+must be counted. If none are specified, all are counted.
+
+Example:
+
+`wc -w *.c`
+
+Count only words in all C source files
+
+`wc readme.txt info.txt`
+
+Count lines, words and characters in readme.txt and info.txt
 
 ### nano
 

bin/sort.bin

@@ -10,6 +10,15 @@
 #include <stdbool.h>
 #include <mos_api.h>
 
+static char *my_index(char *s, char c)
+{
+  while (*s) {
+    if (*s == c)
+      return s;
+    s++;
+  }
+  return NULL;
+}
 
 static bool glob_is_match(char *name, char *pat)
 {
@@ -34,6 +43,7 @@ static bool glob_is_match(char *name, char *pat)
 }
 
 bool nocase = false;
+bool singlefile = false;
 
 static char buf[1024];
 static char linebuf[256];
@@ -107,8 +117,11 @@ static void search_file(char *fname, char *string_pat)
   file_idx = 0;
   buf_filled = 0;
   while (nextline()) {
-    if (str_match(linebuf,string_pat))
-      printf("%s: %s\n",fname,linebuf);
+    if (str_match(linebuf,string_pat)) {
+      if (!singlefile)
+	printf("%s:",fname);
+      printf("%s\n",linebuf);
+    }
   }
   fclose(f);
 }
@@ -117,31 +130,44 @@ static void search_file(char *fname, char *string_pat)
 int
 main(int argc, char *argv[])
 {
-  unsigned int nopts = 0;
+  int nopts = 0;
   DIR dir_struct;
   FILINFO file_struct;
   int res;
-  
-  if (argc < 3) {
-    fprintf(stderr,"Usage: grep [-i] <string> <files>\n");
-    return 19;
+  char *pat;
+
+  for (;;) {
+    if (argc < nopts+3) {
+      fprintf(stderr,"Usage: grep [-i] <string> <files>\n");
+      return 19;
+    }
+    if (strcmp(argv[nopts+1],"-i")==0) {
+      nocase = true;
+      nopts += 1;
+    } else {
+      break;
+    }
   }
-  if (strcmp(argv[1],"-i")==0) {
-    nocase = true;
-    nopts += 1;
+  pat = argv[1+nopts];
+  if (nopts+3 == argc &&
+      my_index(argv[nopts+2],'*')==0 &&
+      my_index(argv[nopts+2],'?')==0) { /* single file no wildcard */
+    singlefile = true;
   }
-  res = ffs_dopen(&dir_struct,".");
-  if (res == 0) {
-    for (;;) {
-      res = ffs_dread(&dir_struct,&file_struct);
-      if (res != 0 || file_struct.fname[0]==0)
-	break;
-      if ((file_struct.fattrib & 0x10) == 0 &&
-	  glob_is_match(file_struct.fname,argv[2+nopts])) {
-	search_file(file_struct.fname,argv[1+nopts]);
+  for (; nopts<argc-2; nopts++) {
+    res = ffs_dopen(&dir_struct,".");
+    if (res == 0) {
+      for (;;) {
+	res = ffs_dread(&dir_struct,&file_struct);
+	if (res != 0 || file_struct.fname[0]==0)
+	  break;
+	if ((file_struct.fattrib & 0x10) == 0 &&
+	    glob_is_match(file_struct.fname,argv[2+nopts])) {
+	  search_file(file_struct.fname,pat);
+	}
       }
+      ffs_dclose(&dir_struct);
     }
-    ffs_dclose(&dir_struct);
   }
   return 0;	 
 }

grep/src/main.c

@@ -25,15 +25,20 @@ int my_strcasecmp(const char *p,const char *q)
 }
 
 bool nocase;
+bool reverse;
 
 static int line_compare(const void *a, const void *b)
 {
   const char * const *l1 = a;
   const char * const *l2 = b;
+  int v;
   if (nocase)
-    return my_strcasecmp(*l1,*l2);
+    v=my_strcasecmp(*l1,*l2);
   else
-    return strcmp(*l1,*l2);
+    v=strcmp(*l1,*l2);
+  if (reverse)
+    v=-v;
+  return v;
 }
 
 
@@ -83,15 +88,23 @@ unsigned int nlines=0;
 int
 main(int argc, char *argv[])
 {
-  unsigned int nopts = 0;
+  int nopts = 0;
   unsigned int i;
-  if (argc < 2) {
-    fprintf(stderr,"Usage: sort [-f] <file>\n");
-    return 19;
-  }
-  if (strcmp(argv[1],"-f")==0) {
-    nocase = true;
-    nopts += 1;
+
+  for (;;) {
+    if (argc < nopts+2) {
+      fprintf(stderr,"Usage: sort [-f][-r] <file>\n");
+      return 19;
+    }
+    if (strcmp(argv[nopts+1],"-f")==0) {
+      nocase = true;
+      nopts += 1;
+    } else if (strcmp(argv[nopts+1],"-r")==0) {
+      reverse = true;
+      nopts += 1;
+    } else {
+      break;
+    }
   }
   f = fopen(argv[1+nopts],"r");
   while (nlines<MAX_LINES && nextline()) {

mos/grep.bin

@@ -124,19 +124,21 @@ main(int argc, char *argv[])
     count_words = true;
     count_chars = true;
   }
-  res = ffs_dopen(&dir_struct,".");
-  if (res == 0) {
-    for (;;) {
-      res = ffs_dread(&dir_struct,&file_struct);
-      if (res != 0 || file_struct.fname[0]==0)
-	break;
-      if ((file_struct.fattrib & 0x10) == 0 &&
-	  glob_is_match(file_struct.fname,argv[1+nopts])) {
-	nfiles++;
-	count_file(file_struct.fname);
+  for (; nopts<argc-1; nopts++) {
+    res = ffs_dopen(&dir_struct,".");
+    if (res == 0) {
+      for (;;) {
+	res = ffs_dread(&dir_struct,&file_struct);
+	if (res != 0 || file_struct.fname[0]==0)
+	  break;
+	if ((file_struct.fattrib & 0x10) == 0 &&
+	    glob_is_match(file_struct.fname,argv[1+nopts])) {
+	  nfiles++;
+	  count_file(file_struct.fname);
+	}
       }
+      ffs_dclose(&dir_struct);
     }
-    ffs_dclose(&dir_struct);
   }
   if (nfiles>1) show_line(total_lines, total_words, total_chars, "total");
   return 0;