Fixed Problem With Line Size

3 files changed, 21 insertions, 20 deletions

diff --git a/ouija.c b/ouija.c
index 74b66ff..96221db 100644
--- a/ouija.c
+++ b/ouija.c
@@ -6,19 +6,20 @@ int main(int argc, char **argv)
 {
 
 	FILE *dictionary = NULL;
+
 	switch (argc)
 	{
-	case 1:
-		if (checkIfFileExists("dictionary.dict") == 0)
-		{
-			dictionary = fopen("dictionary.dict", "r");
-		}
-		break;
-	case 2:
-		if (checkIfFileExists(argv[1]) == 1)
-		{
-			dictionary = fopen(argv[1], "r");
-		}
+		case 1:
+			if (checkIfFileExists("dictionary.dict") == 0)
+			{
+				dictionary = fopen("dictionary.dict", "r");
+			}
+			break;
+		case 2:
+			if (checkIfFileExists(argv[1]) == 1)
+			{
+				dictionary = fopen(argv[1], "r");
+			}
 	}
 
 	if (dictionary != NULL)
diff --git a/utils.c b/utils.c
index c08990c..4a2b4ce 100644
--- a/utils.c
+++ b/utils.c
@@ -14,27 +14,25 @@ int lineCounter(FILE *dictionary)
 	int words = 0;
 	if ( dictionary != NULL )
 	{
-		char line[256];
-		while ( !feof(dictionary) )
+		char line[MAX_LINE];
+		for( words; (!feof(dictionary)); words++ )
 		{
-			fgets(line, sizeof(line), dictionary);
-			words++;
+			fgets(line, MAX_LINE, dictionary);
 		}
-		words--;
 		rewind(dictionary);
+		words--;
 	}
-
 	return words;
 }
 
 char* getLine(FILE *dictionary, int lineNumber)
 {
-	char *line = (char *) calloc(256, sizeof(char));
+	char *line = (char *) calloc(MAX_LINE, sizeof(char));
 	if ( dictionary != NULL )
 	{
-		for ( int i = 0; (!feof(dictionary) && i != lineNumber - 1); i++)
+		for ( int i = 0; (!feof(dictionary) && i != lineNumber ); i++)
 		{
-			fgets(line, sizeof(line), dictionary);
+			fgets(line, MAX_LINE, dictionary);
 		}
 		rewind(dictionary);
 	}
diff --git a/utils.h b/utils.h
index 5a363a4..0b72df4 100644
--- a/utils.h
+++ b/utils.h
@@ -1,5 +1,7 @@
 #include <stdio.h>
 
+#define MAX_LINE 256
+
 int checkIfFileExists(char *path);
 int lineCounter(FILE *dictionary);
 char* getLine(FILE *dictionary, int line);