about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-04-13 11:20:44 -0400
committerJune McEnroe <june@causal.agency>2020-04-13 11:20:44 -0400
commita0423730e77803a95fb52ba67856b52221a246ae (patch)
treeaa97e81dd34b7e0fd8a7a3aa31510710c545c89a
parentConcatenate HTML threads (diff)
downloadbubger-a0423730e77803a95fb52ba67856b52221a246ae.tar.gz
bubger-a0423730e77803a95fb52ba67856b52221a246ae.zip
Fix concatHTML thread nesting
Diffstat (limited to '')
-rw-r--r--concat.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/concat.c b/concat.c
index 6d0e507..07d1f6f 100644
--- a/concat.c
+++ b/concat.c
@@ -81,17 +81,17 @@ static int concatHTML(FILE *file, struct List thread) {
 	static char path[PATH_MAX];
 	int error;
 	for (size_t i = 0; i < thread.len; ++i) {
-		error = htmlThreadOpen(file);
-		if (error) return error;
 		if (thread.ptr[i].type == List) {
 			error = concatHTML(file, thread.ptr[i].list);
 		} else {
 			uint32_t uid = dataCheck(thread.ptr[i], Number).number;
-			error = concatFile(file, pathUID(path, uid, "html"));
+			error = htmlThreadOpen(file)
+				|| concatFile(file, pathUID(path, uid, "html"));
 		}
 		if (error) return error;
 	}
 	for (size_t i = 0; i < thread.len; ++i) {
+		if (thread.ptr[i].type == List) continue;
 		error = htmlThreadClose(file);
 		if (error) return error;
 	}
-12 00:48:43 -0500'>2020-02-12Allow for arguments to open/copy utilitiesJune McEnroe 2020-02-12Handle RPL_AWAYJune McEnroe 2020-02-11Support monochromatic terminalsJune McEnroe Oops, division by zero! 2020-02-11Add .gz to chroot-man scriptJune McEnroe 2020-02-11Add -R restricted flagJune McEnroe 2020-02-11Add chroot targetJune McEnroe 2020-02-11Exit focus and paste modes on err exitJune McEnroe 2020-02-11Add startup GPLv3 note and URLJune McEnroe I am a degenerate. 2020-02-11Make sure -D_GNU_SOURCE ends up in CFLAGS on LinuxJune McEnroe 2020-02-11Add note about setting PKG_CONFIG_PATHJune McEnroe 2020-02-11Rename query ID on nick changeJune McEnroe 2020-02-11Call completeClear when closing a windowJune McEnroe 2020-02-11Don't insert color codes for non-mentionsJune McEnroe 2020-02-11Take first two words in colorMentionsJune McEnroe This lets phrases like "hi june" get colored, but still doesn't get carried away. 2020-02-11Use time_t for save signatureJune McEnroe It's actually more likely to be 64-bit than size_t anyway, and it eliminates some helper functions. Also don't error when reading an empty save file. 2020-02-11Set self.nick to * initiallyJune McEnroe Allows removing a bunch of checks that self.nick is set, and it's what the server usually calls you before registration. Never highlight notices as mentions. 2020-02-11Define ColorCap instead of hardcoding 100June McEnroe 2020-02-11Move hash to top of chat.hJune McEnroe 2020-02-11Move base64 out of chat.hJune McEnroe 2020-02-11Move XDG_SUBDIR out of chat.hJune McEnroe 2020-02-11Fix whois idle unit calculationJune McEnroe Rookie mistake. 2020-02-11Cast towupper to wchar_tJune McEnroe For some reason it takes and returns wint_t... 2020-02-11Cast set but unused variables to voidJune McEnroe 2020-02-11Declare strlcatJune McEnroe 2020-02-11Check if VDSUSP existsJune McEnroe 2020-02-11Fix completeReplace iterationJune McEnroe 2020-02-11Use pkg(8) to configure on FreeBSDJune McEnroe 2020-02-11Remove legacy codeJune McEnroe 2020-02-11Add INSTALLING section to READMEJune McEnroe