--- lbbs/src/article_cache.c 2025/06/04 13:42:53 1.13 +++ lbbs/src/article_cache.c 2025/06/21 02:15:18 1.21 @@ -15,18 +15,17 @@ ***************************************************************************/ #include "article_cache.h" -#include "log.h" #include "lml.h" +#include "log.h" #include -#include #include +#include #include +#include +#include #include #include #include -#include -#define _POSIX_C_SOURCE 200809L -#include #define ARTICLE_HEADER_MAX_LEN 4096 #define ARTICLE_CONTENT_MAX_LEN 1024 * 1024 * 4 // 4MB @@ -60,6 +59,8 @@ inline static int article_cache_path(cha int article_cache_generate(const char *cache_dir, const ARTICLE *p_article, const SECTION_LIST *p_section, const char *content, const char *sub_ip, int overwrite) { + static char *content_f; // static buffer in large size + char data_file[FILE_PATH_LEN]; int fd; ARTICLE_CACHE cache; @@ -68,7 +69,6 @@ int article_cache_generate(const char *c char header[ARTICLE_HEADER_MAX_LEN]; size_t header_len; long header_line_cnt; - char content_f[ARTICLE_CONTENT_MAX_LEN]; char footer[ARTICLE_FOOTER_MAX_LEN]; size_t footer_len; long footer_line_cnt; @@ -80,6 +80,12 @@ int article_cache_generate(const char *c return -1; } + if (content_f == NULL && (content_f = malloc(ARTICLE_CONTENT_MAX_LEN)) == NULL) + { + log_error("malloc(content_f) error: OOM\n"); + return -1; + } + if (article_cache_path(data_file, sizeof(data_file), cache_dir, p_article) < 0) { log_error("article_cache_path(dir=%s, cid=%d) error\n", cache_dir, p_article->cid); @@ -101,7 +107,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); @@ -111,18 +117,20 @@ int article_cache_generate(const char *c p_article->username, p_article->nickname, p_section->sname, p_section->stitle, p_article->title, BBS_name, str_sub_dt); snprintf(footer, sizeof(footer), - "--\n%s¡ù À´Ô´: %s http://%s [FROM: %s]\033[m\n", + "\n--\n%s¡ù À´Ô´: %s http://%s [FROM: %s]\033[m\n\n", BBS_article_footer_color[p_article->aid % BBS_article_footer_color_count], BBS_name, BBS_server, sub_ip); 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]) { - log_common("Header of article(aid=%d) is truncated from %ld to %ld\n", p_article->aid, header_len, cache.line_offsets[header_line_cnt]); +#ifdef _DEBUG + log_error("Header of article(aid=%d) is truncated from %ld to %ld\n", p_article->aid, header_len, cache.line_offsets[header_line_cnt]); +#endif header_len = (size_t)cache.line_offsets[header_line_cnt]; } @@ -130,12 +138,14 @@ 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]) { - log_common("Body of article(aid=%d) is truncated from %ld to %ld\n", - p_article->aid, cache.data_len - header_len, cache.line_offsets[cache.line_total]); +#ifdef _DEBUG + log_error("Body of article(aid=%d) is truncated from %ld to %ld\n", + p_article->aid, cache.data_len - header_len, cache.line_offsets[cache.line_total]); +#endif cache.data_len = header_len + (size_t)(cache.line_offsets[cache.line_total]); } @@ -144,12 +154,14 @@ 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]) { - log_common("Footer of article(aid=%d) is truncated from %ld to %ld\n", - p_article->aid, footer_len, cache.line_offsets[cache.line_total + footer_line_cnt]); +#ifdef _DEBUG + log_error("Footer of article(aid=%d) is truncated from %ld to %ld\n", + p_article->aid, footer_len, cache.line_offsets[cache.line_total + footer_line_cnt]); +#endif footer_len = (size_t)(cache.line_offsets[cache.line_total + footer_line_cnt]); } @@ -249,7 +261,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;