build: Fix compilation issues on ARM platforms.

* Use int instead of char in places where we implicitly wanted to use
  a signed char, since char may be unsigned on some platforms.
* Don't hardcode assumed x86_64 architecture when looking for modules
  or include files.
* thread.c: Add workaround for thread unregistration.

Author: InterLinked1

Makefile

@@ -12,7 +12,7 @@ BBSTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
 
 export BBSTOPDIR		# Top level dir, used in subdirs' Makefiles
 
-GCCVERSION = $(shell gcc --version | grep ^gcc | sed 's/^.* //g')
+GCCVERSION := $(shell gcc --version | grep ^gcc | sed 's/^.* //g')
 GCCVERSIONGTEQ8 := $(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 8)
 ALPINE_LINUX := $(shell ls /etc/alpine-release 2>/dev/null | wc -l)
 

bbs/editor.c

@@ -42,7 +42,7 @@ int bbs_line_editor(struct bbs_node *node, const char *restrict instr, char *res
 	}
 
 	for (;;) {
-		char c;
+		int c;
 		bbs_node_buffer(node);
 		/* Read until we get 2 newlines */
 		for (;;) {

bbs/menu.c

@@ -484,7 +484,7 @@ static int menu_set_title(struct bbs_node *node, const char *name)
 static int bbs_menu_run(struct bbs_node *node, const char *menuname, const char *menuitemname, int stack, const char *optreq, char *restrict scratchbuf)
 {
 	int res;
-	char opt = 0;
+	int opt = 0;
 	struct bbs_menu *menu;
 	struct bbs_menu_item *menuitem;
 	char options[64]; /* No menu will ever have more than this many options... */
@@ -692,7 +692,7 @@ static int bbs_menu_run(struct bbs_node *node, const char *menuname, const char
 		}
 
 		/* We don't need to call MENUITEM_NOT_APPLICABLE here to check if it applies, it wouldn't be in the options buffer if it wasn't */
-		menuitem = find_menuitem(menu, opt);
+		menuitem = find_menuitem(menu, (char) opt);
 		/* It was in the menu and the menu hasn't changed, it better exist. */
 		if (!menuitem) {
 			bbs_warning("Could not find option '%c' in menu '%s'\n", opt, menu->name);

bbs/node.c

@@ -1993,8 +1993,7 @@ static int init_term_properties_automatic(struct bbs_node *node)
 
 static int ask_yn(struct bbs_node *node, const char *question)
 {
-	int i;
-	char c;
+	int i, c;
 	/* Since we're not sure if this terminal supports ANSI,
 	 * don't use any ANSI escape sequences, just keep it nice and simple. */
 	for (i = 0; i < 3; i++) {

bbs/socket.c

@@ -1937,9 +1937,9 @@ int bbs_expect_line(int fd, int ms, struct readline_data *rldata, const char *st
 	return 0;
 }
 
-static char bbs_tread(int fd, int ms)
+static int bbs_tread(int fd, int ms)
 {
-	signed char res;
+	int res;
 
 	if (fd < 0) {
 		bbs_error("Invalid file descriptor: %d\n", fd);
@@ -1948,11 +1948,11 @@ static char bbs_tread(int fd, int ms)
 	}
 
 	bbs_assert(ms > 0); /* There would be no reason to use bbs_node_tpoll over bbs_node_poll unless ms > 0. */
-	res = (char) bbs_poll(fd, ms);
+	res = (int) bbs_poll(fd, ms);
 
 	if (res > 0) {
 		char buf[1];
-		res = (char) read(fd, buf, sizeof(buf));
+		res = (int) read(fd, buf, sizeof(buf));
 		if (res <= 0) {
 			return res;
 		}
@@ -1961,16 +1961,16 @@ static char bbs_tread(int fd, int ms)
 	return res;
 }
 
-char bbs_node_tread(struct bbs_node *node, int ms)
+int bbs_node_tread(struct bbs_node *node, int ms)
 {
-	signed char res;
+	int res;
 
 	bbs_assert(ms > 0); /* There would be no reason to use bbs_node_tpoll over bbs_node_poll unless ms > 0. */
-	res = (char) bbs_node_tpoll(node, ms);
+	res = bbs_node_tpoll(node, ms);
 
 	if (res > 0) {
 		char buf[1];
-		res = (signed char) bbs_node_read(node, buf, sizeof(buf));
+		res = (int) bbs_node_read(node, buf, sizeof(buf));
 		if (res <= 0) {
 			return res;
 		}
@@ -1989,7 +1989,7 @@ static int __bbs_node_read_escseq(struct bbs_node *node, int fd)
 	/* We can't just declare a variable pointing to the right function to use, since their arguments are of different types (node vs int). Use a macro instead. */
 #define bbs_proper_tread(node, fd, ms) node ? bbs_node_tread(node, ms) : bbs_tread(fd, ms)
 
-	char c1, c2, c3;
+	int c1, c2, c3;
 	/* We already read ESC (27). Try to read further characters. */
 	c1 = bbs_proper_tread(node, fd, 10); /* 10ms ought to be more than enough. We should really get everything at once. */
 	if (c1 <= 0) {

bbs/thread.c

@@ -112,6 +112,16 @@ static int __thread_unregister(pthread_t id, const char *file, int line, const c
 	int remove = 0;
 	int lwp = -1;
 
+#if defined(__linux__) && defined(__GLIBC__)
+	/* For some reason, when detached threads exit on ARM (as opposed to x86),
+	 * the thread id is 1, rather than an actual thread.
+	 * However, since it's being run in the context of the exiting thread,
+	 * we can use pthread_self() to get the actual thread and then everything else works as expected. */
+	if (id == 1) {
+		id = pthread_self();
+	}
+#endif
+
 	RWLIST_WRLOCK(&thread_list);
 	RWLIST_TRAVERSE_SAFE_BEGIN(&thread_list, x, list) {
 #ifdef __FreeBSD__
@@ -205,7 +215,11 @@ void bbs_thread_cleanup(void)
 		 * especially if it's a thread that has been in the waitjoin state for some time (more than a couple seconds).
 		 * Be nice and free the memory anyways. */
 		print_time_elapsed(x->waitingjoin ? x->end : x->start, now, elapsed, sizeof(elapsed));
+#ifdef __linux__
+		bbs_warning("Thread still registered at shutdown: %d [%lu] (%s %s) %s\n", x->lwp, (unsigned long) x->id, thread_state_name(x), elapsed, x->name);
+#else
 		bbs_warning("Thread still registered at shutdown: %d (%s %s) %s\n", x->lwp, thread_state_name(x), elapsed, x->name);
+#endif
 		free_if(x->name);
 		free(x);
 	}

doors/door_usermgmt.c

@@ -248,7 +248,7 @@ static int pwchange_exec(struct bbs_node *node, const char *args)
 
 static int termmgmt_exec(struct bbs_node *node, const char *args)
 {
-	char c;
+	int c;
 
 	UNUSED(args);
 

external/Makefile

@@ -12,6 +12,9 @@ RM		= rm -f
 INSTALL = install
 NCURSES_FLAGS=$(shell pkg-config --cflags ncurses)
 
+ARCH = $(shell uname -m)
+CFLAGS += -DBBS_LINUX_ARCH=$(ARCH)
+
 all: $(EXES)
 
 $(EXES_NOFLEMGR): %: %.o

external/modman.c

@@ -335,7 +335,9 @@ static int load_header_file_locations(void)
 		len -= bytes;
 	}
 	pclose(pfp);
-#define SYS_INCLUDE_DIR "/usr/include/x86_64-linux-gnu"
+#define STR(s) #s
+#define XSTR(s) STR(s)
+#define SYS_INCLUDE_DIR "/usr/include/" XSTR(BBS_LINUX_ARCH) "-linux-gnu"
 	if (!strstr(buf, SYS_INCLUDE_DIR) && !access(SYS_INCLUDE_DIR, R_OK)) {
 		/* This directory is not explicitly returned by the gcc output, but all the <sys/...> header files live here: */
 		modman_log(7, "  System include path: %s\n", SYS_INCLUDE_DIR);
@@ -824,7 +826,7 @@ static void show_help(void)
 
 int main(int argc, char *argv[])
 {
-	char c;
+	int c;
 	static const char *getopt_settings = "?dhtv";
 
 	while ((c = getopt(argc, argv, getopt_settings)) != -1) {

include/node.h

@@ -523,7 +523,7 @@ int bbs_expect_line(int fd, int ms, struct readline_data *rldata, const char *st
  * \note This is useful for reading a single character (in non-canonical mode) with no delay
  * \retval 0 if fd closed, -1 on failure, non-negative character read otherwise
  */
-char bbs_node_tread(struct bbs_node *node, int ms);
+int bbs_node_tread(struct bbs_node *node, int ms);
 
 /*! * \brief Same as bbs_node_read_escseq, but directly on a file descriptor, rather than a node */
 int bbs_read_escseq(int fd);