--- lbbs/src/article_post.c	2025/06/15 02:24:45	1.15
+++ lbbs/src/article_post.c	2025/06/16 01:36:56	1.20
@@ -81,7 +81,8 @@ int article_post(const SECTION_LIST *p_s
 	if (p_editor_data == NULL)
 	{
 		log_error("editor_data_load() error\n");
-		return -2;
+		ret = -1;
+		goto cleanup;
 	}
 
 	// Set title and sign
@@ -109,6 +110,9 @@ int article_post(const SECTION_LIST *p_s
 		{
 			switch (toupper(ch))
 			{
+			case KEY_NULL:
+			case KEY_TIMEOUT:
+				goto cleanup;
 			case CR:
 				igetch_reset();
 				break;
@@ -172,6 +176,9 @@ int article_post(const SECTION_LIST *p_s
 			{
 				switch (toupper(ch))
 				{
+				case KEY_NULL:
+				case KEY_TIMEOUT:
+					goto cleanup;
 				case CR:
 					igetch_reset();
 				case 'S':
@@ -200,6 +207,11 @@ int article_post(const SECTION_LIST *p_s
 		}
 	}
 
+	if (SYS_server_exit) // Do not save data on shutdown
+	{
+		goto cleanup;
+	}
+
 	content = malloc(ARTICLE_CONTENT_MAX_LEN);
 	if (content == NULL)
 	{
@@ -212,7 +224,7 @@ int article_post(const SECTION_LIST *p_s
 	if (len_content < 0)
 	{
 		log_error("editor_data_save() error\n");
-		ret = -2;
+		ret = -1;
 		goto cleanup;
 	}
 
@@ -377,6 +389,9 @@ int article_post(const SECTION_LIST *p_s
 		goto cleanup;
 	}
 
+	mysql_close(db);
+	db = NULL;
+
 	clearscr();
 	moveto(1, 1);
 	prints("发送完成，新文章通常会在%d秒后可见", BBS_section_list_load_interval);
@@ -429,21 +444,12 @@ int article_modify(const SECTION_LIST *p
 		return 0;
 	}
 
-	if (!checkpriv(&BBS_priv, p_section->sid, S_POST))
-	{
-		clearscr();
-		moveto(1, 1);
-		prints("您没有权限在本版块发表文章\n");
-		press_any_key();
-
-		return 0;
-	}
-
 	db = db_open();
 	if (db == NULL)
 	{
 		log_error("db_open() error: %s\n", mysql_error(db));
-		return -1;
+		ret = -1;
+		goto cleanup;
 	}
 
 	snprintf(sql, sizeof(sql),
@@ -455,13 +461,13 @@ int article_modify(const SECTION_LIST *p
 	if (mysql_query(db, sql) != 0)
 	{
 		log_error("Query article content error: %s\n", mysql_error(db));
-		ret = -2;
+		ret = -1;
 		goto cleanup;
 	}
 	if ((rs = mysql_use_result(db)) == NULL)
 	{
 		log_error("Get article content data failed\n");
-		ret = -2;
+		ret = -1;
 		goto cleanup;
 	}
 
@@ -479,13 +485,13 @@ int article_modify(const SECTION_LIST *p
 		content[ARTICLE_CONTENT_MAX_LEN - 1] = '\0';
 
 		// Remove control sequence
-		len_content = ctrl_seq_filter(content);
+		len_content = str_filter(content, 0);
 
 		p_editor_data = editor_data_load(content);
 		if (p_editor_data == NULL)
 		{
 			log_error("editor_data_load(aid=%d, cid=%d) error\n", p_article->aid, atoi(row[0]));
-			ret = -3;
+			ret = -1;
 			goto cleanup;
 		}
 
@@ -511,6 +517,9 @@ int article_modify(const SECTION_LIST *p
 		{
 			switch (toupper(ch))
 			{
+			case KEY_NULL:
+			case KEY_TIMEOUT:
+				goto cleanup;
 			case CR:
 				igetch_reset();
 			case 'S':
@@ -531,6 +540,11 @@ int article_modify(const SECTION_LIST *p
 		}
 	}
 
+	if (SYS_server_exit) // Do not save data on shutdown
+	{
+		goto cleanup;
+	}
+
 	// Allocate buffers in big size
 	content = malloc(ARTICLE_CONTENT_MAX_LEN);
 	if (content == NULL)
@@ -544,7 +558,7 @@ int article_modify(const SECTION_LIST *p
 	if (len_content < 0)
 	{
 		log_error("editor_data_save() error\n");
-		ret = -2;
+		ret = -1;
 		goto cleanup;
 	}
 
@@ -661,6 +675,9 @@ int article_modify(const SECTION_LIST *p
 		goto cleanup;
 	}
 
+	mysql_close(db);
+	db = NULL;
+
 	clearscr();
 	moveto(1, 1);
 	prints("修改完成，新内容通常会在%d秒后可见", BBS_section_list_load_interval);
@@ -724,14 +741,15 @@ int article_reply(const SECTION_LIST *p_
 
 	p_article_new->title[0] = '\0';
 	snprintf(title_input, sizeof(title_input), "Re: %s", p_article->title);
-	len = split_line(title_input, TITLE_INPUT_MAX_LEN, &eol, &display_len);
+	len = split_line(title_input, TITLE_INPUT_MAX_LEN, &eol, &display_len, 0);
 	title_input[len] = '\0';
 
 	db = db_open();
 	if (db == NULL)
 	{
 		log_error("db_open() error: %s\n", mysql_error(db));
-		return -1;
+		ret = -1;
+		goto cleanup;
 	}
 
 	snprintf(sql, sizeof(sql),
@@ -741,12 +759,14 @@ int article_reply(const SECTION_LIST *p_
 	if (mysql_query(db, sql) != 0)
 	{
 		log_error("Query article status error: %s\n", mysql_error(db));
-		return -2;
+		ret = -1;
+		goto cleanup;
 	}
 	if ((rs = mysql_store_result(db)) == NULL)
 	{
 		log_error("Get article status data failed\n");
-		return -2;
+		ret = -1;
+		goto cleanup;
 	}
 
 	if ((row = mysql_fetch_row(rs)))
@@ -761,6 +781,9 @@ int article_reply(const SECTION_LIST *p_
 
 	if (topic_locked) // Reply is not allowed
 	{
+		mysql_close(db);
+		db = NULL;
+
 		clearscr();
 		moveto(1, 1);
 		prints("该主题谢绝回复");
@@ -778,12 +801,14 @@ int article_reply(const SECTION_LIST *p_
 	if (mysql_query(db, sql) != 0)
 	{
 		log_error("Query article content error: %s\n", mysql_error(db));
-		return -2;
+		ret = -1;
+		goto cleanup;
 	}
 	if ((rs = mysql_use_result(db)) == NULL)
 	{
 		log_error("Get article content data failed\n");
-		return -2;
+		ret = -1;
+		goto cleanup;
 	}
 
 	if ((row = mysql_fetch_row(rs)))
@@ -809,19 +834,24 @@ int article_reply(const SECTION_LIST *p_
 		content_f[len] = '\0';
 
 		// Remove control sequence
-		len = ctrl_seq_filter(content_f);
+		len = str_filter(content_f, 0);
 
 		len = snprintf(content, ARTICLE_CONTENT_MAX_LEN,
 					   "\n\n【 在 %s (%s) 的大作中提到: 】\n",
 					   p_article->username, p_article->nickname);
 
-		quote_content_lines = split_data_lines(content_f, ARTICLE_QUOTE_LINE_MAX_LEN, line_offsets, ARTICLE_QUOTE_MAX_LINES + 1);
+		quote_content_lines = split_data_lines(content_f, ARTICLE_QUOTE_LINE_MAX_LEN, line_offsets, ARTICLE_QUOTE_MAX_LINES + 1, 0);
 		for (i = 0; i < quote_content_lines; i++)
 		{
 			memcpy(content + len, ": ", 2); // quote line prefix
 			len += 2;
 			memcpy(content + len, content_f + line_offsets[i], (size_t)(line_offsets[i + 1] - line_offsets[i]));
 			len += (line_offsets[i + 1] - line_offsets[i]);
+			if (content[len - 1] != '\n') // Appennd \n if not exist
+			{
+				content[len] = '\n';
+				len++;
+			}
 		}
 		if (content[len - 1] != '\n') // Appennd \n if not exist
 		{
@@ -837,7 +867,7 @@ int article_reply(const SECTION_LIST *p_
 		if (p_editor_data == NULL)
 		{
 			log_error("editor_data_load(aid=%d, cid=%d) error\n", p_article->aid, atoi(row[0]));
-			ret = -3;
+			ret = -1;
 			goto cleanup;
 		}
 
@@ -875,6 +905,9 @@ int article_reply(const SECTION_LIST *p_
 		{
 			switch (toupper(ch))
 			{
+			case KEY_NULL:
+			case KEY_TIMEOUT:
+				goto cleanup;
 			case CR:
 				igetch_reset();
 				break;
@@ -932,6 +965,9 @@ int article_reply(const SECTION_LIST *p_
 			{
 				switch (toupper(ch))
 				{
+				case KEY_NULL:
+				case KEY_TIMEOUT:
+					goto cleanup;
 				case CR:
 					igetch_reset();
 				case 'S':
@@ -960,6 +996,11 @@ int article_reply(const SECTION_LIST *p_
 		}
 	}
 
+	if (SYS_server_exit) // Do not save data on shutdown
+	{
+		goto cleanup;
+	}
+
 	content = malloc(ARTICLE_CONTENT_MAX_LEN);
 	if (content == NULL)
 	{
@@ -972,7 +1013,7 @@ int article_reply(const SECTION_LIST *p_
 	if (len_content < 0)
 	{
 		log_error("editor_data_save() error\n");
-		ret = -2;
+		ret = -1;
 		goto cleanup;
 	}
 
@@ -1153,6 +1194,9 @@ int article_reply(const SECTION_LIST *p_
 		goto cleanup;
 	}
 
+	mysql_close(db);
+	db = NULL;
+
 	clearscr();
 	moveto(1, 1);
 	prints("发送完成，新文章通常会在%d秒后可见", BBS_section_list_load_interval);