stammjo100588/Info2Praktikum
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed Input.c to solve All Remaining Tests

Browse Source
This commit is contained in:
Jonas Stamm 2025-10-24 22:16:55 +02:00
parent 000bc1ebdf
commit a1cb0f9626
2 changed files with 50 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Start_Mac/input.c
View File

@ -9,13 +9,35 @@
int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount) int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
{ {
unsigned int count = 0; unsigned int count = 0;
int c;
unsigned int idx = 0;
while (count < maxWordCount && fscanf(file, "%s", words[count]) == 1) { if (!file) return 0;
for (int i = 0; words[count][i]; i++) {
words[count][i] = toupper((unsigned char)words[count][i]); while ((c = fgetc(file)) != EOF && count < maxWordCount) {
if (isalpha((unsigned char)c)) {
if (idx < MAX_WORD_LEN - 1) {
words[count][idx++] = (char) toupper((unsigned char)c);
} else {
// word too long: truncate remaining letters until delimiter
idx = MAX_WORD_LEN - 1;
}
} else {
if (idx > 0) {
words[count][idx] = '\0';
count++;
idx = 0;
}
// skip consecutive delimiters
} }
}
// If file ended while reading a word, terminate and count it
if (idx > 0 && count < maxWordCount) {
words[count][idx] = '\0';
count++; count++;
} }
return count; return count;
} }

28
Start_Windows/input.c
View File

@ -9,13 +9,35 @@
int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount) int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
{ {
unsigned int count = 0; unsigned int count = 0;
int c;
unsigned int idx = 0;
while (count < maxWordCount && fscanf(file, "%s", words[count]) == 1) { if (!file) return 0;
for (int i = 0; words[count][i]; i++) {
words[count][i] = toupper((unsigned char)words[count][i]); while ((c = fgetc(file)) != EOF && count < maxWordCount) {
if (isalpha((unsigned char)c)) {
if (idx < MAX_WORD_LEN - 1) {
words[count][idx++] = (char) toupper((unsigned char)c);
} else {
// word too long: truncate remaining letters until delimiter
idx = MAX_WORD_LEN - 1;
}
} else {
if (idx > 0) {
words[count][idx] = '\0';
count++;
idx = 0;
}
// skip consecutive delimiters
} }
}
// If file ended while reading a word, terminate and count it
if (idx > 0 && count < maxWordCount) {
words[count][idx] = '\0';
count++; count++;
} }
return count; return count;
} }