--- lbbs/src/lml.c 2025/06/14 02:59:34 1.7 +++ lbbs/src/lml.c 2025/10/05 08:14:06 1.21 @@ -14,9 +14,9 @@ * * ***************************************************************************/ +#include "common.h" #include "lml.h" #include "log.h" -#include "common.h" #include #include #include @@ -24,7 +24,7 @@ #define LML_TAG_PARAM_BUF_LEN 256 #define LML_TAG_OUTPUT_BUF_LEN 1024 -typedef int (*lml_tag_filter_cb)(const char *tag_name, const char *tag_param_buf, char *tag_output_buf, size_t tag_output_buf_len); +typedef int (*lml_tag_filter_cb)(const char *tag_name, const char *tag_param_buf, char *tag_output_buf, size_t tag_output_buf_len, int quote_mode); static int lml_tag_color_filter(const char *tag_name, const char *tag_param_buf, char *tag_output_buf, size_t tag_output_buf_len) { @@ -73,7 +73,7 @@ static const char *lml_tag_quote_color[] static int lml_tag_quote_level = 0; -static int lml_tag_quote_filter(const char *tag_name, const char *tag_param_buf, char *tag_output_buf, size_t tag_output_buf_len) +static int lml_tag_quote_filter(const char *tag_name, const char *tag_param_buf, char *tag_output_buf, size_t tag_output_buf_len, int quote_mode) { if (strcasecmp(tag_name, "quote") == 0) { @@ -81,7 +81,8 @@ static int lml_tag_quote_filter(const ch { lml_tag_quote_level++; } - return snprintf(tag_output_buf, tag_output_buf_len, lml_tag_quote_color[lml_tag_quote_level % LML_TAG_QUOTE_LEVEL_LOOP]); + return snprintf(tag_output_buf, tag_output_buf_len, "%s", + lml_tag_quote_color[lml_tag_quote_level % LML_TAG_QUOTE_LEVEL_LOOP]); } else if (strcasecmp(tag_name, "/quote") == 0) { @@ -89,69 +90,81 @@ static int lml_tag_quote_filter(const ch { lml_tag_quote_level--; } - return snprintf(tag_output_buf, tag_output_buf_len, + return snprintf(tag_output_buf, tag_output_buf_len, "%s", (lml_tag_quote_level > 0 ? lml_tag_quote_color[lml_tag_quote_level % LML_TAG_QUOTE_LEVEL_LOOP] : "\033[m")); } return 0; } -const static char *LML_tag_def[][3] = { - {"left", "[", ""}, - {"right", "]", NULL}, - {"bold", "\033[1m", ""}, // does not work in Fterm - {"/bold", "\033[22m", NULL}, - {"b", "\033[1m", ""}, - {"/b", "\033[22m", NULL}, - {"italic", "\033[5m", ""}, // use blink instead - {"/italic", "\033[m", NULL}, // \033[25m does not work in Fterm - {"i", "\033[5m", ""}, - {"/i", "\033[m", NULL}, - {"underline", "\033[4m", ""}, - {"/underline", "\033[m", NULL}, // \033[24m does not work in Fterm - {"u", "\033[4m", ""}, - {"/u", "\033[m", NULL}, - {"color", NULL, (const char *)lml_tag_color_filter}, - {"/color", "\033[m", NULL}, - {"quote", NULL, (const char *)lml_tag_quote_filter}, - {"/quote", NULL, (const char *)lml_tag_quote_filter}, - {"url", "", ""}, - {"/url", "(Á´½Ó: %s)", NULL}, - {"link", "", ""}, - {"/link", "(Á´½Ó: %s)", NULL}, - {"email", "", ""}, - {"/email", "(Email: %s)", NULL}, - {"user", "", ""}, - {"/user", "(Óû§: %s)", NULL}, - {"article", "", ""}, - {"/article", "(ÎÄÕÂ: %s)", NULL}, - {"image", "(ͼƬ: %s)", ""}, - {"flash", "(Flash: %s)", ""}, - {"bwf", "\033[1;31m****\033[m", ""}, +static int lml_tag_disabled = 0; + +static int lml_tag_disable_filter(const char *tag_name, const char *tag_param_buf, char *tag_output_buf, size_t tag_output_buf_len, int quote_mode) +{ + lml_tag_disabled = 1; + + return snprintf(tag_output_buf, tag_output_buf_len, "%s", (quote_mode ? "" : "[plain]")); +} + +const static char *lml_tag_def[][4] = { + // Definition of tuple: {lml_tag, lml_output, default_param | lml_filter_cb, quote_mode_output} + {"plain", NULL, (const char *)lml_tag_disable_filter, NULL}, + {"left", "[", "", "[left]"}, + {"right", "]", "", "[right]"}, + {"bold", "\033[1m", "", ""}, // does not work in Fterm + {"/bold", "\033[22m", NULL, ""}, + {"b", "\033[1m", "", ""}, + {"/b", "\033[22m", NULL, ""}, + {"italic", "\033[5m", "", ""}, // use blink instead + {"/italic", "\033[m", NULL, ""}, // \033[25m does not work in Fterm + {"i", "\033[5m", "", ""}, + {"/i", "\033[m", NULL, ""}, + {"underline", "\033[4m", "", ""}, + {"/underline", "\033[m", NULL, ""}, // \033[24m does not work in Fterm + {"u", "\033[4m", "", ""}, + {"/u", "\033[m", NULL, ""}, + {"color", NULL, (const char *)lml_tag_color_filter, ""}, + {"/color", "\033[m", NULL, ""}, + {"quote", NULL, (const char *)lml_tag_quote_filter, ""}, + {"/quote", NULL, (const char *)lml_tag_quote_filter, ""}, + {"url", "", "", ""}, + {"/url", "（链接: %s）", NULL, ""}, + {"link", "", "", ""}, + {"/link", "（链接: %s）", NULL, ""}, + {"email", "", "", ""}, + {"/email", "（Email: %s）", NULL, ""}, + {"user", "", "", ""}, + {"/user", "（用户: %s）", NULL, ""}, + {"article", "", "", ""}, + {"/article", "（文章: %s）", NULL, ""}, + {"image", "（图片: %s）", "", "%s"}, + {"flash", "（Flash: %s）", "", ""}, + {"bwf", "\033[1;31m****\033[m", "", "****"}, }; -#define LML_TAG_COUNT 31 +#define LML_TAG_COUNT 32 -static int LML_tag_name_len[LML_TAG_COUNT]; -static int LML_init = 0; +static int lml_tag_name_len[LML_TAG_COUNT]; +static int lml_ready = 0; inline static void lml_init(void) { int i; - if (!LML_init) + if (!lml_ready) { for (i = 0; i < LML_TAG_COUNT; i++) { - LML_tag_name_len[i] = (int)strlen(LML_tag_def[i][0]); + lml_tag_name_len[i] = (int)strlen(lml_tag_def[i][0]); } - LML_init = 1; + lml_ready = 1; } } -int lml_plain(const char *str_in, char *str_out, int buf_len) +int lml_render(const char *str_in, char *str_out, int buf_len, int quote_mode) { + char c; char tag_param_buf[LML_TAG_PARAM_BUF_LEN]; char tag_output_buf[LML_TAG_OUTPUT_BUF_LEN]; int i; @@ -166,21 +179,22 @@ int lml_plain(const char *str_in, char * lml_init(); + lml_tag_disabled = 0; lml_tag_quote_level = 0; for (i = 0; str_in[i] != '\0'; i++) { - if (new_line) + if (quote_mode && !lml_tag_disabled && new_line) { if (fb_quote_level > 0) { lml_tag_quote_level -= fb_quote_level; - tag_output_len = snprintf(tag_output_buf, LML_TAG_OUTPUT_BUF_LEN, + tag_output_len = snprintf(tag_output_buf, LML_TAG_OUTPUT_BUF_LEN, "%s", (lml_tag_quote_level > 0 ? lml_tag_quote_color[lml_tag_quote_level % LML_TAG_QUOTE_LEVEL_LOOP] : "\033[m")); - if (j + tag_output_len >= buf_len - 1) + if (j + tag_output_len >= buf_len) { - log_error("Buffer is not longer enough for output string %d >= %d\n", j + tag_output_len, buf_len - 1); + log_error("Buffer is not longer enough for output string %d >= %d\n", j + tag_output_len, buf_len); str_out[j] = '\0'; return j; } @@ -199,11 +213,11 @@ int lml_plain(const char *str_in, char * { lml_tag_quote_level += fb_quote_level; - tag_output_len = snprintf(tag_output_buf, LML_TAG_OUTPUT_BUF_LEN, + tag_output_len = snprintf(tag_output_buf, LML_TAG_OUTPUT_BUF_LEN, "%s", lml_tag_quote_color[(lml_tag_quote_level) % LML_TAG_QUOTE_LEVEL_LOOP]); - if (j + tag_output_len >= buf_len - 1) + if (j + tag_output_len >= buf_len) { - log_error("Buffer is not longer enough for output string %d >= %d\n", j + tag_output_len, buf_len - 1); + log_error("Buffer is not longer enough for output string %d >= %d\n", j + tag_output_len, buf_len); str_out[j] = '\0'; return j; } @@ -214,6 +228,30 @@ int lml_plain(const char *str_in, char * new_line = 0; } + if (str_in[i] == '\033' && str_in[i + 1] == '[') // Escape sequence -- copy directly + { + for (k = i + 2; str_in[k] != '\0' && str_in[k] != 'm'; k++) + ; + + if (str_in[k] == 'm') // Valid + { + if (j + (k - i + 1) >= buf_len) + { + log_error("Buffer is not longer enough for output string %d >= %d\n", j + (k - i + 1), buf_len); + str_out[j] = '\0'; + return j; + } + memcpy(str_out + j, str_in + i, (size_t)(k - i + 1)); + j += (k - i + 1); + i = k; + continue; + } + else // reach end of string + { + break; + } + } + if (str_in[i] == '\n') { tag_start_pos = -1; // jump out of tag at end of line @@ -224,11 +262,11 @@ int lml_plain(const char *str_in, char * continue; // ignore '\r' } - if (str_in[i] == '[') + if (!lml_tag_disabled && str_in[i] == '[') { tag_start_pos = i + 1; } - else if (str_in[i] == ']') + else if (!lml_tag_disabled && str_in[i] == ']') { if (tag_start_pos >= 0) { @@ -242,13 +280,13 @@ int lml_plain(const char *str_in, char * for (k = 0; k < LML_TAG_COUNT; k++) { - if (strncasecmp(LML_tag_def[k][0], str_in + tag_start_pos, (size_t)LML_tag_name_len[k]) == 0) + if (strncasecmp(lml_tag_def[k][0], str_in + tag_start_pos, (size_t)lml_tag_name_len[k]) == 0) { tag_param_pos = -1; - switch (str_in[tag_start_pos + LML_tag_name_len[k]]) + switch (str_in[tag_start_pos + lml_tag_name_len[k]]) { case ' ': - tag_param_pos = tag_start_pos + LML_tag_name_len[k] + 1; + tag_param_pos = tag_start_pos + lml_tag_name_len[k] + 1; while (str_in[tag_param_pos] == ' ') { tag_param_pos++; @@ -256,23 +294,38 @@ int lml_plain(const char *str_in, char * strncpy(tag_param_buf, str_in + tag_param_pos, (size_t)MIN(tag_end_pos - tag_param_pos, LML_TAG_PARAM_BUF_LEN)); tag_param_buf[MIN(tag_end_pos - tag_param_pos, LML_TAG_PARAM_BUF_LEN)] = '\0'; case ']': - if (tag_param_pos == -1 && LML_tag_def[k][1] != NULL && LML_tag_def[k][2] != NULL) // Apply default param if not defined + if (tag_param_pos == -1 && lml_tag_def[k][1] != NULL && lml_tag_def[k][2] != NULL) // Apply default param if not defined { - strncpy(tag_param_buf, LML_tag_def[k][2], LML_TAG_PARAM_BUF_LEN - 1); + strncpy(tag_param_buf, lml_tag_def[k][2], LML_TAG_PARAM_BUF_LEN - 1); tag_param_buf[LML_TAG_PARAM_BUF_LEN - 1] = '\0'; } - if (LML_tag_def[k][1] != NULL) + if (quote_mode) { - tag_output_len = snprintf(tag_output_buf, LML_TAG_OUTPUT_BUF_LEN, LML_tag_def[k][1], tag_param_buf); + if (lml_tag_def[k][1] != NULL) + { + tag_output_len = snprintf(tag_output_buf, LML_TAG_OUTPUT_BUF_LEN, lml_tag_def[k][1], tag_param_buf); + } + else + { + tag_output_len = ((lml_tag_filter_cb)lml_tag_def[k][2])( + lml_tag_def[k][0], tag_param_buf, tag_output_buf, LML_TAG_OUTPUT_BUF_LEN, quote_mode); + } } else { - tag_output_len = ((lml_tag_filter_cb)LML_tag_def[k][2])( - LML_tag_def[k][0], tag_param_buf, tag_output_buf, LML_TAG_OUTPUT_BUF_LEN); + if (lml_tag_def[k][3] != NULL) + { + tag_output_len = snprintf(tag_output_buf, LML_TAG_OUTPUT_BUF_LEN, lml_tag_def[k][3], tag_param_buf); + } + else + { + tag_output_len = ((lml_tag_filter_cb)lml_tag_def[k][2])( + lml_tag_def[k][0], tag_param_buf, tag_output_buf, LML_TAG_OUTPUT_BUF_LEN, quote_mode); + } } - if (j + tag_output_len >= buf_len - 1) + if (j + tag_output_len >= buf_len) { - log_error("Buffer is not longer enough for output string %d >= %d\n", j + tag_output_len, buf_len - 1); + log_error("Buffer is not longer enough for output string %d >= %d\n", j + tag_output_len, buf_len); str_out[j] = '\0'; return j; } @@ -289,27 +342,33 @@ int lml_plain(const char *str_in, char * tag_start_pos = -1; } } - else if (tag_start_pos == -1) // not in LML tag + else if (lml_tag_disabled || tag_start_pos == -1) // not in LML tag { - if (str_in[i] < 0 || str_in[i] > 127) // GBK chinese character + if (str_in[i] & 0b10000000) // head of multi-byte character { - if (j + 2 >= buf_len - 1) + if (j + 4 >= buf_len) // Assuming UTF-8 CJK characters use 4 bytes, though most of them actually use 3 bytes { - log_error("Buffer is not longer enough for output string %ld >= %d\n", j + 2, buf_len - 1); + log_error("Buffer is not longer enough for output string %ld >= %d\n", j + 4, buf_len); str_out[j] = '\0'; return j; } - str_out[j++] = str_in[i++]; - if (str_in[i] == '\0') + + c = (str_in[i] & 0b01110000) << 1; + while (c & 0b10000000) { - str_out[j] = '\0'; - return j; + str_out[j++] = str_in[i++]; + if (str_in[i] == '\0') + { + str_out[j] = '\0'; + return j; + } + c = (c & 0b01111111) << 1; } } - if (j + 1 >= buf_len - 1) + if (j + 1 >= buf_len) { - log_error("Buffer is not longer enough for output string %ld >= %d\n", j + 1, buf_len - 1); + log_error("Buffer is not longer enough for output string %ld >= %d\n", j + 1, buf_len); str_out[j] = '\0'; return j; } @@ -321,12 +380,12 @@ int lml_plain(const char *str_in, char * } } - if (lml_tag_quote_level > 0) + if (quote_mode && !lml_tag_disabled && lml_tag_quote_level > 0) { tag_output_len = snprintf(tag_output_buf, LML_TAG_OUTPUT_BUF_LEN, "\033[m"); - if (j + tag_output_len >= buf_len - 1) + if (j + tag_output_len >= buf_len) { - log_error("Buffer is not longer enough for output string %d >= %d\n", j + tag_output_len, buf_len - 1); + log_error("Buffer is not longer enough for output string %d >= %d\n", j + tag_output_len, buf_len); str_out[j] = '\0'; return j; }