--- lbbs/src/str_process.c 2025/05/05 14:27:57 1.2 +++ lbbs/src/str_process.c 2025/05/15 13:02:33 1.7 @@ -9,7 +9,7 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation; either version 3 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ @@ -20,19 +20,13 @@ #include #include -unsigned int split_line(const char *buffer, int max_len, int *p_eol) +int split_line(const char *buffer, int max_display_len, int *p_eol, int *p_display_len) { - size_t len = strnlen(buffer, LINE_BUFFER_LEN); - int display_len = 0; - unsigned int i = 0; + int i; *p_eol = 0; + *p_display_len = 0; - if (len == 0) - { - return 0; - } - - for (; i < len; i++) + for (i = 0; buffer[i] != '\0'; i++) { char c = buffer[i]; @@ -51,7 +45,7 @@ unsigned int split_line(const char *buff if (c == '\033' && buffer[i + 1] == '[') // Skip control sequence { i += 2; - while (i < len && buffer[i] != 'm') + while (buffer[i] != '\0' && buffer[i] != 'm') { i++; } @@ -60,45 +54,47 @@ unsigned int split_line(const char *buff if (c > 127 && c <= 255) // GBK chinese character { - if (display_len + 2 > max_len) + if (*p_display_len + 2 > max_display_len) { *p_eol = 1; break; } i++; - display_len += 2; + *p_display_len += 2; } else { - if (display_len >= max_len) + if (*p_display_len + 1 > max_display_len) { *p_eol = 1; break; } - display_len++; + (*p_display_len)++; } } return i; } -unsigned int split_file_lines(FILE *fin, int max_len, long *p_line_offsets, int max_line_cnt) +int split_file_lines(FILE *fin, int max_display_len, long *p_line_offsets, int max_line_cnt) { char buffer[LINE_BUFFER_LEN]; char *p_buf = buffer; - unsigned int line_cnt = 0; - unsigned int len = 0; + int line_cnt = 0; + int len = 0; int end_of_line = 0; + int display_len = 0; + p_line_offsets[line_cnt] = 0L; - while (fgets(p_buf, (int)(sizeof(buffer) - len), fin)) + while (fgets(p_buf, (int)sizeof(buffer) - len, fin)) { p_buf = buffer; while (1) { - len = split_line(p_buf, max_len, &end_of_line); + len = split_line(p_buf, max_display_len, &end_of_line, &display_len); - if (len == 0 || !end_of_line) + if (len == 0 || !end_of_line) // !end_of_line == EOF { break; }