--- lbbs/src/article_cache.c 2025/05/31 12:06:21 1.6 +++ lbbs/src/article_cache.c 2025/06/04 13:42:53 1.13 @@ -16,6 +16,7 @@ #include "article_cache.h" #include "log.h" +#include "lml.h" #include #include #include @@ -28,9 +29,21 @@ #include #define ARTICLE_HEADER_MAX_LEN 4096 +#define ARTICLE_CONTENT_MAX_LEN 1024 * 1024 * 4 // 4MB #define ARTICLE_FOOTER_MAX_LEN 4096 #define SUB_DT_MAX_LEN 50 +static const char *BBS_article_footer_color[] = { + "\033[31m", + "\033[32m", + "\033[33m", + "\033[34m", + "\033[35m", + "\033[36m", + "\033[37m", +}; +static const int BBS_article_footer_color_count = 7; + inline static int article_cache_path(char *file_path, size_t buf_len, const char *cache_dir, const ARTICLE *p_article) { if (file_path == NULL || cache_dir == NULL || p_article == NULL) @@ -55,6 +68,7 @@ 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; @@ -97,21 +111,32 @@ 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 http://%s [FROM: %s]\n", + "--\n%s¡ù À´Ô´: %s http://%s [FROM: %s]\033[m\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)); - cache.data_len = header_len + strlen(content); - header_line_cnt = split_data_lines(header, SCREEN_COLS, cache.line_offsets, MAX_SPLIT_FILE_LINES); + + 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]); + header_len = (size_t)cache.line_offsets[header_line_cnt]; + } + + // Apply LML render to content body + 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, SCREEN_COLS, cache.line_offsets + header_line_cnt, MAX_SPLIT_FILE_LINES - header_line_cnt); - if (cache.line_total >= MAX_SPLIT_FILE_LINES) + split_data_lines(content_f, SCREEN_COLS, cache.line_offsets + header_line_cnt, MAX_SPLIT_FILE_LINES - header_line_cnt); + + if (cache.data_len - header_len != (size_t)cache.line_offsets[cache.line_total]) { - log_error("split_data_lines(%s) truncated over limit lines %d >= %d\n", data_file, cache.line_total, MAX_SPLIT_FILE_LINES); - return -3; + 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]); + cache.data_len = header_len + (size_t)(cache.line_offsets[cache.line_total]); } for (i = header_line_cnt; i <= cache.line_total; i++) @@ -120,10 +145,12 @@ int article_cache_generate(const char *c } footer_line_cnt = split_data_lines(footer, SCREEN_COLS, cache.line_offsets + cache.line_total, MAX_SPLIT_FILE_LINES - cache.line_total); - if (cache.line_total + footer_line_cnt >= MAX_SPLIT_FILE_LINES) + + if (footer_len != cache.line_offsets[cache.line_total + footer_line_cnt]) { - log_error("split_data_lines(%s) truncated over limit lines %d >= %d\n", data_file, cache.line_total + footer_line_cnt, MAX_SPLIT_FILE_LINES); - return -3; + 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]); + footer_len = (size_t)(cache.line_offsets[cache.line_total + footer_line_cnt]); } for (i = 0; i <= footer_line_cnt; i++) @@ -133,8 +160,9 @@ int article_cache_generate(const char *c cache.data_len += footer_len; cache.line_total += footer_line_cnt; + cache.mmap_len = sizeof(cache) - sizeof(long) * (MAX_SPLIT_FILE_LINES - (size_t)(cache.line_total) - 1) + cache.data_len; - if (write(fd, &cache, sizeof(cache)) == -1) + if (write(fd, &cache, cache.mmap_len - cache.data_len) == -1) { log_error("write(%s, cache) error (%d)\n", data_file, errno); close(fd); @@ -146,7 +174,7 @@ int article_cache_generate(const char *c close(fd); return -3; } - if (write(fd, content, cache.data_len - header_len - footer_len) == -1) + if (write(fd, content_f, cache.data_len - header_len - footer_len) == -1) { log_error("write(%s, content) error (%d)\n", data_file, errno); close(fd); @@ -215,23 +243,17 @@ int article_cache_load(ARTICLE_CACHE *p_ return -2; } - memcpy((void *)p_cache, p_mmap, sizeof(ARTICLE_CACHE)); - - if (sizeof(ARTICLE_CACHE) + p_cache->data_len != mmap_len) + if (((ARTICLE_CACHE *)p_mmap)->mmap_len != mmap_len) { - log_error("Inconsistent length, cache_len(%ld) + data_len(%ld) != mmap_len(%ld)\n", - sizeof(ARTICLE_CACHE), p_cache->data_len, mmap_len); - - if (munmap(p_mmap, mmap_len) < 0) - { - log_error("munmap() error (%d)\n", errno); - } - + log_error("Inconsistent mmap len of article (cid=%d), %ld != %ld\n", p_article->cid, p_cache->mmap_len, mmap_len); return -3; } + bzero(p_cache, 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; - p_cache->p_data = p_mmap + sizeof(ARTICLE_CACHE); + p_cache->p_data = p_mmap + (p_cache->mmap_len - p_cache->data_len); return 0; } @@ -244,7 +266,7 @@ int article_cache_unload(ARTICLE_CACHE * return -1; } - if (munmap(p_cache->p_mmap, sizeof(ARTICLE_CACHE) + p_cache->data_len) < 0) + if (munmap(p_cache->p_mmap, p_cache->mmap_len) < 0) { log_error("munmap() error (%d)\n", errno); return -2;