--- lbbs/src/str_process.c 2025/05/06 05:31:26 1.3 +++ lbbs/src/str_process.c 2025/05/15 12:05:32 1.6 @@ -20,12 +20,12 @@ #include #include -unsigned int split_line(const char *buffer, int max_len, int *p_eol) +unsigned 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; *p_eol = 0; + *p_display_len = 0; if (len == 0) { @@ -60,35 +60,37 @@ 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) +unsigned 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 end_of_line = 0; + int display_len = 0; + p_line_offsets[line_cnt] = 0L; while (fgets(p_buf, (int)(sizeof(buffer) - len), fin)) @@ -96,9 +98,9 @@ unsigned int split_file_lines(FILE *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; }