--- lbbs/src/article_post.c 2025/06/15 00:02:40 1.13 +++ lbbs/src/article_post.c 2025/06/21 02:15:18 1.22 @@ -14,17 +14,15 @@ * * ***************************************************************************/ -#define _POSIX_C_SOURCE 200809L - -#include "article_post.h" #include "article_cache.h" -#include "editor.h" -#include "screen.h" +#include "article_post.h" #include "bbs.h" -#include "log.h" +#include "database.h" +#include "editor.h" #include "io.h" +#include "log.h" #include "lml.h" -#include "database.h" +#include "screen.h" #include "user_priv.h" #include #include @@ -81,7 +79,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 +108,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 +174,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 +205,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 +222,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 +387,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 +442,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 +459,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 +483,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 +515,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 +538,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 +556,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; } @@ -623,7 +635,7 @@ int article_modify(const SECTION_LIST *p // Update article snprintf(sql, sizeof(sql), - "UPDATE bbs SET CID = %d, length = %ld WHERE AID = %d", + "UPDATE bbs SET CID = %d, length = %ld, excerption = 0 WHERE AID = %d", // Set excerption = 0 explictly in case of rare condition p_article_new->cid, len_content, p_article->aid); if (mysql_query(db, sql) != 0) @@ -661,6 +673,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); @@ -705,6 +720,7 @@ int article_reply(const SECTION_LIST *p_ long quote_content_lines; long i; long ret = 0; + int topic_locked = 0; if (p_section == NULL || p_article == NULL) { @@ -721,26 +737,57 @@ int article_reply(const SECTION_LIST *p_ return 0; } - if (p_article->lock) // Reply is not allowed - { - clearscr(); - moveto(1, 1); - prints("该文章谢绝回复"); - press_any_key(); - - return 0; - } - 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), + "SELECT `lock` FROM bbs WHERE AID = %d", + (p_article->tid == 0 ? p_article->aid : p_article->tid)); + + if (mysql_query(db, sql) != 0) + { + log_error("Query article status error: %s\n", mysql_error(db)); + ret = -1; + goto cleanup; + } + if ((rs = mysql_store_result(db)) == NULL) + { + log_error("Get article status data failed\n"); + ret = -1; + goto cleanup; + } + + if ((row = mysql_fetch_row(rs))) + { + if (atoi(row[0]) != 0) + { + topic_locked = 1; + } + } + mysql_free_result(rs); + rs = NULL; + + if (topic_locked) // Reply is not allowed + { + mysql_close(db); + db = NULL; + + clearscr(); + moveto(1, 1); + prints("该主题谢绝回复"); + press_any_key(); + + goto cleanup; } snprintf(sql, sizeof(sql), @@ -752,12 +799,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))) @@ -783,19 +832,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 { @@ -811,7 +865,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; } @@ -849,6 +903,9 @@ int article_reply(const SECTION_LIST *p_ { switch (toupper(ch)) { + case KEY_NULL: + case KEY_TIMEOUT: + goto cleanup; case CR: igetch_reset(); break; @@ -906,6 +963,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': @@ -934,6 +994,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) { @@ -946,7 +1011,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; } @@ -1127,6 +1192,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);