Start_Windows/input.c

@@ -2,7 +2,7 @@
 #include <string.h>
 #include <ctype.h>
 
-static char *buffer;
+#define MAX_BUFFER_LEN 256
 
 // TODO?
 // eine Funktion implementieren, die ein einzelnes Wort aus einer Textdatei (words.txt) einliest und als C-String zurückgibt.
@@ -10,51 +10,29 @@ static char *buffer;
 // Read words from file and store in 'words' array
 int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
 {
-    int i = 0;
-    int word = 0;
-    int wordChar = 0;
-    int firstLetter = 0;
+    char buffer[MAX_BUFFER_LEN];
+    int count = 0;
+    char *teiler = ".,; !?\n";
 
-    if (file == NULL)
+    if(file == NULL)
     {
-        return 0;
+        printf("Fehler beim Öffnen von words.txt!\n");
+        return -1;
     }
 
-    fscanf(file, "%10s", buffer);
+    while(fgets(buffer, MAX_LINE_LEN, file))
+    {
+        const char *wort = strtok(buffer, teiler);
 
-    do
+        while(wort != NULL && count < maxWordCount)
         {
+            strncpy(words[count], wort, MAX_WORD_LEN-1);
+            words[count][MAX_WORD_LEN-1] = '\0';
+            count++;
 
-        if ((buffer[i] >= 'A') && (buffer[i] <= 'Z'))
-        {
-            if (!firstLetter)
-            {
-                firstLetter = 1;
+            wort = strtok(NULL, teiler);
+        }
     }
 
-            words[word][wordChar] = buffer[i];
-            wordChar++;
-        }
-        else if ((buffer[i] >= 'a') && (buffer[i] <= 'z'))
-        {
-            if (!firstLetter)
-            {
-                firstLetter = 1;
-            }
-
-            words[word][wordChar] = toupper(buffer[i]);
-            wordChar++;
-        }
-        else if (firstLetter)
-        {
-            words[word][wordChar] = '\0';
-            word++;
-            wordChar = 0;
-            firstLetter = 0;
-        }
-
-        i++;
-    } while ((i < MAX_LINE_LEN) && (word < maxWordCount));
-
-    return word+1; 
+    return count;
 }