From: Holger Schemel Date: Sun, 13 Nov 2022 22:03:14 +0000 (+0100) Subject: fixed drawing text from file that contains DOS style CR/LF line endings X-Git-Tag: 4.3.3.0~22 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=797ebac91e028bed534bf424cb04eb8aec401fba;p=rocksndiamonds.git fixed drawing text from file that contains DOS style CR/LF line endings --- diff --git a/src/libgame/text.c b/src/libgame/text.c index 280aae8a..ce855daf 100644 --- a/src/libgame/text.c +++ b/src/libgame/text.c @@ -351,11 +351,24 @@ char *GetTextBufferFromFile(char *filename, int max_lines) while (!checkEndOfFile(file) && num_lines < max_lines) { char line[MAX_LINE_LEN]; + char *line_ptr; + int line_len; // read next line of input file if (!getStringFromFile(file, line, MAX_LINE_LEN)) break; + line_len = strlen(line); + + // cut trailing line break (this can be newline and/or carriage return) + for (line_ptr = &line[line_len]; line_ptr >= line; line_ptr--) + if ((*line_ptr == '\n' || *line_ptr == '\r') && *(line_ptr + 1) == '\0') + *line_ptr = '\0'; + + // re-add newline (so the result is terminated by newline, but not CR/LF) + if (strlen(line) != line_len) + strcat(line, "\n"); + buffer = checked_realloc(buffer, strlen(buffer) + strlen(line) + 1); strcat(buffer, line);