Add an AStyle config that doesn't bother me.

Biggest issue with this one is it doesn't allow BSD-style continuation
indentation, and forces aligning with parens.

src/syncterm/.astylerc

+--style=stroustrup
+--indent=tab=8
+--attach-extern-c
+--attach-closing-while
+--indent-switches
+# Maybe...
+#--indent-after-parens
+--indent-continuation=1
+
+--indent-preproc-block
+--pad-oper
+--pad-include
+--pad-header
+--unpad-paren
+--unpad-brackets
+--squeeze-lines=2
+--squeeze-ws
+--align-pointer=name
+--align-reference=type
+--min-conditional-indent=3
+
+--break-closing-braces
+--break-one-line-headers
+# Danger!
+--remove-braces
+--break-return-type
+--attach-return-type-decl
+--convert-tabs
+--max-code-length=115
+

src/syncterm/bbslist.c

@@ -572,9 +572,8 @@ listcmp(const void *aptr, const void *bptr)
 		item = abs(sortorder[i]);
 		reverse = (sortorder[i] < 0 ? 1 : 0) ^ ((sort_order[item].flags & SORT_ORDER_REVERSED) ? 1 : 0);
 		if (sort_order[item].name) {
-			if (sort_order[item].flags & SORT_ORDER_STRING) {
+			if (sort_order[item].flags & SORT_ORDER_STRING)
 				ret = stricmp(a + sort_order[item].offset, b + sort_order[item].offset);
-			}
 			else {
 				ret =
 				        intbufcmp(a + sort_order[item].offset,
@@ -587,10 +586,9 @@ listcmp(const void *aptr, const void *bptr)
 				return ret;
 			}
 		}
-		else {
+		else
 			return ret;
 	}
-	}
 	return 0;
 }
 
@@ -633,9 +631,8 @@ write_sortorder(void)
 		inicontents = iniReadFile(inifile);
 		fclose(inifile);
 	}
-	else {
+	else
 		inicontents = strListInit();
-	}
 
 	iniSetStringList(&inicontents, "SyncTERM", "SortOrder", ",", sortorders, &ini_style);
 	if ((inifile = fopen(inipath, "w")) != NULL) {
@@ -675,10 +672,9 @@ edit_sorting(struct bbslist **list, int *listcount, int *ocur, int *obar, char *
 				    ^ ((sort_order[abs(sortorder[i])].flags & SORT_ORDER_REVERSED) ? 1 : 0))
 					strcat(opt[i], " (reversed)");
 			}
-			else {
+			else
 				opt[i][0] = 0;
 		}
-		}
 		uifc.helpbuf = "`Sort Order`\n\n"
 		               "Move the highlight bar to the position you would like\n"
 		               "to add a new ordering before and press ~INSERT~.  Choose\n"
@@ -739,10 +735,9 @@ edit_sorting(struct bbslist **list, int *listcount, int *ocur, int *obar, char *
 			        &(sortorder[(ret & MSK_OFF)]) + 1,
 			        sizeof(sortorder) - sizeof(sortorder[0]) * ((ret & MSK_OFF) + 1));
 		}
-		else {
+		else
 			sortorder[ret & MSK_OFF] = 0 - sortorder[ret & MSK_OFF];
 	}
-	}
 
 	/* Write back to the .ini file */
 	write_sortorder();
@@ -812,9 +807,8 @@ read_item(str_list_t listfile, struct bbslist *entry, char *bbsname, int id, int
 		else
 			entry->has_fingerprint = false;
 	}
-	else {
+	else
 		entry->has_fingerprint = false;
-	}
 	entry->sftp_public_key = iniGetBool(section, NULL, "SFTPPublicKey", false);
 	iniGetSString(section, NULL, "DownloadPath", home, entry->dldir, sizeof(entry->dldir));
 	iniGetSString(section, NULL, "UploadPath", home, entry->uldir, sizeof(entry->uldir));
@@ -952,14 +946,12 @@ printf_trunc(char *dst, size_t dstsz, char *fmt, char *path)
 			sprintf(dst, fmt, mangled);
 			free(mangled);
 		}
-		else {
+		else
 			sprintf(dst, fmt, "<Long>");
 	}
-	}
-	else {
+	else
 		sprintf(dst, fmt, path);
 }
