--- lbbs/src/article_cache.c	2025/05/31 02:42:24	1.4
+++ lbbs/src/article_cache.c	2025/06/01 14:04:19	1.8
@@ -28,6 +28,19 @@
 #include <string.h>
 
 #define ARTICLE_HEADER_MAX_LEN 4096
+#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)
 {
@@ -42,16 +55,20 @@ inline static int article_cache_path(cha
 	return 0;
 }
 
-int article_cache_generate(const char *cache_dir, const ARTICLE *p_article, const SECTION_LIST *p_section, const char *content, int overwrite)
+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)
 {
 	char data_file[FILE_PATH_LEN];
 	int fd;
 	ARTICLE_CACHE cache;
 	struct tm tm_sub_dt;
-	char str_sub_dt[50];
+	char str_sub_dt[SUB_DT_MAX_LEN + 1];
 	char header[ARTICLE_HEADER_MAX_LEN];
 	size_t header_len;
 	long header_line_cnt;
+	char footer[ARTICLE_FOOTER_MAX_LEN];
+	size_t footer_len;
+	long footer_line_cnt;
 	long i;
 
 	if (cache_dir == NULL || p_article == NULL || content == NULL)
@@ -83,32 +100,44 @@ int article_cache_generate(const char *c
 
 	bzero(&cache, sizeof(cache));
 
-	// Generate article header
+	// 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);
 
 	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);
 
+	snprintf(footer, sizeof(footer),
+			 "--\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);
 	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)
+	for (i = header_line_cnt; i <= cache.line_total; i++)
 	{
-		log_error("split_data_lines(%s) truncated over limit lines %d >= %d\n", data_file, cache.line_total, MAX_SPLIT_FILE_LINES);
-		cache.line_total = MAX_SPLIT_FILE_LINES - 1;
+		cache.line_offsets[i] += (long)header_len;
 	}
 
-	for (i = header_line_cnt; i <= cache.line_total; i++)
+	footer_line_cnt = split_data_lines(footer, SCREEN_COLS, cache.line_offsets + cache.line_total, MAX_SPLIT_FILE_LINES - cache.line_total);
+
+	for (i = 0; i <= footer_line_cnt; i++)
 	{
-		cache.line_offsets[i] += (long)header_len;
+		cache.line_offsets[cache.line_total + i] += (long)cache.data_len;
 	}
 
-	if (write(fd, &cache, sizeof(cache)) == -1)
+	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, cache.mmap_len - cache.data_len) == -1)
 	{
 		log_error("write(%s, cache) error (%d)\n", data_file, errno);
 		close(fd);
@@ -120,12 +149,18 @@ int article_cache_generate(const char *c
 		close(fd);
 		return -3;
 	}
-	if (write(fd, content, cache.data_len - header_len) == -1)
+	if (write(fd, content, cache.data_len - header_len - footer_len) == -1)
 	{
 		log_error("write(%s, content) error (%d)\n", data_file, errno);
 		close(fd);
 		return -3;
 	}
+	if (write(fd, footer, footer_len) == -1)
+	{
+		log_error("write(%s, footer) error (%d)\n", data_file, errno);
+		close(fd);
+		return -3;
+	}
 
 	if (close(fd) == -1)
 	{
@@ -183,23 +218,16 @@ 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;
 	}
 
+	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;
 }
@@ -212,7 +240,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;