slw2gmi

чување 83fa4b0cb8b34231c81ffc0fa41b7268410890a1
родитељ cfbedcdab0c203c38ad7d7c954a9740ac71d343b
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Sat, 10 Jun 2023 23:24:32 +0200

Disable incdir-only-summary for slw2gmi as it's not applicable

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

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

измењених датотека: 1, додавања: 18(+), брисања: 16(-)
diff --git a/slw2gmi.c b/slw2gmi.c
@@ -316,7 +316,7 @@ print_output(FILE* output, const char* fmt, ...)
 	char buf[BUFSIZE];
 	va_list args;
 	u8* var_incdir_only_summary = NULL;
-	int incdir_only_summary	    = 0;
+	// int incdir_only_summary	    = 0;
 
 	if (!output || !fmt)
 		exit(error(EINVAL, (u8*)"print_output: Invalid argument"));
@@ -328,10 +328,11 @@ print_output(FILE* output, const char* fmt, ...)
 	incdir_only_summary
 		= var_incdir_only_summary && *var_incdir_only_summary == '1';
 
-	if (IN(state, ST_INCDIR) && !IN(state, ST_SUMMARY)
+	/*if (IN(state, ST_INCDIR) && !IN(state, ST_SUMMARY)
 		&& incdir_only_summary)
 		return 0;
-	else if (IN(state, ST_CSV_BODY))
+	else*/
+	if (IN(state, ST_CSV_BODY))
 	{
 		size_t buf_len = 0;
 		vsnprintf((char*)buf, BUFSIZE, fmt, args);
@@ -1481,13 +1482,14 @@ reverse_alphacompare(const struct dirent** a, const struct dirent** b)
 }
 
 int process_timestamp(FILE* output, const u8* link_prefix, const char* link,
-	const u8* permalink_macro, const u8* date, const u8* title);
+	const u8* permalink_macro, const u8* date, const u8* title,
+	const int ext_in_permalink);
 
 int
 process_incdir_subdir(FILE* output, const char* subdirname,
 	const u8* link_prefix, const int details_open, const u8* macro_body,
 	const u8* footer_permalink_text, const char* permalink_url,
-	int ext_in_permalink)
+	const int ext_in_permalink)
 {
 	struct dirent** namelist;
 	struct dirent** pnamelist;
@@ -1512,7 +1514,7 @@ process_incdir_subdir(FILE* output, const char* subdirname,
 	names_output = 0;
 	while (names_output < names_total)
 	{
-		int pstatus    = 0;
+		int pstatus = 0;
 
 		fflush(output);
 		pid_t pid = fork();
@@ -1527,9 +1529,9 @@ process_incdir_subdir(FILE* output, const char* subdirname,
 			size_t buffer_size = 0;
 			int result	   = 0;
 			ULLONG saved_state = ST_NONE;
-			char* filename = NULL;
-			char* basename = strip_ext((*pnamelist)->d_name);
-			char* link     = NULL;
+			char* filename	   = NULL;
+			char* basename	   = strip_ext((*pnamelist)->d_name);
+			char* link	   = NULL;
 
 			CALLOC(link, char, BUFSIZE);
 			CALLOC(filename, char, BUFSIZE);
@@ -1591,8 +1593,8 @@ process_incdir_subdir(FILE* output, const char* subdirname,
 			u8* date  = get_value(vars, vars_count, (u8*)"date");
 			u8* title = get_value(vars, vars_count, (u8*)"title");
 
-			process_timestamp(output, link_prefix, link,
-				NULL, date, title);
+			process_timestamp(output, link_prefix, link, NULL, date,
+				title, ext_in_permalink);
 
 			state = saved_state;
 
@@ -1725,7 +1727,8 @@ int url_is_local(const char* url);
 
 int
 process_timestamp(FILE* output, const u8* link_prefix, const char* link,
-	const u8* permalink_macro, const u8* date, const u8* title)
+	const u8* permalink_macro, const u8* date, const u8* title,
+	const int ext_in_permalink)
 {
 	u8* day			      = NULL;
 	u8* month		      = NULL;
@@ -1766,10 +1769,9 @@ process_timestamp(FILE* output, const u8* link_prefix, const char* link,
 		url_is_local(link) && global_link_prefix
 			? (const char*)global_link_prefix
 			: "",
-		url_is_local(link) && link_prefix
-			? (const char*)link_prefix
-			: "",
-		link, timestamp_output_ext,
+		url_is_local(link) && link_prefix ? (const char*)link_prefix
+						  : "",
+		link, ext_in_permalink ? timestamp_output_ext : "",
 		formatted_date, title ? (const char*)title : "");
 	output_firstcol = 1;
 process_timestamp_cleanup: