--- lbbs/src/article_cache.c 2025/06/14 09:20:13 1.16 +++ lbbs/src/article_cache.c 2025/06/16 14:30:44 1.18 @@ -14,6 +14,8 @@ * * ***************************************************************************/ +#define _POSIX_C_SOURCE 200809L + #include "article_cache.h" #include "log.h" #include "lml.h" @@ -24,9 +26,8 @@ #include #include #include -#include -#define _POSIX_C_SOURCE 200809L #include +#include #define ARTICLE_HEADER_MAX_LEN 4096 #define ARTICLE_CONTENT_MAX_LEN 1024 * 1024 * 4 // 4MB @@ -108,7 +109,7 @@ int article_cache_generate(const char *c return -2; } - bzero(&cache, sizeof(cache)); + memset(&cache, 0, sizeof(cache)); // Generate article header / footer localtime_r(&(p_article->sub_dt), &tm_sub_dt); @@ -125,7 +126,7 @@ int article_cache_generate(const char *c header_len = strnlen(header, sizeof(header)); footer_len = strnlen(footer, sizeof(footer)); - header_line_cnt = split_data_lines(header, SCREEN_COLS, cache.line_offsets, MAX_SPLIT_FILE_LINES); + header_line_cnt = split_data_lines(header, SCREEN_COLS, cache.line_offsets, MAX_SPLIT_FILE_LINES, 1); if (header_len != cache.line_offsets[header_line_cnt]) { @@ -137,7 +138,7 @@ int article_cache_generate(const char *c cache.data_len = header_len + (size_t)lml_plain(content, content_f, ARTICLE_CONTENT_MAX_LEN); cache.line_total = header_line_cnt + - split_data_lines(content_f, SCREEN_COLS, cache.line_offsets + header_line_cnt, MAX_SPLIT_FILE_LINES - header_line_cnt); + split_data_lines(content_f, SCREEN_COLS, cache.line_offsets + header_line_cnt, MAX_SPLIT_FILE_LINES - header_line_cnt, 1); if (cache.data_len - header_len != (size_t)cache.line_offsets[cache.line_total]) { @@ -151,7 +152,7 @@ int article_cache_generate(const char *c cache.line_offsets[i] += (long)header_len; } - footer_line_cnt = split_data_lines(footer, SCREEN_COLS, cache.line_offsets + cache.line_total, MAX_SPLIT_FILE_LINES - cache.line_total); + footer_line_cnt = split_data_lines(footer, SCREEN_COLS, cache.line_offsets + cache.line_total, MAX_SPLIT_FILE_LINES - cache.line_total, 1); if (footer_len != cache.line_offsets[cache.line_total + footer_line_cnt]) { @@ -256,7 +257,7 @@ int article_cache_load(ARTICLE_CACHE *p_ return -3; } - bzero(p_cache, sizeof(*p_cache)); + memset(p_cache, 0, sizeof(*p_cache)); memcpy((void *)p_cache, p_mmap, (size_t)(((ARTICLE_CACHE *)p_mmap)->mmap_len - ((ARTICLE_CACHE *)p_mmap)->data_len)); p_cache->p_mmap = p_mmap;