Latest changes

Makefile

@@ -4,8 +4,14 @@
 BINDIR          = $(CURDIR)/build
 INCDIR          = $(CURDIR)/src/includes
 PERMS           = 755
-CC              = gcc
-C_FLAGS         = -g -Wall -W -MMD
+CC              = clang
+# -std=gnu23 = Use the C23 standard with GNU extras
+# -g         = Add debugging information to the executable
+# -Wall      = Enable all compiler warnings
+# -Wextra    = Extra warnings not covered by the above
+# -MMD       = Generate dependency files
+# -Wpedantic = Be pedantic about the code
+C_FLAGS         = -std=gnu23 -g -Wall -Wextra -MMD -Wpedantic
 CC_FLAGS        = -I$(INCDIR)
 LD_FLAGS        =
 
@@ -43,10 +49,18 @@ IDENTD_OBJS     = $(addprefix $(IDENTD_OBJ_DIR)/,$(notdir $(IDENTD_SRC:.c=.o)))
 #
 # Locations of vendors libraries
 #
-VENDOR_SDS_SRC_DIR  = $(TALKER_SRC_DIR)/vendors/sds
-VENDOR_SDS_OBJ_DIR  = $(TALKER_OBJ_DIR)
-VENDOR_SDS_SRC      = $(wildcard $(VENDOR_SDS_SRC_DIR)/*.c)
-VENDOR_SDS_OBJS     = $(addprefix $(VENDOR_SDS_OBJ_DIR)/,$(notdir $(VENDOR_SDS_SRC:.c=.o)))
+
+# SDS: https://github.com/antirez/sds
+VENDOR_SDS_SRC_DIR = $(TALKER_SRC_DIR)/vendors/sds
+VENDOR_SDS_OBJ_DIR = $(TALKER_OBJ_DIR)
+VENDOR_SDS_SRC     = $(wildcard $(VENDOR_SDS_SRC_DIR)/*.c)
+VENDOR_SDS_OBJS    = $(addprefix $(VENDOR_SDS_OBJ_DIR)/,$(notdir $(VENDOR_SDS_SRC:.c=.o)))
+
+# libtelnet: https://github.com/seanmiddleditch/libtelnet
+VENDOR_LIBTELNET_SRC_DIR = $(TALKER_SRC_DIR)/vendors/libtelnet
+VENDOR_LIBTELNET_OBJ_DIR = $(TALKER_OBJ_DIR)
+VENDOR_LIBTELNET_SRC     = $(wildcard $(VENDOR_LIBTELNET_SRC_DIR)/*.c)
+VENDOR_LIBTELNET_OBJS    = $(addprefix $(VENDOR_LIBTELNET_OBJ_DIR)/,$(notdir $(VENDOR_LIBTELNET_SRC:.c=.o)))
 
 #
 # Platform-specific libraries that need to be included
@@ -79,6 +93,7 @@ distclean: clean
 	rm -f $(TALKER_SRC_DIR)/*.[ch]~ $(TALKER_SRC_DIR)/*.[ch].bak
 	rm -f $(IDENTD_SRC_DIR)/*.[ch]~ $(IDENTD_SRC_DIR)/*.[ch].bak 
 	rm -f $(VENDOR_SDS_SRC_DIR)/*.[ch]~ $(VENDOR_SDS_SRC_DIR)/*.[ch].bak
+	rm -f $(VENDOR_LIBTELNET_SRC_DIR)/*.[ch]~ $(VENDOR_LIBTELNET_SRC_DIR)/*.[ch].bak
 	rm -f $(TALKER_BIN) $(BINDIR)/$(TALKER_BIN)
 	rm -f $(IDENTD_BIN) $(BINDIR)/$(IDENTD_BIN)
 	rm -f $(INCDIR)/*.[ch]~ $(INCDIR)/*.[ch].bak
@@ -88,27 +103,28 @@ clean:
 	rm -f $(TALKER_OBJS) $(TALKER_OBJS:.o=.d)
 	rm -f $(IDENTD_OBJS) $(IDENTD_OBJS:.o=.d)
 	rm -f $(VENDOR_SDS_OBJS) $(VENDOR_SDS_OBJS:.o=.d)
+	rm -f $(VENDOR_LIBTELNET_OBJS) $(VENDOR_LIBTELNET_OBJS:.o=.d)
 
 install: $(BINDIR)/$(TALKER_BIN) $(BINDIR)/$(IDENTD_BIN)
 
 build: $(TALKER_BIN) $(IDENTD_BIN)
 
-compile: $(TALKER_OBJS) $(IDENTD_OBJS) $(VENDOR_SDS_OBJS)
+compile: $(TALKER_OBJS) $(IDENTD_OBJS) $(VENDOR_SDS_OBJS) $(VENDOR_LIBTELNET_OBJS)
 
 print-%: ; @echo $* = $($*)
 
-vpath %.c $(TALKER_SRC_DIR) $(TALKER_SRC_DIR)/commands $(IDENTD_SRC_DIR) $(VENDOR_SDS_SRC_DIR)
+vpath %.c $(TALKER_SRC_DIR) $(TALKER_SRC_DIR)/commands $(IDENTD_SRC_DIR) $(VENDOR_SDS_SRC_DIR) $(VENDOR_LIBTELNET_SRC_DIR)
 
 $(BINDIR)/$(TALKER_BIN) $(BINDIR)/$(IDENTD_BIN): $(BINDIR)/%: %
 	@echo "Installing $< ..."
 	chmod $(PERMS) $<
 	mv $< $(BINDIR)
 
-$(TALKER_BIN): $(TALKER_OBJS) $(VENDOR_SDS_OBJS)
+$(TALKER_BIN): $(TALKER_OBJS) $(VENDOR_SDS_OBJS) $(VENDOR_LIBTELNET_OBJS)
 	@echo "Linking $@ ..."
 	$(CC) $(LD_FLAGS) $^ $(TALKER_LIBS) -o $@
 
-$(IDENTD_BIN): $(IDENTD_OBJS) $(VENDOR_SDS_OBJS)
+$(IDENTD_BIN): $(IDENTD_OBJS) $(VENDOR_SDS_OBJS) $(VENDOR_LIBTELNET_OBJS)
 	@echo "Linking $@ ..."
 	$(CC) $(LD_FLAGS) $^ $(IDENTD_LIBS) -o $@
 
@@ -127,4 +143,9 @@ $(VENDOR_SDS_OBJS): $(VENDOR_SDS_OBJ_DIR)/%.o: %.c
 	@test -d $(VENDOR_SDS_OBJ_DIR) || mkdir $(VENDOR_SDS_OBJ_DIR)
 	$(CC) $(C_FLAGS) $(CC_FLAGS) $(TALKER_FLAGS) -c -o $@ $<
 
--include $(TALKER_OBJS:.o=.d) $(IDENTD_OBJS:.o=.d) $(VENDOR_SDS_OBJS:.o=.d)
+$(VENDOR_LIBTELNET_OBJS): $(VENDOR_LIBTELNET_OBJ_DIR)/%.o: %.c
+	@echo "Compiling libtelnet library $< ... ($@)"
+	@test -d $(VENDOR_LIBTELNET_OBJ_DIR) || mkdir $(VENDOR_LIBTELNET_OBJ_DIR)
+	$(CC) $(C_FLAGS) $(CC_FLAGS) $(TALKER_FLAGS) -c -o $@ $<
+
+-include $(TALKER_OBJS:.o=.d) $(IDENTD_OBJS:.o=.d) $(VENDOR_SDS_OBJS:.o=.d) $(VENDOR_LIBTELNET_OBJS:.o=.d)

docker-setup.sh

@@ -1,24 +1,14 @@
 #!/usr/bin/env bash
 
-MACHINE=$(uname -m)
-if [ "$MACHINE" == "x86_64" ] || [ "$MACHINE" == "i686" ]; then
-    OS_ARCH="amd64"
-elif [ "$MACHINE" == "aarch64" ] || [ "$MACHINE" == "arm64" ]; then
-    OS_ARCH="arm64v8"
-else
-    OS_ARCH="amd64"
-    echo "Unknown platform - falling back to amd64"
-fi
-
 CONFIG_FILE="$(pwd)/files/datafiles/config"
 MAIN_PORT=$(grep "\bmainport\b" "$CONFIG_FILE" | awk '{ print $2 }')
 WIZ_PORT=$(grep "\bwizport\b" "$CONFIG_FILE" | awk '{ print $2 }')
 LINK_PORT=$(grep "\blinkport\b" "$CONFIG_FILE" | awk '{ print $2 }')
 
 cat << EOT > Dockerfile
-FROM ${OS_ARCH}/alpine
+FROM alpine:latest
 
-RUN apk add build-base supervisor bash busybox-extras gdb
+RUN apk add --no-cache build-base bash busybox-extras clang gdb lldb supervisor
 COPY supervisord.conf /etc/supervisord.conf
 
 WORKDIR /amnuts
@@ -30,7 +20,6 @@ CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]
 EOT
 
 cat << EOT > docker-compose.yml
-version: "3"
 services:
   amnuts:
     build: ./
@@ -49,4 +38,4 @@ services:
       - seccomp:unconfined
     cap_add:
       - SYS_PTRACE
-EOT
+EOT

docs/amnuts_changes

@@ -3,6 +3,24 @@
         Information on the changes between different version of Amnuts
 +------------------------------------------------------------------------------+
 
+2.5.0
+-----
+
+Added libtelnet vendor library to help with telnet negotiation
+Added workaround to libtelnet to be able to use the '%' symbol in speech :)
+
+Updated the cmdcount command code to make it better
+
+Fixed display bug in the preview command
+
+2.4.0
+-----
+
+Almost all of the commands have been moved to their own files, so a fair bit of reworking structure
+Added the SDS vendor library to start marking string copying/formatting/sizes a little safer, and made a start on that (long, long) journey
+A docker setup has been added for those who want to run or compile Amnuts in a container
+Various typos fixed
+Some docs updated
 
 2.3.0
 -----