--- lbbs/src/article_cache.c 2025/10/05 05:00:50 1.26 +++ lbbs/src/article_cache.c 2025/11/04 14:58:56 1.34 @@ -1,18 +1,10 @@ -/*************************************************************************** - article_cache.c - description - ------------------- - Copyright : (C) 2004-2025 by Leaflet - Email : leaflet@leafok.com - ***************************************************************************/ - -/*************************************************************************** - * * - * 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 3 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/* SPDX-License-Identifier: GPL-3.0-or-later */ +/* + * article_cache + * - convert article content from DB to local cache with LML conversion and line offset index + * + * Copyright (C) 2004-2025 Leaflet + */ #include "article_cache.h" #include "lml.h" @@ -49,7 +41,7 @@ inline static int article_cache_path(cha { if (file_path == NULL || cache_dir == NULL || p_article == NULL) { - log_error("article_cache_path() NULL pointer error\n"); + log_error("NULL pointer error\n"); return -1; } @@ -76,7 +68,7 @@ int article_cache_generate(const char *c if (cache_dir == NULL || p_article == NULL || content == NULL) { - log_error("article_cache_generate() NULL pointer error\n"); + log_error("NULL pointer error\n"); return -1; } @@ -111,7 +103,7 @@ int article_cache_generate(const char *c // Generate article header / footer localtime_r(&(p_article->sub_dt), &tm_sub_dt); - strftime(str_sub_dt, sizeof(str_sub_dt), "%c", &tm_sub_dt); + strftime(str_sub_dt, sizeof(str_sub_dt), "%c %Z", &tm_sub_dt); snprintf(header, sizeof(header), "发布者: %s (%s), 版块: %s (%s)\n标 题: %s\n发布于: %s (%s)\n\n", p_article->username, p_article->nickname, p_section->sname, p_section->stitle, p_article->title, BBS_name, str_sub_dt); @@ -135,10 +127,10 @@ int article_cache_generate(const char *c } // Apply LML render to content body - cache.data_len = header_len + (size_t)lml_render(content, content_f, ARTICLE_CONTENT_MAX_LEN, 1); + cache.data_len = header_len + (size_t)lml_render(content, content_f, ARTICLE_CONTENT_MAX_LEN, SCREEN_COLS, 0); 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, 1, NULL); + split_data_lines(content_f, SCREEN_COLS + 1, cache.line_offsets + header_line_cnt, MAX_SPLIT_FILE_LINES - header_line_cnt, 1, NULL); if (cache.data_len - header_len != (size_t)cache.line_offsets[cache.line_total]) { @@ -227,7 +219,7 @@ int article_cache_load(ARTICLE_CACHE *p_ if (p_cache == NULL || cache_dir == NULL || p_article == NULL) { - log_error("article_cache_load() NULL pointer error\n"); + log_error("NULL pointer error\n"); return -1; } @@ -274,7 +266,7 @@ int article_cache_load(ARTICLE_CACHE *p_ 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 + (p_cache->mmap_len - p_cache->data_len); + p_cache->p_data = (char *)p_mmap + (p_cache->mmap_len - p_cache->data_len); return 0; } @@ -283,7 +275,7 @@ int article_cache_unload(ARTICLE_CACHE * { if (p_cache == NULL || p_cache->p_mmap == NULL) { - log_error("article_cache_unload() NULL pointer error\n"); + log_error("NULL pointer error\n"); return -1; }