-}
 
 void
 configure_log(struct bbslist *item, const char *itemname, str_list_t inifile, int *changed)
@@ -1004,9 +996,8 @@ configure_log(struct bbslist *item, const char *itemname, str_list_t inifile, in
 					iniSetString(&inifile, itemname, "LogFile", item->logfile, &ini_style);
 					*changed = 1;
 				}
-				else {
+				else
 					check_exit(false);
-				}
 				break;
 			case 1:
 				uifc.helpbuf = "`File Transfer Log Level`\n\n"
@@ -1176,7 +1167,8 @@ build_edit_list(struct bbslist *item, char opt[][69], int *optmap, char **opts,
 	int i = 0;
 	char str[64];
 	bool is_ansi = true;
-	bool is_serial = ((item->conn_type == CONN_TYPE_MODEM) || (item->conn_type == CONN_TYPE_SERIAL) || (item->conn_type == CONN_TYPE_SERIAL_NORTS));
+	bool is_serial = ((item->conn_type == CONN_TYPE_MODEM) || (item->conn_type == CONN_TYPE_SERIAL)
+	|| (item->conn_type == CONN_TYPE_SERIAL_NORTS));
 
 	if (!isdefault) {
 		optmap[i] = BBSLIST_FIELD_NAME;
@@ -1299,7 +1291,8 @@ build_edit_help(struct bbslist *item, int isdefault, char *helpbuf, size_t hbsz)
 {
 	size_t hblen = 0;
 	bool is_ansi = true;
-	bool is_serial = ((item->conn_type == CONN_TYPE_MODEM) || (item->conn_type == CONN_TYPE_SERIAL) || (item->conn_type == CONN_TYPE_SERIAL_NORTS));
+	bool is_serial = ((item->conn_type == CONN_TYPE_MODEM) || (item->conn_type == CONN_TYPE_SERIAL)
+	|| (item->conn_type == CONN_TYPE_SERIAL_NORTS));
 
 	if (get_emulation(item) != CTERM_EMULATION_ANSI_BBS)
 		is_ansi = false;
@@ -1308,12 +1301,10 @@ build_edit_help(struct bbslist *item, int isdefault, char *helpbuf, size_t hbsz)
 	 * Not using strncpy() here because memset()ing the whole thing
 	 * to NUL here is stupid.
 	 */
-	if (isdefault) {
+	if (isdefault)
 		hblen = strlcpy(helpbuf, "`Edit Default Connection`\n\n", hbsz);
-	}
-	else {
+	else
 		hblen = strlcpy(helpbuf, "`Edit Directory Entry`\n\n", hbsz);
-	}
 
 	hblen += strlcat(helpbuf + hblen, "Select item to edit.\n\n", hbsz - hblen);
 
@@ -1458,9 +1449,8 @@ edit_list(struct bbslist **list, struct bbslist *item, char *listpath, int isdef
 		inifile = iniReadFile(listfile);
 		fclose(listfile);
 	}
-	else {
+	else
 		inifile = strListInit();
-	}
 
 	if (isdefault)
 		itemname = NULL;
@@ -1478,9 +1468,8 @@ edit_list(struct bbslist **list, struct bbslist *item, char *listpath, int isdef
 		if (i < -1)
 			continue;
 		// Remember, i gets converted to (unsigned) size_t in comparison
-		if (i > 0 && i >= (sizeof(optmap) / sizeof(optmap[0]))) {
+		if (i > 0 && i >= (sizeof(optmap) / sizeof(optmap[0])))
 			continue;
-		}
 		if (i >= 0) {
 			if (optmap[i] == BBSLIST_FIELD_NONE)
 				continue;
@@ -1883,9 +1872,8 @@ edit_list(struct bbslist **list, struct bbslist *item, char *listpath, int isdef
 					iniSetInteger(&inifile, itemname, "ANSIMusic", item->music, &ini_style);
 					changed = 1;
 				}
-				else {
+				else
 					check_exit(false);
-				}
 				break;
 			case BBSLIST_FIELD_ADDRESS_FAMILY:
 				uifc.helpbuf = address_family_help;
@@ -1901,9 +1889,8 @@ edit_list(struct bbslist **list, struct bbslist *item, char *listpath, int isdef
 					           &ini_style);
 					changed = 1;
 				}
-				else {
+				else
 					check_exit(false);
-				}
 				break;
 			case BBSLIST_FIELD_FONT:
 				uifc.helpbuf = "`Font`\n\n"
@@ -1977,9 +1964,8 @@ add_bbs(char *listpath, struct bbslist *bbs, bool new_entry)
 		inifile = iniReadFile(listfile);
 		fclose(listfile);
 	}
-	else {
+	else
 		inifile = strListInit();
-	}
 
 	/*
 	 * Redundant:
@@ -2019,9 +2005,8 @@ add_bbs(char *listpath, struct bbslist *bbs, bool new_entry)
 	if (bbs->has_fingerprint) {
 		char fp[41];
 		fp[0] = 0;
-		for (int i = 0; i < 20; i++) {
+		for (int i = 0; i < 20; i++)
 			sprintf(&fp[i * 2], "%02x", bbs->ssh_fingerprint[i]);
-		}
 		fp[sizeof(fp) -1] = 0;
 		iniSetString(&inifile, bbs->name, "SSHFingerprint", fp, &ini_style);
 	}
@@ -2171,9 +2156,8 @@ change_settings(int connected)
 		inicontents = iniReadFile(inifile);
 		fclose(inifile);
 	}
-	else {
+	else
 		inicontents = strListInit();
-	}
 
 	for (i = 0; i < 13; i++)
 		opt[i] = opts[i];
@@ -2375,9 +2359,8 @@ change_settings(int connected)
 						}
 					}
 				}
-				else {
+				else
 					check_exit(false);
-				}
 				break;
 			case 5:
 				uifc.helpbuf = "`Modem/Comm Device`\n\n"
@@ -2393,9 +2376,8 @@ change_settings(int connected)
 					             settings.mdm.device_name,
 					             &ini_style);
 				}
-				else {
+				else
 					check_exit(false);
-				}
 				break;
 			case 6:
 				uifc.helpbuf = "`Modem/Comm Rate`\n\n"
@@ -2413,9 +2395,8 @@ change_settings(int connected)
 					              settings.mdm.com_rate,
 					              &ini_style);
 				}
-				else {
+				else
 					check_exit(false);
-				}
 				break;
 
 			case 7:
@@ -2446,9 +2427,8 @@ change_settings(int connected)
 					             settings.mdm.init_string,
 					             &ini_style);
 				}
-				else {
+				else
 					check_exit(false);
-				}
 				break;
 			case 8:
 				uifc.helpbuf = "`Modem Dial String`\n\n"
@@ -2462,9 +2442,8 @@ change_settings(int connected)
 					             settings.mdm.dial_string,
 					             &ini_style);
 				}
-				else {
+				else
 					check_exit(false);
-				}
 				break;
 			case 9:
 				uifc.helpbuf = "`List Path`\n\n"
@@ -2479,9 +2458,8 @@ change_settings(int connected)
 					if (list_override == NULL)
 						SAFECOPY(settings.list_path, settings.stored_list_path);
 				}
-				else {
+				else
 					check_exit(false);
-				}
 				break;
 			case 10:
 				uifc.helpbuf = "`TERM For Shell`\n\n"
@@ -2783,9 +2761,8 @@ edit_comment(struct bbslist *list, char *listpath)
 		inifile = iniReadFile(listfile);
 		fclose(listfile);
 	}
-	else {
+	else
 		goto done;
-	}
 
 	old = strdup(list->comment);
 	if (!old)
@@ -2991,9 +2968,8 @@ show_bbslist(char *current, int connected)
 						if (p != NULL)
 							*p = ')';
 					}
-					else {
+					else
 						SAFECOPY(title, syncterm_version);
-					}
 					settitle(title);
 				}
 				oldopt = opt;
@@ -3285,8 +3261,7 @@ show_bbslist(char *current, int connected)
 									case CONN_TYPE_SERIAL_NORTS:
 									case CONN_TYPE_SHELL:
 										break;
-									default:
-									{
+									default: {
 										char *p = strrchr(list[listcount - 1]->addr + 1, ':');
 										if (p != NULL && p == strchr(list[listcount - 1]->addr, ':')) {
 											char *tp;