slw2gmi

чување 09024fbf332316ccbd71732d5d6cd7bfdf669bc3
родитељ 0b2aee9da644525ff828cb4c0adaf545f4a843b9
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Sat,  4 Sep 2021 12:45:59 +0200

Updated to match slweb v0.3.12, leftover parts

Signed-off-by: Страхиња Радић <contact@strahinja.org>

Diffstat:
M
slw2gmi.c
 | 
24
++++++++++++------------

измењених датотека: 1, додавања: 12(+), брисања: 12(-)
diff --git a/slw2gmi.c b/slw2gmi.c
@@ -1859,7 +1859,8 @@ process_text_token(FILE* output, const u8* line, const u8* link_prefix,
 }
 
 int
-process_inline_footnote(u8* token, BOOL read_yaml_macros_and_links, FILE* output)
+process_inline_footnote(FILE* output, const u8* token,
+	const BOOL read_yaml_macros_and_links)
 {
 	current_inline_footnote++;
 
@@ -1882,7 +1883,7 @@ process_inline_footnote(u8* token, BOOL read_yaml_macros_and_links, FILE* output
 			token_len + 1);
 
 		strncpy((char*)inline_footnotes[inline_footnote_count - 1],
-			(char*)token, token_len);
+			(char*)token, token_len + 1);
 		*(inline_footnotes[inline_footnote_count - 1] + token_len) = 0;
 	}
 	else
@@ -3424,8 +3425,8 @@ do_line:
 		*ptoken = 0;
 		if (IN(state, ST_INLINE_FOOTNOTE))
 		{
-			process_inline_footnote(token,
-				read_yaml_macros_and_links, output);
+			process_inline_footnote(output, token,
+				read_yaml_macros_and_links);
 
 			keep_token = FALSE;
 			RESET_TOKEN(token, ptoken, token_size);
@@ -3902,7 +3903,7 @@ done_line:
 		pvars->value_size = strlen((char*)token) + 1;
 		CALLOC(pvars->value, u8, pvars->value_size);
 		strncpy((char*)pvars->value, (char*)token,
-			pvars->value_size - 1);
+			pvars->value_size);
 	}
 	else if (keep_token)
 	{
@@ -4162,14 +4163,13 @@ done_line:
 							pfootnotes->value_size);
 						strncpy((char*)pfootnotes->value,
 							(char*)token,
-							pfootnotes->value_size
-								- 1);
+							pfootnotes->value_size);
 					}
 				}
 			}
 		}
 
-		if (state & ST_BLOCKQUOTE && (!*pbuffer || *pbuffer != '>'))
+		if (IN(state, ST_BLOCKQUOTE) && (!*pbuffer || *pbuffer != '>'))
 		{
 			state &= ~ST_BLOCKQUOTE;
 			process_blockquote(output, TRUE);
@@ -4187,7 +4187,7 @@ done_line:
 			state &= ~(ST_TABLE_HEADER | ST_TABLE_LINE);
 		}
 
-		if ((state & ST_TABLE) && (!line_len || !*pbuffer))
+		if (IN(state, ST_TABLE) && (!line_len || !*pbuffer))
 		{
 			if (!read_yaml_macros_and_links)
 				process_table_end(output);
@@ -4208,7 +4208,7 @@ done_line:
 	if (!keep_token)
 		RESET_TOKEN(token, ptoken, token_size);
 
-	if (!skip_change_first_line_in_doc && !(state & ST_YAML))
+	if (!skip_change_first_line_in_doc && !IN(state, ST_YAML))
 		first_line_in_doc = FALSE;
 
 	skip_change_first_line_in_doc = FALSE;
@@ -4217,9 +4217,9 @@ done_line:
 		if (!previous_line_blank)
 		{
 			if (!read_yaml_macros_and_links
-				&& (state & ST_PARA_OPEN))
+				&& IN(state, ST_PARA_OPEN))
 			{
-				if (state & ST_LIST)
+				if (IN(state, ST_LIST))
 					process_list_item_end(output,
 						link_prefix);
 				else