Compare commits

..

3 Commits

Author SHA1 Message Date
69f9945fe0
remove fclose() because it's already called in main.c 2025-11-02 20:28:35 +01:00
0aa5c5e9e3
update gitignore 2025-11-02 20:25:54 +01:00
ed4a9c7520
sync linux folder 2025-11-02 20:24:02 +01:00
3 changed files with 43 additions and 6 deletions

4
.gitignore vendored
View File

@ -7,3 +7,7 @@ graphicalGame.o
wordsalad wordsalad
wordsalad_initial.exe wordsalad_initial.exe
runTests.exe runTests.exe
testwords_delims.txt
testwords_empty.txt
testwords_simple.txt
.vscode

View File

@ -1,4 +1,5 @@
#include "input.h" #include "input.h"
#include <stdio.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
@ -6,7 +7,39 @@
// eine Funktion implementieren, die ein einzelnes Wort aus einer Textdatei (words.txt) einliest und als C-String zurückgibt. // eine Funktion implementieren, die ein einzelnes Wort aus einer Textdatei (words.txt) einliest und als C-String zurückgibt.
// Read words from file and store in 'words' array // Read words from file and store in 'words' array
int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount) int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
{ {
char buffer[MAX_WORD_LEN];
unsigned int count = 0;
if (file == NULL)
{
return 1;
}
while (fgets(buffer, sizeof(buffer), file) != NULL)
{
// Zerlege Zeile in einzelne Wörter anhand der Trennzeichen
char *token = strtok(buffer, " ,;\n");
while (token != NULL && count < maxWordCount)
{
// In Großbuchstaben umwandeln
for (int i = 0; token[i] != '\0'; i++)
{
token[i] = toupper((unsigned char)token[i]);
}
// Token in das words-Array kopieren
strncpy(words[count], token, MAX_WORD_LEN - 1);
words[count][MAX_WORD_LEN - 1] = '\0'; // sicher terminieren
count++;
// Nächsten Token holen
token = strtok(NULL, " ,;\n");
}
}
return count;
} }

View File

@ -13,7 +13,8 @@ int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
char buffer[MAX_WORD_LEN]; char buffer[MAX_WORD_LEN];
unsigned int count = 0; unsigned int count = 0;
if (file == NULL) { if (file == NULL)
{
return 1; return 1;
} }
@ -24,7 +25,8 @@ int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
while (token != NULL && count < maxWordCount) while (token != NULL && count < maxWordCount)
{ {
// In Großbuchstaben umwandeln // In Großbuchstaben umwandeln
for (int i = 0; token[i] != '\0'; i++) { for (int i = 0; token[i] != '\0'; i++)
{
token[i] = toupper((unsigned char)token[i]); token[i] = toupper((unsigned char)token[i]);
} }
@ -39,7 +41,5 @@ int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
} }
} }
fclose(file);
return count; return count;
} }