tabber builds without error

Author: Joshua Goller

ch-5/tabber/include/entab.h renamed to ch-5/tabber/include/tabber.h

@@ -20,3 +20,4 @@ int generate_stop_list(const int start, const int interval, int** tab_stops,
                        int* const tab_stops_len);
 int next_tab_stop(const int* const tab_stops, const int tab_stops_len,
                   const int column);
+int isdigits(const char* const string, const int len);

ch-5/tabber/src/detab.c

@@ -3,7 +3,7 @@
 #include <string.h>
 
 #include "common.h"
-#include "entab.h"
+#include "tabber.h"
 
 #define WHITESPACE '.'
 

ch-5/tabber/src/entab.c

@@ -3,7 +3,7 @@
 #include <string.h>
 
 #include "common.h"
-#include "entab.h"
+#include "tabber.h"
 
 #define TAB_CHAR '$'
 

ch-5/tabber/src/input.c

@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "entab.h"
+#include "tabber.h"
 
 static char usage[] =
     "usage: $tabber -b <entab|detab> -m <interval+start> -l <stops>\n";
@@ -121,19 +121,16 @@ static int parse_l(int* const i, const int argc, char** const argv,
   }
 
   // Read list of tab stop elements; verify that each tabstop is a number,
-  // returning when we find the first one that isn't. Start at arg
-  // immediately following -l
-  char* current_stop = argv[++(*i)];
+  // returning when we find the first one that isn't.
+  char* current_stop = NULL;
+  (*i)++;  // advance from -l to first tab stop
   while (*i < argc) {
-    // verify current stop is a number; quit if not.
-    for (int k = 0; k < (int)strlen(current_stop); k++) {
-      if (isdigit(current_stop[k]) == 0) {
-        return 0;
-      }
+    current_stop = argv[(*i)++];
+    if (isdigits(current_stop, (int)strlen(current_stop))) {
+      stop_list[stop_list_len++] = atoi(current_stop);
+    } else {
+      break;
     }
-    // copy stop to stop list, advance to next arg
-    stop_list[stop_list_len++] = atoi(current_stop);
-    current_stop = argv[++(*i)];
   }
 
   *tab_stops = stop_list;
@@ -170,6 +167,9 @@ int parse_flags(const int argc, char** const argv, int** tab_stops,
         if (parse_l(&i, argc, argv, tab_stops, tab_stops_len) == -1) {
           return -1;
         }
+        if (tab_stops == NULL) {
+          return -1;
+        }
         break;
       default:
         printf("tabber: error - invalid flag %s\n", current_arg);

ch-5/tabber/src/main.c

@@ -2,7 +2,7 @@
 #include <stdlib.h>
 
 #include "common.h"
-#include "entab.h"
+#include "tabber.h"
 
 int main(int argc, char** argv) {
   int len = 0;                  // current line length
@@ -28,13 +28,6 @@ int main(int argc, char** argv) {
       return -1;
   }
 
-  // Testing: input handling
-  printf("tab_stops (%d): ", tab_stops_len);
-  for (int i = 0; i < tab_stops_len; i++) {
-    printf("%d ", tab_stops[i]);
-  }
-  printf("\n");
-
   // do the thing
   while ((len = mygetline(line, MAXLEN)) > 0) {
     processed_line = behavior(line, len, tab_stops, tab_stops_len);

ch-5/tabber/src/misc.c

@@ -1,7 +1,8 @@
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "entab.h"
+#include "tabber.h"
 
 int generate_stop_list(const int start, const int interval, int** tab_stops,
                        int* const tab_stops_len) {
@@ -57,3 +58,14 @@ int next_tab_stop(const int* const tab_stops, const int tab_stops_len,
 
   return -1;
 }
+
+// isdigits(): if string contains only digits, return 1;
+// otherwise return 0.
+int isdigits(const char* const string, const int len) {
+  for (int i = 0; i < len; i++) {
+    if (isdigit(string[i]) == 0) {
+      return 0;
+    }
+  }
+  return 1;
+}

ch-5/tabber/tabber-test.sh

@@ -4,7 +4,7 @@ function valg(){
   valgrind -q --leak-check=full --show-leak-kinds=all --error-exitcode=42 $1
 }
 
-#./bin/tabber
+./bin/tabber
 printf "a         b" | valgrind -q --leak-check=full --show-leak-kinds=all --error-exitcode=42  ./bin/tabber -b entab
 printf "a\t\tb" | valgrind -q --leak-check=full --show-leak-kinds=all --error-exitcode=42 ./bin/tabber -b detab
 printf "a         b" | valgrind -q --leak-check=full --show-leak-kinds=all --error-exitcode=42 ./bin/tabber -b detab -l 0 5 10 15 20 25 30 35 40 45 50 55 60 65 70 75