revert: remove cmocka 2.0 compatibility workaround

Restore original prof_cmocka.h - the CMOCKA_DISABLE_DEPRECATION_WARNINGS
workaround is not needed for this project.

.github/workflows/ci-code.yml

@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Run tests
         run: |
-          docker build -f Dockerfile.${{ matrix.flavor }} -t profanity .
+          docker build --no-cache -f Dockerfile.${{ matrix.flavor }} -t profanity .
           docker run profanity ./ci-build.sh
 
   code-style:
@@ -50,9 +50,6 @@ jobs:
         run: |
           grep -P 'auto_(char|gchar|gcharv|guchar|jid|sqlite|gfd|FILE)[\w *]*;$' -r src && exit -1 || true
 
-      - name: Check CWE-134 format string vulnerabilities
-        run: ./check-cwe134.sh
-
       - name: Install clang-format
         run: |
           sudo apt-get update
@@ -109,5 +106,25 @@ jobs:
       - uses: actions/checkout@v4
       - name: Build and run coverage
         run: |
-          docker build -f Dockerfile.arch -t profanity-cov .
-          docker run profanity-cov ./ci-build.sh --coverage-only
+          docker build -f Dockerfile.debian -t profanity-cov .
+          docker run -v ${{ github.workspace }}/coverage:/coverage profanity-cov bash -c '
+            ./bootstrap.sh
+            ./configure --enable-coverage --enable-otr --enable-pgp --enable-omemo --enable-plugins
+            make -j$(nproc)
+            make check || true
+            make check-functional-parallel || true
+            lcov --capture --directory . --output-file /coverage/coverage.info \
+              --rc branch_coverage=1 \
+              --ignore-errors inconsistent
+            lcov --remove /coverage/coverage.info \
+              "/usr/include/*" "*/tests/*" \
+              --output-file /coverage/coverage.info \
+              --rc branch_coverage=1 \
+              --ignore-errors inconsistent,empty,unused
+          '
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          files: ./coverage/coverage.info
+          fail_ci_if_error: false
+          verbose: true

.gitignore

@@ -62,8 +62,6 @@ tests/unittests/unittests
 tests/unittests/unittests.log
 tests/unittests/unittests.trs
 test-suite.log
-test-files/
-test-logs/
 
 # valgrind output
 profval*
@@ -110,7 +108,3 @@ breaks
 *.zip
 *.log*
 coverage/
-*.gcno
-*.gcda
-*.gcov
-coverage.info

CHANGELOG

@@ -1,16 +1,3 @@
-0.16.0 (unreleased)
-===================
-
-Changes:
-- Add flat-file database backend as alternative to SQLite for message history.
-  Stores messages as human-readable plain text files. Configure with `/privacy logging flatfile`.
-  Files are stored in ~/.local/share/profanity/flatlog/.
-- Add `/history verify [<jid>]` command to check integrity of stored message
-  history (works with both SQLite and flat-file backends).
-- Add vtable-based database backend abstraction allowing pluggable storage.
-- Add `make check-functional-flatfile` target to run functional tests with
-  flat-file backend.
-
 0.15.0 (2025-03-27)
 ===================
 

CONTRIBUTING.md

@@ -90,24 +90,6 @@ set -e
 ```
 
 This will run the same tests that the CI runs and refuse the push if it fails.
-The CI script runs 4 parallel builds with different configurations:
-- **Full** — all features enabled (+ coverage in `--coverage-only` mode)
-- **Minimal** — all optional features disabled
-- **NoEncrypt** — no encryption (OTR, PGP, OMEMO disabled)
-- **Default** — default ./configure options
-
-Each build runs Valgrind and functional tests on Linux.
-Use `./ci-build.sh --coverage-only` to run only the Full build with coverage collection.
-
-Output shows test results per build:
-```
-✓ Full PASSED
-  Unit tests:       437 passed, 0 failed
-  Functional tests: 69 passed, 0 failed
-  Coverage:         Lines: 27.5% | Functions: 36.2% | Branches: 18.1%
-  Duration:         5m39s
-```
-
 Note that it will run on the actual content of the repository directory and not
 what may have been staged/committed.
 
@@ -123,20 +105,6 @@ Test your changes with the following tools to find mistakes.
 
 Run `make check` to run the unit tests with your current configuration or `./ci-build.sh` to check with different switches passed to configure.
 
-### flat-file backend tests
-
-To run functional tests with the flat-file database backend (instead of SQLite):
-
-```bash
-make check-functional-flatfile
-```
-
-Or manually for a single group:
-
-```bash
-PROF_FLATFILE=1 PROF_TEST_GROUP=1 ./tests/functionaltests/functionaltests 1
-```
-
 ### valgrind
 We provide a suppressions file `prof.supp`. It is a combination of the suppressions for shipped with glib2, python and custom rules.
 
@@ -158,16 +126,6 @@ scan-build make
 scan-view ...
 ```
 
-### Security checks
-
-We have a static analyzer `check-cwe134.sh` that detects CWE-134 format string vulnerabilities. It runs automatically in CI but you can also run it locally:
-
-```bash
-./check-cwe134.sh
-```
-
-This checks for unsafe patterns where data could be passed directly as a format string to functions like `printf`, `cons_show`, etc. Never pass a raw string for formatting; use `"%s"` format specifier instead.
-
 ### Finding typos
 
 We include a `.codespellrc` configuration file for `codespell` in the root directory.
@@ -189,28 +147,9 @@ The functional test suite uses [stabber](https://git.jabber.space/devs/stabber)
 Functional tests require stabber to be installed. Once installed, tests run as part of `make check`:
 
 ```bash
-make check                      # Run all tests (unit + functional)
-make check-functional-parallel  # Run functional tests in parallel (~3x faster)
-./tests/functionaltests/functionaltests    # Run all functional tests sequentially
-./tests/functionaltests/functionaltests 1  # Run specific group (1-4)
+make check
 ```
 
-#### Test groups
-
-Tests are organized into 4 groups for parallel execution:
-
-| Group | Description |
-|-------|-------------|
-| 1 | Connect, Ping, Rooms, Software |
-| 2 | Message, Receipts, Roster, Chat Session |
-| 3 | Presence, Disconnect |
-| 4 | MUC, Carbons |
-
-To add a new group:
-1. Define the test array in `functionaltests.c`
-2. Add entry to `groups[]` array
-3. Update `FUNC_TEST_GROUPS` in `Makefile.am`
-
 #### Writing functional tests
 
 Use content-based stubbing with stabber:
@@ -229,5 +168,4 @@ Guidelines:
 2. Use `stbbr_send(xml)` for presence, message, and other push-style stanzas.
 3. Keep assertions tolerant of ordering when possible; use `prof_output_regex()` for flexible matching.
 4. If timing issues appear, use `prof_timeout()` around critical expectations and reset afterwards.
-5. When adding new tests, place them in the appropriate group based on functionality.
 

Dockerfile.arch

@@ -1,10 +1,9 @@
-FROM archlinux:latest
+FROM archlinux
 
 ENV TERM=xterm
 ENV CC="ccache gcc"
 
-RUN pacman -Syyu --noconfirm
-
+RUN pacman -Syu --noconfirm
 # reflector is optional - if it fails due to network issues, continue with default mirrorlist
 RUN pacman -S --needed --noconfirm reflector && \
     (reflector --latest 20 --protocol https --sort rate --save /etc/pacman.d/mirrorlist || true)
@@ -14,7 +13,6 @@ RUN pacman -S --needed --noconfirm \
   autoconf-archive \
   automake \
   base-devel \
-  ca-certificates \
   ccache \
   check \
   cmake \
@@ -66,7 +64,7 @@ USER root
 RUN pacman -U --noconfirm libstrophe-git/libstrophe-git-*.pkg.tar.zst
 
 WORKDIR /usr/src
-RUN git clone --depth 1 https://git.jabber.space/devs/stabber
+RUN git clone --depth 1 -c http.sslverify=false https://git.jabber.space/devs/stabber
 
 WORKDIR /usr/src/stabber
 RUN ./bootstrap.sh

Dockerfile.debian

@@ -9,7 +9,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   autoconf \
   autoconf-archive \
   automake \
-  ca-certificates \
   ccache \
   gcc \
   git \
@@ -41,8 +40,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN mkdir -p /usr/src/{stabber,libstrophe,profanity}
 WORKDIR /usr/src
 
-RUN git clone --depth 1 https://git.jabber.space/devs/stabber
-RUN git clone --depth 1 https://github.com/strophe/libstrophe
+RUN git clone --depth 1 -c http.sslverify=false https://git.jabber.space/devs/stabber
+RUN git clone --depth 1 -c http.sslverify=false https://github.com/strophe/libstrophe
 
 WORKDIR /usr/src/stabber
 RUN ./bootstrap.sh

Dockerfile.fedora

@@ -11,7 +11,6 @@ RUN dnf install -y \
   autoconf-archive \
   automake \
   awk \
-  ca-certificates \
   ccache \
   gcc \
   git \
@@ -51,7 +50,7 @@ ENV TERM=xterm
 RUN mkdir -p /usr/src
 WORKDIR /usr/src
 
-RUN git clone --depth 1 https://git.jabber.space/devs/stabber
+RUN git clone --depth 1 -c http.sslverify=false https://git.jabber.space/devs/stabber
 WORKDIR /usr/src/stabber
 RUN ./bootstrap.sh
 RUN ./configure --prefix=/usr --disable-dependency-tracking
@@ -60,7 +59,7 @@ RUN make install
 
 WORKDIR /usr/src
 RUN mkdir -p /usr/src/libstrophe
-RUN git clone --depth 1 https://github.com/strophe/libstrophe
+RUN git clone --depth 1 -c http.sslverify=false https://github.com/strophe/libstrophe
 WORKDIR /usr/src/libstrophe
 RUN ./bootstrap.sh
 RUN ./configure --prefix=/usr

Dockerfile.tumbleweed

@@ -10,7 +10,6 @@ RUN zypper --non-interactive in --no-recommends \
   autoconf \
   autoconf-archive \
   automake \
-  ca-certificates \
   ccache \
   gcc \
   git \
@@ -50,7 +49,7 @@ ENV TERM=xterm
 RUN mkdir -p /usr/src
 WORKDIR /usr/src
 
-RUN git clone --depth 1 https://git.jabber.space/devs/stabber
+RUN git clone --depth 1 -c http.sslverify=false https://git.jabber.space/devs/stabber
 WORKDIR /usr/src/stabber
 RUN ./bootstrap.sh
 RUN ./configure --prefix=/usr --disable-dependency-tracking

Dockerfile.ubuntu

@@ -8,7 +8,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   autoconf \
   autoconf-archive \
   automake \
-  ca-certificates \
   ccache \
   gcc \
   git \
@@ -40,8 +39,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN mkdir -p /usr/src/{stabber,libstrophe,profanity}
 WORKDIR /usr/src
 
-RUN git clone --depth 1 https://git.jabber.space/devs/stabber
-RUN git clone --depth 1 https://github.com/strophe/libstrophe
+RUN git clone --depth 1 -c http.sslverify=false https://git.jabber.space/devs/stabber
+RUN git clone --depth 1 -c http.sslverify=false https://github.com/strophe/libstrophe
 
 WORKDIR /usr/src/stabber
 RUN ./bootstrap.sh

Makefile.am

@@ -3,10 +3,6 @@ core_sources = \
 	src/log.c src/common.c \
 	src/chatlog.c src/chatlog.h \
 	src/database.h src/database.c \
-	src/database_flatfile.c src/database_flatfile.h \
-	src/database_flatfile_parser.c \
-	src/database_flatfile_verify.c \
-	src/database_export.c \
 	src/log.h src/profanity.c src/common.h \
 	src/profanity.h src/xmpp/chat_session.c \
 	src/xmpp/chat_session.h src/xmpp/muc.c src/xmpp/muc.h src/xmpp/jid.h src/xmpp/jid.c \
@@ -189,7 +185,6 @@ functionaltest_sources = \
 	tests/functionaltests/test_software.c tests/functionaltests/test_software.h \
 	tests/functionaltests/test_muc.c tests/functionaltests/test_muc.h \
 	tests/functionaltests/test_disconnect.c tests/functionaltests/test_disconnect.h \
-	tests/functionaltests/test_lastactivity.c tests/functionaltests/test_lastactivity.h \
 	tests/functionaltests/functionaltests.c
 
 main_source = src/main.c
@@ -259,12 +254,6 @@ core_sources += $(omemo_sources)
 unittest_sources += $(omemo_unittest_sources)
 endif
 
-sqlite_sources = src/database_sqlite.c
-
-if BUILD_SQLITE
-core_sources += $(sqlite_sources)
-endif
-
 all_c_sources = $(core_sources) $(unittest_sources) \
 				$(pgp_sources) $(pgp_unittest_sources) \
 				$(otr4_sources) $(otr_unittest_sources) \
@@ -319,46 +308,22 @@ tests_functionaltests_functionaltests_LDADD = -lcmocka -lstabber @FORKPTY_LIB@
 
 # Parallel functional tests target (~3x faster than sequential)
 # Usage: make check-functional-parallel
-# To add more groups: increase FUNC_TEST_GROUPS and add group in functionaltests.c
-FUNC_TEST_GROUPS = 1 2 3 4
-
 check-functional-parallel: tests/functionaltests/functionaltests
-	@echo "Running functional tests in parallel ($(words $(FUNC_TEST_GROUPS)) groups)..."
-	@mkdir -p $(builddir)/test-logs $(builddir)/test-files
-	@pids=""; \
-	for g in $(FUNC_TEST_GROUPS); do \
-		./tests/functionaltests/functionaltests $$g > $(builddir)/test-logs/group$$g.log 2>&1 & \
-		pids="$$pids $$!"; \
-	done; \
-	failed=0; i=1; \
-	for pid in $$pids; do \
-		wait $$pid || { echo "Group $$i FAILED"; cat $(builddir)/test-logs/group$$i.log; failed=1; }; \
-		i=$$((i + 1)); \
-	done; \
+	@echo "Running functional tests in parallel (4 groups)..."
+	@mkdir -p $(builddir)/test-logs
+	@failed=0; \
+	./tests/functionaltests/functionaltests 1 > $(builddir)/test-logs/group1.log 2>&1 & pid1=$$!; \
+	./tests/functionaltests/functionaltests 2 > $(builddir)/test-logs/group2.log 2>&1 & pid2=$$!; \
+	./tests/functionaltests/functionaltests 3 > $(builddir)/test-logs/group3.log 2>&1 & pid3=$$!; \
+	./tests/functionaltests/functionaltests 4 > $(builddir)/test-logs/group4.log 2>&1 & pid4=$$!; \
+	wait $$pid1 || { echo "Group 1 FAILED (exit $$?)"; cat $(builddir)/test-logs/group1.log; failed=1; }; \
+	wait $$pid2 || { echo "Group 2 FAILED (exit $$?)"; cat $(builddir)/test-logs/group2.log; failed=1; }; \
+	wait $$pid3 || { echo "Group 3 FAILED (exit $$?)"; cat $(builddir)/test-logs/group3.log; failed=1; }; \
+	wait $$pid4 || { echo "Group 4 FAILED (exit $$?)"; cat $(builddir)/test-logs/group4.log; failed=1; }; \
 	echo "=== Test Results Summary ==="; \
 	grep -E 'PASSED|FAILED|Running' $(builddir)/test-logs/group*.log || true; \
 	if [ $$failed -ne 0 ]; then echo "FUNCTIONAL TESTS FAILED"; exit 1; fi; \
 	echo "All functional test groups passed!"
-
-# Run functional tests with the flat-file database backend
-# Usage: make check-functional-flatfile
-check-functional-flatfile: tests/functionaltests/functionaltests
-	@echo "Running functional tests with flat-file backend ($(words $(FUNC_TEST_GROUPS)) groups)..."
-	@mkdir -p $(builddir)/test-logs $(builddir)/test-files
-	@pids=""; \
-	for g in $(FUNC_TEST_GROUPS); do \
-		PROF_FLATFILE=1 ./tests/functionaltests/functionaltests $$g > $(builddir)/test-logs/group$$g-flatfile.log 2>&1 & \
-		pids="$$pids $$!"; \
-	done; \
-	failed=0; i=1; \
-	for pid in $$pids; do \
-		wait $$pid || { echo "Group $$i FAILED (flatfile)"; cat $(builddir)/test-logs/group$$i-flatfile.log; failed=1; }; \
-		i=$$((i + 1)); \
-	done; \
-	echo "=== Flat-file Test Results Summary ==="; \
-	grep -E 'PASSED|FAILED|Running' $(builddir)/test-logs/group*-flatfile.log || true; \
-	if [ $$failed -ne 0 ]; then echo "FLAT-FILE FUNCTIONAL TESTS FAILED"; exit 1; fi; \
-	echo "All flat-file functional test groups passed!"
 endif
 endif
 
@@ -403,10 +368,7 @@ clean-local:
 	rm -f $(git_include) $(git_include).in
 endif
 
-clean-functional-tests:
-	rm -rf $(builddir)/test-files $(builddir)/test-logs
-
-.PHONY: my-prof.supp clean-functional-tests
+.PHONY: my-prof.supp
 my-prof.supp:
 	@sed '/^# AUTO-GENERATED START/q' prof.supp > $@
 	@printf "\n\n# glib\n" >> $@
@@ -422,7 +384,7 @@ check-unit: tests/unittests/unittests
 	tests/unittests/unittests
 
 @VALGRIND_CHECK_RULES@
-VALGRIND_SUPPRESSIONS_FILES=$(srcdir)/prof.supp
+VALGRIND_SUPPRESSIONS_FILES=prof.supp
 
 # Code coverage targets (requires --enable-coverage)
 coverage-clean:

check-cwe134.sh

@@ -1,69 +0,0 @@
-#!/bin/bash
-# check-cwe134.sh - Static analysis for CWE-134 format string vulnerabilities
-#
-# This script detects potentially unsafe usage of format string functions
-# where user-controlled data may be passed without "%s" wrapper.
-#
-# Usage: ./check-cwe134.sh [directory]
-
-set -e
-
-DIR="${1:-src}"
-
-echo "=== CWE-134 Format String Vulnerability Check ==="
-echo "Scanning: $DIR"
-echo ""
-
-# Functions that accept format strings
-FORMAT_FUNCS="cons_show|cons_debug|cons_show_error|log_info|log_error|log_warning|log_debug|win_println|win_print"
-
-ERRORS=0
-
-echo "Checking for unsafe format string usage..."
-echo ""
-
-# Pattern 1: function call with single variable argument (no format string)
-# Example: cons_show(variable);  - BAD
-# Example: cons_show("%s", variable);  - OK
-# Matches: func(identifier) or func(identifier->member) or func(identifier[index])
-RESULTS=$(grep -rn --include="*.c" -P "($FORMAT_FUNCS)\s*\(\s*[a-zA-Z_][a-zA-Z0-9_]*(\s*->\s*\w+|\s*\[\s*\w+\s*\])?\s*\)\s*;" "$DIR" 2>/dev/null || true)
-
-# Filter out function definitions, declarations, and safe api_* wrappers
-RESULTS=$(echo "$RESULTS" | grep -v "const char\|void \|^[^:]*:[0-9]*:[a-z_]*(\|api_cons_show\|api_log_" || true)
-
-if [ -n "$RESULTS" ]; then
-    echo "❌ POTENTIAL CWE-134 VULNERABILITIES FOUND:"
-    echo ""
-    echo "$RESULTS"
-    echo ""
-    ERRORS=$(echo "$RESULTS" | wc -l)
-else
-    echo "✅ No obvious CWE-134 issues found."
-fi
-
-# Additional check: GString->str passed directly (not as %s argument)
-echo ""
-echo "Checking for GString->str passed to format functions..."
-
-GSTRING_RESULTS=$(grep -rn --include="*.c" -P "($FORMAT_FUNCS)\s*\([^)]*->str\s*\)" "$DIR" 2>/dev/null | grep -v '"%s"' || true)
-
-if [ -n "$GSTRING_RESULTS" ]; then
-    echo "⚠️  GString->str passed without \"%s\" (review manually):"
-    echo ""
-    echo "$GSTRING_RESULTS"
-    echo ""
-fi
-
-echo ""
-echo "=== Summary ==="
-echo "Critical issues: $ERRORS"
-
-if [ "$ERRORS" -gt 0 ]; then
-    echo ""
-    echo "Fix by adding \"%s\" format specifier:"
-    echo "  BAD:  cons_show(variable);"
-    echo "  GOOD: cons_show(\"%s\", variable);"
-    exit 1
-fi
-
-exit 0

ci-build.sh

@@ -15,72 +15,14 @@ error_handler()
     log_content ./test-suite.log
     log_content ./test-suite-memcheck.log
 
-    echo >&2
-    echo "Error ${ERR_CODE} with command '${BASH_COMMAND}' on line ${BASH_LINENO[0]}. Exiting." >&2
-    echo >&2
+    echo
+    echo "Error ${ERR_CODE} with command '${BASH_COMMAND}' on line ${BASH_LINENO[0]}. Exiting."
+    echo
     exit ${ERR_CODE}
 }
 
 trap error_handler ERR
 
-# =============================================================================
-# Constants
-# =============================================================================
-
-# Number of parallel build configurations
-readonly TEST_BUILDS=4
-
-# Human-readable names for each build configuration
-readonly BUILD_NAMES=(
-    "Full"      # 1. All features enabled
-    "Minimal"   # 2. All optional features disabled
-    "NoEncrypt" # 3. No encryption (otr, pgp, omemo disabled)
-    "Default"   # 4. Default ./configure options
-)
-
-# Regex patterns for parsing test output
-readonly CMOCKA_PASSED_PATTERN='^\[  PASSED  \] [0-9]+ test'
-readonly CMOCKA_FAILED_PATTERN='^\[  FAILED  \] [0-9]+ test'
-
-# Coverage extraction patterns (matches both Docker and CI paths)
-readonly COVERAGE_PATTERNS='*/profanity/src/* */src/src/*'
-
-# =============================================================================
-# Helper Functions
-# =============================================================================
-
-# Parse STATS line from build log and set global variables
-# Usage: parse_build_stats <log_file>
-parse_build_stats() {
-    local log_file="$1"
-    local stats_line
-    stats_line=$(grep "^STATS:" "$log_file" 2>/dev/null | tail -1)
-    
-    STAT_UNIT_P=$(echo "$stats_line" | grep -oE "unit_passed=[0-9]+" | cut -d= -f2)
-    STAT_UNIT_F=$(echo "$stats_line" | grep -oE "unit_failed=[0-9]+" | cut -d= -f2)
-    STAT_FUNC_P=$(echo "$stats_line" | grep -oE "func_passed=[0-9]+" | cut -d= -f2)
-    STAT_FUNC_F=$(echo "$stats_line" | grep -oE "func_failed=[0-9]+" | cut -d= -f2)
-    STAT_COV_LINES=$(echo "$stats_line" | grep -oE "cov_lines=[0-9.]+%|cov_lines=n/a" | cut -d= -f2)
-    STAT_COV_FUNCS=$(echo "$stats_line" | grep -oE "cov_funcs=[0-9.]+%|cov_funcs=n/a" | cut -d= -f2)
-    STAT_COV_BRANCHES=$(echo "$stats_line" | grep -oE "cov_branches=[0-9.]+%|cov_branches=n/a" | cut -d= -f2)
-    STAT_TIME=$(echo "$stats_line" | grep -oE "time=[0-9]+m[0-9]+s" | cut -d= -f2)
-    
-    : "${STAT_UNIT_P:=0}"
-    : "${STAT_UNIT_F:=0}"
-    : "${STAT_FUNC_P:=0}"
-    : "${STAT_FUNC_F:=0}"
-}
-
-# Extract test count from log file
-# Usage: extract_test_count <log_file> <pattern>
-extract_test_count() {
-    grep -E "$2" "$1" 2>/dev/null | grep -oE "[0-9]+" | head -1
-}
-
-# =============================================================================
-# Test Verification
-# =============================================================================
-
 # Verify that test failures are properly detected
 # This is a meta-test: it runs a deliberately failing test
 # and checks that the test framework reports the failure correctly
@@ -119,11 +61,11 @@ EOF
     # Test 1: Single failing test detection
     echo "  Testing single test failure detection..."
     if /tmp/test_must_fail > /tmp/test_must_fail.log 2>&1; then
-        echo "ERROR: Test that should fail returned success (exit code 0)" >&2
-        echo "This means the test framework is NOT detecting failures correctly!" >&2
-        echo "--- Test output ---" >&2
-        cat /tmp/test_must_fail.log >&2
-        echo "--- End output ---" >&2
+        echo "ERROR: Test that should fail returned success (exit code 0)"
+        echo "This means the test framework is NOT detecting failures correctly!"
+        echo "--- Test output ---"
+        cat /tmp/test_must_fail.log
+        echo "--- End output ---"
         rm -f /tmp/test_must_fail /tmp/test_must_fail.c /tmp/test_must_fail.log
         exit 1
     fi
@@ -143,8 +85,8 @@ EOF
     wait $pid4 || failed=$((failed + 1))
     
     if [ $failed -ne 2 ]; then
-        echo "ERROR: Expected 2 failures in parallel tests, got $failed" >&2
-        echo "Parallel failure detection is broken!" >&2
+        echo "ERROR: Expected 2 failures in parallel tests, got $failed"
+        echo "Parallel failure detection is broken!"
         rm -f /tmp/test_must_fail /tmp/test_must_fail.c /tmp/test_must_fail.log /tmp/p?.log
         exit 1
     fi
@@ -168,17 +110,6 @@ num_cores()
 # Run test failure detection verification first
 verify_test_failure_detection
 
-# Parse arguments
-COVERAGE_ONLY=no
-for arg in "$@"; do
-    case "$arg" in
-        --coverage-only)
-            COVERAGE_ONLY=yes
-            shift
-            ;;
-    esac
-done
-
 ./bootstrap.sh
 
 tests=()
@@ -249,13 +180,30 @@ case "$ARCH" in
         ;;
 esac
 
+case "$ARCH" in
+    linux*)
+         echo
+         echo "--> Building with ./configure -C ${tests[0]} --enable-valgrind $*"
+         echo
+
+         # shellcheck disable=SC2086
+        ./configure -C ${tests[0]} --enable-valgrind $*
+
+        $MAKE CC="${CC}"
+        if grep '^ID=' /etc/os-release | grep -q -e debian; then
+            $MAKE check-valgrind
+        else
+            $MAKE check-valgrind || log_content ./test-suite-memcheck.log
+        fi
+        $MAKE distclean
+        ;;
+esac
+
 # Function to build and test a single configuration
 build_and_test() {
     local features="$1"
     local extra_args="$2"
     local idx="$3"
-    local run_valgrind="$4"
-    local run_coverage="$5"
     local build_dir="build-$idx"
     local log_file="build-$idx.log"
 
@@ -263,210 +211,61 @@ build_and_test() {
         echo "=== Build $idx started at $(date) ==="
         echo "--> Building in $build_dir with ./configure -C $features $extra_args"
 
-        local start_time=$SECONDS
-
         mkdir -p "$build_dir"
         cd "$build_dir"
 
         # shellcheck disable=SC2086
-        if ! ../configure -C $features $extra_args; then
-            echo "ERROR: configure failed"
-            exit 1
-        fi
+        ../configure -C $features $extra_args
 
-        if ! $MAKE CC="${CC}"; then
-            echo "ERROR: make failed"
-            exit 1
-        fi
-
-        # Run unit tests
-        local unit_passed=0 unit_failed=0
-        if [ "$run_valgrind" = "yes" ]; then
-            echo "--> Running unit tests under Valgrind..."
-            # Build unit tests first
-            $MAKE tests/unittests/unittests
-            # Run valgrind directly to capture cmocka output
-            valgrind --error-exitcode=1 --leak-check=full \
-                --suppressions=../prof.supp \
-                tests/unittests/unittests 2>&1 | tee unit-tests-output.log
-            valgrind_exit=${PIPESTATUS[0]}
-            if [ $valgrind_exit -ne 0 ]; then
-                echo "ERROR: Valgrind unit tests failed (exit code $valgrind_exit)"
-                exit 1
-            fi
-        else
-            echo "--> Running unit tests..."
-            $MAKE tests/unittests/unittests
-            tests/unittests/unittests 2>&1 | tee unit-tests-output.log
-            if [ ${PIPESTATUS[0]} -ne 0 ]; then
-                echo "ERROR: Unit tests failed"
-                exit 1
-            fi
-        fi
-        # Extract unit test counts from cmocka output
-        unit_passed=$(extract_test_count unit-tests-output.log "$CMOCKA_PASSED_PATTERN")
-        unit_failed=$(extract_test_count unit-tests-output.log "$CMOCKA_FAILED_PATTERN")
-        : "${unit_passed:=0}" "${unit_failed:=0}"
-        echo "UNIT_TESTS: passed=$unit_passed failed=$unit_failed"
-
-        # Set build index for port allocation: build 1 uses ports 5230-5233,
-        # build 2 uses 5234-5237, etc. This prevents port conflicts in parallel builds.
-        export PROF_BUILD_INDEX=$idx
-        local func_passed=0 func_failed=0
-        if ! $MAKE check-functional-parallel; then
-            echo "ERROR: functional tests failed"
-            exit 1
-        fi
-        # Extract functional test counts from group logs
-        echo "=== Functional test results ==="
-        for glog in ./test-logs/group*.log; do
-            if [ -f "$glog" ]; then
-                cnt=$(extract_test_count "$glog" "$CMOCKA_PASSED_PATTERN")
-                [ -n "$cnt" ] && func_passed=$((func_passed + cnt))
-                cnt=$(extract_test_count "$glog" "$CMOCKA_FAILED_PATTERN")
-                [ -n "$cnt" ] && func_failed=$((func_failed + cnt))
-            fi
-        done
-        echo "FUNC_TESTS: passed=$func_passed failed=$func_failed"
-
-        # Collect coverage data if enabled (lines, functions, branches)
-        # Must be done BEFORE make clean which removes .gcda files
-        local cov_lines="n/a" cov_funcs="n/a" cov_branches="n/a"
-        if [ "$run_coverage" = "yes" ]; then
-            echo "--> Collecting coverage data..."
-            if command -v lcov >/dev/null 2>&1; then
-                lcov --capture --directory . --output-file coverage-full.info \
-                    --rc lcov_branch_coverage=1 --ignore-errors inconsistent 2>&1 || true
-                # Extract only production code from src/ directory, exclude tests
-                # shellcheck disable=SC2086
-                lcov --extract coverage-full.info $COVERAGE_PATTERNS \
-                    --output-file coverage.info \
-                    --rc lcov_branch_coverage=1 --ignore-errors inconsistent 2>&1 || true
-                if [ -f coverage.info ] && [ -s coverage.info ]; then
-                    local summary
-                    summary=$(lcov --summary coverage.info \
-                        --rc lcov_branch_coverage=1 --ignore-errors inconsistent 2>&1 || true)
-                    cov_lines=$(echo "$summary" | grep -E "lines\.*:" | grep -oE "[0-9]+\.[0-9]+%" | head -1)
-                    cov_funcs=$(echo "$summary" | grep -E "functions\.*:" | grep -oE "[0-9]+\.[0-9]+%" | head -1)
-                    cov_branches=$(echo "$summary" | grep -E "branches\.*:" | grep -oE "[0-9]+\.[0-9]+%" | head -1)
-                    [ -z "$cov_lines" ] && cov_lines="n/a"
-                    [ -z "$cov_funcs" ] && cov_funcs="n/a"
-                    [ -z "$cov_branches" ] && cov_branches="n/a"
-                else
-                    echo "WARNING: coverage.info is empty or not created"
-                fi
-            else
-                echo "WARNING: lcov not found"
-            fi
-            echo "COVERAGE: lines=$cov_lines funcs=$cov_funcs branches=$cov_branches"
-        fi
+        $MAKE CC="${CC}"
+        $MAKE check-functional-parallel
 
         ./profanity -v
-
-        # Save coverage.info before cleanup (for CI artifact)
-        # Only copy in CI environment to avoid leaving artifacts during local runs
-        if [ "$run_coverage" = "yes" ] && [ -f coverage.info ] && [ -n "$CI" ]; then
-            cp coverage.info ../coverage.info
-            echo "Coverage report saved to coverage.info"
-        fi
-
         $MAKE clean
 
         cd ..
         rm -rf "$build_dir"
 
-        local elapsed=$((SECONDS - start_time))
-        local mins=$((elapsed / 60))
-        local secs=$((elapsed % 60))
-
         echo "=== Build $idx completed at $(date) ==="
-        echo "STATS: unit_passed=$unit_passed unit_failed=$unit_failed func_passed=$func_passed func_failed=$func_failed cov_lines=$cov_lines cov_funcs=$cov_funcs cov_branches=$cov_branches time=${mins}m${secs}s"
     } > "$log_file" 2>&1
 }
 
-# Run configurations
-# Coverage enabled only for build 1 (Full) - it has most code paths
-echo
-echo "=== Start build ==="
-echo
-
-if [ "$COVERAGE_ONLY" = "yes" ]; then
-    echo "Running coverage-only mode (${BUILD_NAMES[0]} build)..."
-    echo
-    run_valgrind="no"
-    run_coverage="yes"
-    extra_flags="--enable-coverage"
-    build_and_test "${tests[0]}" "$* $extra_flags" "1" "$run_valgrind" "$run_coverage" &
-    pids=("$!")
-    echo "  → ${BUILD_NAMES[0]}: ${tests[0]} [+Coverage]"
-else
-    echo "Starting $TEST_BUILDS parallel build configurations..."
-    echo
-    pids=()
-    for idx in $(seq 1 $TEST_BUILDS); do
-        if [ $idx -le ${#tests[@]} ]; then
-            # All builds run Valgrind on Linux
-            if [ "$ARCH" = "linux" ]; then
-                run_valgrind="yes"
-                extra_flags="--enable-valgrind"
-            else
-                run_valgrind="no"
-                extra_flags=""
-            fi
-            run_coverage="no"
-            build_and_test "${tests[$((idx-1))]}" "$* $extra_flags" "$idx" "$run_valgrind" "$run_coverage" &
-            pids+=("$!")
-            flags_desc=""
-            [ "$run_valgrind" = "yes" ] && flags_desc=" [+Valgrind]"
-            echo "  → ${BUILD_NAMES[$((idx-1))]}: ${tests[$((idx-1))]}$flags_desc"
-        fi
-    done
-fi
-echo
+# Run all 4 configurations in parallel
+echo "Starting parallel builds..."
+pids=()
+for idx in 1 2 3 4; do
+    if [ $idx -le ${#tests[@]} ]; then
+        build_and_test "${tests[$((idx-1))]}" "$*" "$idx" &
+        pids+=("$!")
+        echo "Started build $idx (PID: $!)" 
+    fi
+done
 
 # Wait for all builds and check exit codes
-echo "Waiting for builds to complete..."
-echo
-failed_builds=()
+failed=0
 for i in "${!pids[@]}"; do
     idx=$((i + 1))
     if wait "${pids[$i]}"; then
-        if [ -f "build-$idx.log" ]; then
-            parse_build_stats "build-$idx.log"
-            
-            echo "✓ ${BUILD_NAMES[$i]} PASSED"
-            echo "  Unit tests:       $STAT_UNIT_P passed, $STAT_UNIT_F failed"
-            echo "  Functional tests: $STAT_FUNC_P passed, $STAT_FUNC_F failed"
-            if [ "$STAT_COV_LINES" != "n/a" ] && [ -n "$STAT_COV_LINES" ]; then
-                echo "  Coverage:         Lines: $STAT_COV_LINES | Functions: $STAT_COV_FUNCS | Branches: $STAT_COV_BRANCHES"
-            fi
-            echo "  Duration:         ${STAT_TIME:-?}"
-        else
-            echo "✓ ${BUILD_NAMES[$i]} passed (no stats available)"
-        fi
+        echo "✓ Build $idx passed"
     else
-        echo "✗ ${BUILD_NAMES[$i]} FAILED" >&2
-        failed_builds+=("$idx")
+        echo "✗ Build $idx failed"
+        echo "--- Log for build $idx ---"
+        cat "build-$idx.log"
+        echo "--- End log ---"
+        failed=1
     fi
+done
+
+# Show all logs on success too
+if [ $failed -eq 0 ]; then
     echo
-done
-
-# Show failed builds full logs
-for idx in "${failed_builds[@]}"; do
-    if [ -f "build-$idx.log" ]; then
-        echo "=== ${BUILD_NAMES[$((idx-1))]} FAILURE LOG ===" >&2
-        cat "build-$idx.log" >&2
-        echo >&2
-    fi
-done
-
-if [ ${#failed_builds[@]} -gt 0 ]; then
-    echo "RESULT: FAILED (builds ${failed_builds[*]})" >&2
-    exit 1
+    echo "All builds passed!"
+    for idx in 1 2 3 4; do
+        if [ -f "build-$idx.log" ]; then
+            echo "--- Log for build $idx ---"
+            cat "build-$idx.log"
+        fi
+    done
 else
-    if [ "$COVERAGE_ONLY" = "yes" ]; then
-        echo "RESULT: COVERAGE BUILD PASSED ✓"
-    else
-        echo "RESULT: ALL $TEST_BUILDS BUILDS PASSED ✓"
-    fi
+    exit 1
 fi

configure.ac

@@ -94,17 +94,8 @@ PKG_CHECK_MODULES([curl], [libcurl >= 7.62.0], [],
     [AC_CHECK_LIB([curl], [main], [],
         [AC_MSG_ERROR([libcurl 7.62.0 or higher is required])])])
 
-### sqlite (optional — can be disabled with --without-sqlite)
-AC_ARG_WITH([sqlite],
-    [AS_HELP_STRING([--without-sqlite], [build without SQLite support (flat-file backend only)])],
-    [], [with_sqlite=yes])
-
-AS_IF([test "x$with_sqlite" != "xno"],
-    [PKG_CHECK_MODULES([SQLITE], [sqlite3 >= 3.22.0],
-        [AC_DEFINE([HAVE_SQLITE], [1], [SQLite support])],
-        [AC_MSG_ERROR([sqlite3 3.22.0 or higher is required (use --without-sqlite to disable)])])],
-    [AC_MSG_NOTICE([Building without SQLite — flat-file backend only])])
-AM_CONDITIONAL([BUILD_SQLITE], [test "x$with_sqlite" != "xno"])
+PKG_CHECK_MODULES([SQLITE], [sqlite3 >= 3.22.0], [],
+    [AC_MSG_ERROR([sqlite3 3.22.0 or higher is required])])
 
 ACX_PTHREAD([], [AC_MSG_ERROR([pthread is required])])
 AS_IF([test "x$PTHREAD_CC" != x], [ CC="$PTHREAD_CC" ])
@@ -425,7 +416,6 @@ AC_OUTPUT
 AC_MSG_NOTICE([Summary of build options:
 PLATFORM                   : $target_os
 PACKAGE_STATUS             : $PACKAGE_STATUS
-SQLite support             : $with_sqlite
 GTK_VERSION                : $GTK_VERSION
 LIBS                       : $LIBS
 Install themes             : $THEMES_INSTALL

docs/profanity.1

@@ -197,43 +197,7 @@ Configuration for
 .B Profanity
 is stored in
 .I $XDG_CONFIG_HOME/profanity/profrc
-, details on commands for configuring Profanity can be found at <https://profanity-im.github.io/reference.html> or the respective built\-in help or man pages..SS Message History Storage
-By default, message history is stored in an SQLite database. An alternative flat-file backend
-stores messages as human-readable plain text files that can be edited with any text editor.
-.PP
-To enable flat-file logging, set in
-.IR profrc :
-.PP
-.EX
-[logging]
-dblog=flatfile
-.EE
-.PP
-Or use the command:
-.B /privacy logging flatfile
-.PP
-Flat-file logs are stored under
-.IR $XDG_DATA_HOME/profanity/flatlog/ ,
-organized as
-.IR {account_jid}/{contact_jid}/history.log .
-.PP
-Each line has the format:
-.br
-.EX
-{ISO8601} [{type}|{enc}|id:{id}|aid:{archive_id}|corrects:{id}] {sender}: {message}
-.EE
-.PP
-Use
-.B /history verify
-to check integrity of stored history (both SQLite and flat-file).
-.PP
-Use
-.B /history export [<jid>]
-to copy messages from SQLite to flat-file format (merge with existing data), or
-.B /history import [<jid>]
-to copy from flat-file to SQLite.
-Both operations skip duplicates.
-Omit the JID to process all contacts.
+, details on commands for configuring Profanity can be found at <https://profanity-im.github.io/reference.html> or the respective built\-in help or man pages.
 .SH BUGS
 Bugs can either be reported by raising an issue at the Github issue tracker:
 .br

prof.supp

@@ -8,29 +8,6 @@
 # * python suppressions file from https://github.com/python/cpython/blob/main/Misc/valgrind-python.supp
 #
 
-# ============================================
-# glibc AVX2 optimizations (false positives)
-# See: https://sourceware.org/bugzilla/show_bug.cgi?id=19796
-# ============================================
-
-{
-  glibc_wcpncpy_avx2
-  Memcheck:Addr32
-  fun:__wcpncpy_avx2
-  fun:wcsxfrm_l
-  fun:g_utf8_collate_key
-  ...
-}
-
-{
-  glibc_wcsxfrm_avx2
-  Memcheck:Addr32
-  ...
-  fun:wcsxfrm_l
-  fun:g_utf8_collate_key
-  ...
-}
-
 # ============================================
 # Functional tests suppressions (stabber/pthread)
 # ============================================

profrc.example

@@ -49,13 +49,6 @@ grlog=true
 maxsize=1048580
 rotate=true
 shared=true
-# Database backend for message history:
-#   on       - SQLite database (default)
-#   off      - no message logging
-#   redact   - store with redacted message content
-#   flatfile - plain text files, editable with any text editor
-#              stored in ~/.local/share/profanity/flatlog/
-dblog=on
 
 [otr]
 warn=true

src/command/cmd_ac.c

@@ -275,8 +275,6 @@ static Autocomplete logging_ac;
 static Autocomplete logging_group_ac;
 static Autocomplete privacy_ac;
 static Autocomplete privacy_log_ac;
-static Autocomplete history_ac;
-static Autocomplete history_switch_ac;
 static Autocomplete color_ac;
 static Autocomplete correction_ac;
 static Autocomplete avatar_ac;
@@ -431,8 +429,6 @@ static Autocomplete* all_acs[] = {
     &logging_group_ac,
     &privacy_ac,
     &privacy_log_ac,
-    &history_ac,
-    &history_switch_ac,
     &color_ac,
     &correction_ac,
     &avatar_ac,
@@ -1142,17 +1138,6 @@ cmd_ac_init(void)
     autocomplete_add(privacy_log_ac, "on");
     autocomplete_add(privacy_log_ac, "off");
     autocomplete_add(privacy_log_ac, "redact");
-    autocomplete_add(privacy_log_ac, "flatfile");
-
-    autocomplete_add(history_ac, "on");
-    autocomplete_add(history_ac, "off");
-    autocomplete_add(history_ac, "switch");
-    autocomplete_add(history_ac, "verify");
-    autocomplete_add(history_ac, "export");
-    autocomplete_add(history_ac, "import");
-
-    autocomplete_add(history_switch_ac, "sqlite");
-    autocomplete_add(history_switch_ac, "flatfile");
 
     autocomplete_add(logging_group_ac, "on");
     autocomplete_add(logging_group_ac, "off");
@@ -1791,7 +1776,7 @@ _cmd_ac_complete_params(ProfWin* window, const char* const input, gboolean previ
 
     // autocomplete boolean settings
     gchar* boolean_choices[] = { "/beep", "/states", "/outtype", "/flash", "/splash",
-                                 "/vercheck", "/privileges", "/wrap",
+                                 "/history", "/vercheck", "/privileges", "/wrap",
                                  "/carbons", "/slashguard", "/mam", "/silence" };
 
     for (int i = 0; i < ARRAY_SIZE(boolean_choices); i++) {
@@ -1801,16 +1786,6 @@ _cmd_ac_complete_params(ProfWin* window, const char* const input, gboolean previ
         }
     }
 
-    result = autocomplete_param_with_ac(input, "/history switch", history_switch_ac, TRUE, previous);
-    if (result) {
-        return result;
-    }
-
-    result = autocomplete_param_with_ac(input, "/history", history_ac, TRUE, previous);
-    if (result) {
-        return result;
-    }
-
     // autocomplete nickname in chat rooms
     if (window->type == WIN_MUC) {
         ProfMucWin* mucwin = (ProfMucWin*)window;

src/command/cmd_defs.c

@@ -1875,30 +1875,18 @@ static const struct cmd_t command_defs[] = {
     },
 
     { CMD_PREAMBLE("/history",
-                   parse_args, 1, 2, &cons_history_setting)
+                   parse_args, 1, 1, &cons_history_setting)
       CMD_MAINFUNC(cmd_history)
       CMD_TAGS(
               CMD_TAG_UI,
               CMD_TAG_CHAT)
       CMD_SYN(
-              "/history on|off",
-              "/history switch sqlite|flatfile",
-              "/history verify [<jid>]",
-              "/history export [<jid>]",
-              "/history import [<jid>]")
+              "/history on|off")
       CMD_DESC(
               "Switch chat history on or off, /logging chat will automatically be enabled when this setting is on. "
-              "When history is enabled, previous messages are shown in chat windows. "
-              "Use 'switch' to change the active database backend at runtime without reconnecting. "
-              "Use 'verify' to check integrity of stored message history. "
-              "Use 'export' to copy messages from SQLite to flat-file format, or 'import' to copy from flat-file to SQLite. "
-              "Both export and import merge with existing data (duplicates are skipped).")
+              "When history is enabled, previous messages are shown in chat windows.")
       CMD_ARGS(
-              { "on|off", "Enable or disable showing chat history." },
-              { "switch sqlite|flatfile", "Switch the active database backend at runtime." },
-              { "verify [<jid>]", "Verify integrity of message history. Optionally specify a JID to check only one contact." },
-              { "export [<jid>]", "Export SQLite history to flat-file format. Optionally specify a JID to export only one contact." },
-              { "import [<jid>]", "Import flat-file history into SQLite. Optionally specify a JID to import only one contact." })
+              { "on|off", "Enable or disable showing chat history." })
     },
 
     { CMD_PREAMBLE("/log",
@@ -2730,7 +2718,7 @@ static const struct cmd_t command_defs[] = {
               CMD_TAG_CHAT,
               CMD_TAG_DISCOVERY)
       CMD_SYN(
-              "/privacy logging on|redact|off|flatfile",
+              "/privacy logging on|redact|off",
               "/privacy os on|off")
       CMD_DESC(
               "Configure privacy settings. "
@@ -2738,13 +2726,12 @@ static const struct cmd_t command_defs[] = {
               "clientid to set the client identification name "
               "session_alarm to configure an alarm when more clients log in.")
       CMD_ARGS(
-              { "logging on|redact|off|flatfile", "Switch chat logging. 'on' uses SQLite database (default). 'flatfile' stores messages as plain text files in ~/.local/share/profanity/flatlog/ that can be manually edited with any text editor. 'off' disables logging entirely. 'redact' stores messages with content replaced by '[redacted]'. Note: 'off' might have unintended consequences, such as not being able to decrypt OMEMO encrypted messages received later via MAM. The 'flatfile' setting takes effect on next connection." },
+              { "logging on|redact|off", "Switch chat logging. This will also disable logging in the internally used SQL database. Your messages will not be saved anywhere locally. This might have unintended consequences, such as not being able to decrypt OMEMO encrypted messages received later via MAM, and should be used with caution." },
               { "os on|off", "Choose whether to include the OS name if a user asks for software information (XEP-0092)." }
               )
       CMD_EXAMPLES(
               "/privacy",
               "/privacy logging off",
-              "/privacy logging flatfile",
               "/privacy os off")
     },
 
@@ -2838,15 +2825,16 @@ cmd_search_index_any(char* term)
     int terms_len = g_strv_length(processed_terms);
 
     for (int i = 0; i < terms_len; i++) {
-        GHashTableIter iter;
-        gpointer key, value;
-        g_hash_table_iter_init(&iter, search_index);
-        while (g_hash_table_iter_next(&iter, &key, &value)) {
-            char* index_entry = (char*)value;
+        GList* index_keys = g_hash_table_get_keys(search_index);
+        GList* curr = index_keys;
+        while (curr) {
+            char* index_entry = g_hash_table_lookup(search_index, curr->data);
             if (g_str_match_string(processed_terms[i], index_entry, FALSE)) {
-                results = g_list_append(results, key);
+                results = g_list_append(results, curr->data);
             }
+            curr = g_list_next(curr);
         }
+        g_list_free(index_keys);
     }
 
     return results;
@@ -2860,14 +2848,13 @@ cmd_search_index_all(char* term)
     auto_gcharv gchar** terms = g_str_tokenize_and_fold(term, NULL, NULL);
     int terms_len = g_strv_length(terms);
 
-    GHashTableIter iter;
-    gpointer key, value;
-    g_hash_table_iter_init(&iter, search_index);
-    while (g_hash_table_iter_next(&iter, &key, &value)) {
-        char* command = (char*)key;
-        char* command_index = (char*)value;
+    GList* commands = g_hash_table_get_keys(search_index);
+    GList* curr = commands;
+    while (curr) {
+        char* command = curr->data;
         int matches = 0;
         for (int i = 0; i < terms_len; i++) {
+            char* command_index = g_hash_table_lookup(search_index, command);
             if (g_str_match_string(terms[i], command_index, FALSE)) {
                 matches++;
             }
@@ -2875,8 +2862,11 @@ cmd_search_index_all(char* term)
         if (matches == terms_len) {
             results = g_list_append(results, command);
         }
+        curr = g_list_next(curr);
     }
 
+    g_list_free(commands);
+
     return results;
 }
 
@@ -2999,18 +2989,7 @@ command_docgen(void)
     }
 
     FILE* toc_fragment = fopen("toc_fragment.html", "w");
-    if (!toc_fragment) {
-        log_error("command_docgen(): unable to open toc_fragment.html for writing: %s", g_strerror(errno));
-        g_list_free(cmds);
-        return;
-    }
     FILE* main_fragment = fopen("main_fragment.html", "w");
-    if (!main_fragment) {
-        log_error("command_docgen(): unable to open main_fragment.html for writing: %s", g_strerror(errno));
-        fclose(toc_fragment);
-        g_list_free(cmds);
-        return;
-    }
 
     fputs("<ul><li><ul><li>\n", toc_fragment);
     fputs("<hr>\n", main_fragment);
@@ -3115,11 +3094,6 @@ command_mangen(void)
             return;
         }
         FILE* manpage = fopen(filename, "w");
-        if (!manpage) {
-            log_error("command_mangen(): unable to open %s for writing: %s", filename, g_strerror(errno));
-            curr = g_list_next(curr);
-            continue;
-        }
 
         fprintf(manpage, "%s\n", header);
         fputs(".SH NAME\n", manpage);

src/command/cmd_funcs.c

@@ -184,7 +184,7 @@ _string_matches_one_of(const char* what, const char* is, bool is_can_be_null, co
         }
         va_end(ap);
         if (s > 0)
-            cons_show("%s", errmsg);
+            cons_show(errmsg);
     }
     return ret;
 }
@@ -418,7 +418,7 @@ cmd_connect(ProfWin* window, const char* const command, gchar** args)
         auto_char char* err_msg = NULL;
         gboolean res = strtoi_range(port_str, &port, 1, 65535, &err_msg);
         if (!res) {
-            cons_show("%s", err_msg);
+            cons_show(err_msg);
             cons_show("");
             port = 0;
             options_destroy(options);
@@ -711,7 +711,7 @@ _account_set_port(char* account_name, char* port)
     auto_char char* err_msg = NULL;
     gboolean res = strtoi_range(port, &porti, 1, 65535, &err_msg);
     if (!res) {
-        cons_show("%s", err_msg);
+        cons_show(err_msg);
         cons_show("");
     } else {
         accounts_set_port(account_name, porti);
@@ -903,7 +903,7 @@ _account_set_max_sessions(char* account_name, char* max_sessions_raw)
     auto_char char* err_msg = NULL;
     gboolean res = strtoi_range(max_sessions_raw, &max_sessions, 0, INT_MAX, &err_msg);
     if (!res) {
-        cons_show("%s", err_msg);
+        cons_show(err_msg);
         cons_show("");
         return TRUE;
     }
@@ -924,7 +924,7 @@ _account_set_presence_priority(char* account_name, char* presence, char* priorit
     auto_char char* err_msg = NULL;
     gboolean res = strtoi_range(priority, &intval, -128, 127, &err_msg);
     if (!res) {
-        cons_show("%s", err_msg);
+        cons_show(err_msg);
         return TRUE;
     }
 
@@ -1580,7 +1580,7 @@ _cmd_list_commands(GList* commands)
     while (curr) {
         gchar* cmd = curr->data;
         if (count == 5) {
-            cons_show("%s", cmds->str);
+            cons_show(cmds->str);
             g_string_free(cmds, TRUE);
             cmds = g_string_new("");
             count = 0;
@@ -1589,7 +1589,7 @@ _cmd_list_commands(GList* commands)
         curr = g_list_next(curr);
         count++;
     }
-    cons_show("%s", cmds->str);
+    cons_show(cmds->str);
     g_string_free(cmds, TRUE);
     g_list_free(curr);
 
@@ -2407,7 +2407,7 @@ cmd_roster(ProfWin* window, const char* const command, gchar** args)
             }
             return TRUE;
         } else {
-            cons_show("%s", err_msg);
+            cons_show(err_msg);
             return TRUE;
         }
 
@@ -2467,7 +2467,7 @@ cmd_roster(ProfWin* window, const char* const command, gchar** args)
                     cons_show("Roster contact indent set to: %d", intval);
                     rosterwin_roster();
                 } else {
-                    cons_show("%s", err_msg);
+                    cons_show(err_msg);
                 }
             }
         } else {
@@ -2501,7 +2501,7 @@ cmd_roster(ProfWin* window, const char* const command, gchar** args)
                     cons_show("Roster resource indent set to: %d", intval);
                     rosterwin_roster();
                 } else {
-                    cons_show("%s", err_msg);
+                    cons_show(err_msg);
                 }
             }
         } else if (g_strcmp0(args[1], "join") == 0) {
@@ -2527,7 +2527,7 @@ cmd_roster(ProfWin* window, const char* const command, gchar** args)
                     cons_show("Roster presence indent set to: %d", intval);
                     rosterwin_roster();
                 } else {
-                    cons_show("%s", err_msg);
+                    cons_show(err_msg);
                 }
             }
         } else {
@@ -4371,7 +4371,7 @@ cmd_occupants(ProfWin* window, const char* const command, gchar** args)
                 wins_resize_all();
                 return TRUE;
             } else {
-                cons_show("%s", err_msg);
+                cons_show(err_msg);
                 return TRUE;
             }
         }
@@ -4391,7 +4391,7 @@ cmd_occupants(ProfWin* window, const char* const command, gchar** args)
 
                 occupantswin_occupants_all();
             } else {
-                cons_show("%s", err_msg);
+                cons_show(err_msg);
             }
             return TRUE;
         }
@@ -4970,8 +4970,8 @@ cmd_sendfile(ProfWin* window, const char* const command, gchar** args)
         alt_scheme = OMEMO_AESGCM_URL_SCHEME;
         alt_fragment = _add_omemo_stream(&fd, &fh, &err);
         if (err != NULL) {
-            cons_show_error("%s", err);
-            win_println(window, THEME_ERROR, "-", "%s", err);
+            cons_show_error(err);
+            win_println(window, THEME_ERROR, "-", err);
             goto out;
         }
 #endif
@@ -5836,7 +5836,7 @@ cmd_inpblock(ProfWin* window, const char* const command, gchar** args)
             prefs_set_inpblock(intval);
             inp_nonblocking(FALSE);
         } else {
-            cons_show("%s", err_msg);
+            cons_show(err_msg);
         }
 
         return TRUE;
@@ -6063,7 +6063,7 @@ cmd_statusbar(ProfWin* window, const char* const command, gchar** args)
             ui_resize();
             return TRUE;
         } else {
-            cons_show("%s", err_msg);
+            cons_show(err_msg);
             cons_bad_cmd_usage(command);
             return TRUE;
         }
@@ -6094,7 +6094,7 @@ cmd_statusbar(ProfWin* window, const char* const command, gchar** args)
             ui_resize();
             return TRUE;
         } else {
-            cons_show("%s", err_msg);
+            cons_show(err_msg);
             cons_bad_cmd_usage(command);
             return TRUE;
         }
@@ -6254,7 +6254,7 @@ cmd_log(ProfWin* window, const char* const command, gchar** args)
             prefs_set_max_log_size(intval);
             cons_show("Log maximum size set to %d bytes", intval);
         } else {
-            cons_show("%s", err_msg);
+            cons_show(err_msg);
         }
         return TRUE;
     }
@@ -6304,7 +6304,7 @@ cmd_reconnect(ProfWin* window, const char* const command, gchar** args)
             cons_show("Reconnect interval set to %d seconds.", intval);
         }
     } else {
-        cons_show("%s", err_msg);
+        cons_show(err_msg);
         cons_bad_cmd_usage(command);
     }
 
@@ -6330,7 +6330,7 @@ cmd_autoping(ProfWin* window, const char* const command, gchar** args)
                 cons_show("Autoping interval set to %d seconds.", intval);
             }
         } else {
-            cons_show("%s", err_msg);
+            cons_show(err_msg);
             cons_bad_cmd_usage(command);
         }
 
@@ -6346,7 +6346,7 @@ cmd_autoping(ProfWin* window, const char* const command, gchar** args)
                 cons_show("Autoping timeout set to %d seconds.", intval);
             }
         } else {
-            cons_show("%s", err_msg);
+            cons_show(err_msg);
             cons_bad_cmd_usage(command);
         }
 
@@ -6416,7 +6416,7 @@ cmd_autoaway(ProfWin* window, const char* const command, gchar** args)
                     cons_show("Auto away time set to: %d minutes.", minutesval);
                 }
             } else {
-                cons_show("%s", err_msg);
+                cons_show(err_msg);
             }
 
             return TRUE;
@@ -6439,7 +6439,7 @@ cmd_autoaway(ProfWin* window, const char* const command, gchar** args)
                     }
                 }
             } else {
-                cons_show("%s", err_msg);
+                cons_show(err_msg);
             }
 
             return TRUE;
@@ -6506,7 +6506,7 @@ cmd_priority(ProfWin* window, const char* const command, gchar** args)
         cl_ev_presence_send(last_presence, 0);
         cons_show("Priority set to %d.", intval);
     } else {
-        cons_show("%s", err_msg);
+        cons_show(err_msg);
     }
 
     return TRUE;
@@ -6576,7 +6576,7 @@ cmd_tray(ProfWin* window, const char* const command, gchar** args)
                 tray_set_timer(intval);
             }
         } else {
-            cons_show("%s", err_msg);
+            cons_show(err_msg);
         }
 
         return TRUE;
@@ -6686,11 +6686,6 @@ cmd_privacy(ProfWin* window, const char* const command, gchar** args)
         } else if (g_strcmp0(arg, "redact") == 0) {
             cons_show("Messages are going to be redacted.");
             prefs_set_string(PREF_DBLOG, arg);
-        } else if (g_strcmp0(arg, "flatfile") == 0) {
-            cons_show("Using flat-file backend for message logging. Takes effect on next connection.");
-            prefs_set_string(PREF_DBLOG, arg);
-            prefs_set_boolean(PREF_CHLOG, TRUE);
-            prefs_set_boolean(PREF_HISTORY, TRUE);
         } else {
             cons_bad_cmd_usage(command);
             return TRUE;
@@ -6735,125 +6730,6 @@ cmd_history(ProfWin* window, const char* const command, gchar** args)
         return TRUE;
     }
 
-    if (g_strcmp0(args[0], "switch") == 0) {
-        jabber_conn_status_t conn_status = connection_get_status();
-        if (conn_status != JABBER_CONNECTED) {
-            cons_show_error("You must be connected to switch database backend.");
-            return TRUE;
-        }
-
-        if (args[1] == NULL) {
-            cons_bad_cmd_usage(command);
-            return TRUE;
-        }
-
-        if (g_strcmp0(args[1], "sqlite") != 0 && g_strcmp0(args[1], "flatfile") != 0) {
-            cons_show_error("Backend must be 'sqlite' or 'flatfile'.");
-            return TRUE;
-        }
-
-        if (active_db_backend && g_strcmp0(active_db_backend->name, args[1]) == 0) {
-            cons_show("Already using '%s' backend.", args[1]);
-            return TRUE;
-        }
-
-        cons_show("Switching database backend to '%s'...", args[1]);
-        if (log_database_switch_backend(args[1])) {
-            cons_show("Database backend switched to '%s'.", args[1]);
-        } else {
-            cons_show_error("Failed to switch database backend.");
-        }
-        return TRUE;
-    }
-
-    if (g_strcmp0(args[0], "verify") == 0) {
-        const gchar* contact_jid = args[1]; // may be NULL (verify all)
-        cons_show("Verifying history integrity...");
-
-        GSList* issues = log_database_verify_integrity(contact_jid);
-
-        int errors = 0, warnings = 0, infos = 0;
-        for (GSList* l = issues; l; l = l->next) {
-            integrity_issue_t* issue = l->data;
-            const char* level_str;
-            switch (issue->level) {
-            case INTEGRITY_ERROR:
-                level_str = "ERROR";
-                errors++;
-                break;
-            case INTEGRITY_WARNING:
-                level_str = "WARN";
-                warnings++;
-                break;
-            case INTEGRITY_INFO:
-                level_str = "INFO";
-                infos++;
-                break;
-            default:
-                level_str = "???";
-                break;
-            }
-            if (issue->line > 0) {
-                if (issue->level == INTEGRITY_ERROR) {
-                    cons_show_error("[%s] %s:%d — %s", level_str, issue->file, issue->line, issue->message);
-                } else {
-                    cons_show("[%s] %s:%d — %s", level_str, issue->file, issue->line, issue->message);
-                }
-            } else {
-                if (issue->level == INTEGRITY_ERROR) {
-                    cons_show_error("[%s] %s — %s", level_str, issue->file, issue->message);
-                } else {
-                    cons_show("[%s] %s — %s", level_str, issue->file, issue->message);
-                }
-            }
-        }
-
-        if (!issues) {
-            cons_show("Verification complete: no issues found.");
-        } else {
-            cons_show("Verification complete: %d error(s), %d warning(s), %d info(s).",
-                      errors, warnings, infos);
-            g_slist_free_full(issues, (GDestroyNotify)integrity_issue_free);
-        }
-        return TRUE;
-    }
-
-    if (g_strcmp0(args[0], "export") == 0) {
-#ifdef HAVE_SQLITE
-        const gchar* contact_jid = args[1]; // may be NULL (export all)
-        if (contact_jid) {
-            cons_show("Exporting SQLite history for %s to flat-file...", contact_jid);
-        } else {
-            cons_show("Exporting all SQLite history to flat-file...");
-        }
-        int n = log_database_export_to_flatfile(contact_jid);
-        if (n >= 0) {
-            cons_show("Export complete: %d message(s) exported.", n);
-        }
-#else
-        cons_show_error("Export requires SQLite support. Rebuild with --with-sqlite.");
-#endif
-        return TRUE;
-    }
-
-    if (g_strcmp0(args[0], "import") == 0) {
-#ifdef HAVE_SQLITE
-        const gchar* contact_jid = args[1]; // may be NULL (import all)
-        if (contact_jid) {
-            cons_show("Importing flat-file history for %s into SQLite...", contact_jid);
-        } else {
-            cons_show("Importing all flat-file history into SQLite...");
-        }
-        int n = log_database_import_from_flatfile(contact_jid);
-        if (n >= 0) {
-            cons_show("Import complete: %d message(s) imported.", n);
-        }
-#else
-        cons_show_error("Import requires SQLite support. Rebuild with --with-sqlite.");
-#endif
-        return TRUE;
-    }
-
     _cmd_set_boolean_preference(args[0], "Chat history", PREF_HISTORY);
 
     // if set to on, set chlog (/logging chat on)
@@ -7305,21 +7181,22 @@ cmd_pgp(ProfWin* window, const char* const command, gchar** args)
         }
 
         cons_show("PGP keys:");
-        GHashTableIter iter;
-        gpointer key, value;
-        g_hash_table_iter_init(&iter, keys);
-        while (g_hash_table_iter_next(&iter, &key, &value)) {
-            ProfPGPKey* pgp_key = (ProfPGPKey*)value;
-            cons_show("  %s", pgp_key->name);
-            cons_show("    ID          : %s", pgp_key->id);
-            auto_char char* format_fp = p_gpg_format_fp_str(pgp_key->fp);
+        GList* keylist = g_hash_table_get_keys(keys);
+        GList* curr = keylist;
+        while (curr) {
+            ProfPGPKey* key = g_hash_table_lookup(keys, curr->data);
+            cons_show("  %s", key->name);
+            cons_show("    ID          : %s", key->id);
+            auto_char char* format_fp = p_gpg_format_fp_str(key->fp);
             cons_show("    Fingerprint : %s", format_fp);
-            if (pgp_key->secret) {
+            if (key->secret) {
                 cons_show("    Type        : PUBLIC, PRIVATE");
             } else {
                 cons_show("    Type        : PUBLIC");
             }
+            curr = g_list_next(curr);
         }
+        g_list_free(keylist);
         p_gpg_free_keys(keys);
         return TRUE;
     }
@@ -7360,24 +7237,25 @@ cmd_pgp(ProfWin* window, const char* const command, gchar** args)
             return TRUE;
         }
         GHashTable* pubkeys = p_gpg_pubkeys();
-        if (!pubkeys || g_hash_table_size(pubkeys) == 0) {
+        GList* jids = g_hash_table_get_keys(pubkeys);
+        if (!jids) {
             cons_show("No contacts found with PGP public keys assigned.");
             return TRUE;
         }
 
         cons_show("Assigned PGP public keys:");
-        GHashTableIter iter;
-        gpointer key, value;
-        g_hash_table_iter_init(&iter, pubkeys);
-        while (g_hash_table_iter_next(&iter, &key, &value)) {
-            char* jid = (char*)key;
-            ProfPGPPubKeyId* pubkeyid = (ProfPGPPubKeyId*)value;
+        GList* curr = jids;
+        while (curr) {
+            char* jid = curr->data;
+            ProfPGPPubKeyId* pubkeyid = g_hash_table_lookup(pubkeys, jid);
             if (pubkeyid->received) {
                 cons_show("  %s: %s (received)", jid, pubkeyid->id);
             } else {
                 cons_show("  %s: %s (stored)", jid, pubkeyid->id);
             }
+            curr = g_list_next(curr);
         }
+        g_list_free(jids);
         return TRUE;
     }
 
@@ -7590,21 +7468,22 @@ cmd_ox(ProfWin* window, const char* const command, gchar** args)
         }
 
         cons_show("OpenPGP keys:");
-        GHashTableIter iter;
-        gpointer key, value;
-        g_hash_table_iter_init(&iter, keys);
-        while (g_hash_table_iter_next(&iter, &key, &value)) {
-            ProfPGPKey* pgp_key = (ProfPGPKey*)value;
-            cons_show("  %s", pgp_key->name);
-            cons_show("    ID          : %s", pgp_key->id);
-            auto_char char* format_fp = p_gpg_format_fp_str(pgp_key->fp);
+        GList* keylist = g_hash_table_get_keys(keys);
+        GList* curr = keylist;
+        while (curr) {
+            ProfPGPKey* key = g_hash_table_lookup(keys, curr->data);
+            cons_show("  %s", key->name);
+            cons_show("    ID          : %s", key->id);
+            auto_char char* format_fp = p_gpg_format_fp_str(key->fp);
             cons_show("    Fingerprint : %s", format_fp);
-            if (pgp_key->secret) {
+            if (key->secret) {
                 cons_show("    Type        : PUBLIC, PRIVATE");
             } else {
                 cons_show("    Type        : PUBLIC");
             }
+            curr = g_list_next(curr);
         }
+        g_list_free(keylist);
         p_gpg_free_keys(keys);
         return TRUE;
     }
@@ -7612,8 +7491,8 @@ cmd_ox(ProfWin* window, const char* const command, gchar** args)
     else if (g_strcmp0(args[0], "contacts") == 0) {
         GHashTable* keys = ox_gpg_public_keys();
         cons_show("OpenPGP keys:");
-        GHashTableIter iter;
-        gpointer key, value;
+        GList* keylist = g_hash_table_get_keys(keys);
+        GList* curr = keylist;
 
         GSList* roster_list = NULL;
         jabber_conn_status_t conn_status = connection_get_status();
@@ -7623,16 +7502,15 @@ cmd_ox(ProfWin* window, const char* const command, gchar** args)
             roster_list = roster_get_contacts(ROSTER_ORD_NAME);
         }
 
-        g_hash_table_iter_init(&iter, keys);
-        while (g_hash_table_iter_next(&iter, &key, &value)) {
-            ProfPGPKey* pgp_key = (ProfPGPKey*)value;
+        while (curr) {
+            ProfPGPKey* key = g_hash_table_lookup(keys, curr->data);
             PContact contact = NULL;
             if (roster_list) {
                 GSList* curr_c = roster_list;
                 while (!contact && curr_c) {
                     contact = curr_c->data;
                     auto_gchar gchar* xmppuri = g_strdup_printf("xmpp:%s", p_contact_barejid(contact));
-                    if (g_strcmp0(pgp_key->name, xmppuri)) {
+                    if (g_strcmp0(key->name, xmppuri)) {
                         contact = NULL;
                     }
                     curr_c = g_slist_next(curr_c);
@@ -7640,10 +7518,11 @@ cmd_ox(ProfWin* window, const char* const command, gchar** args)
             }
 
             if (contact) {
-                cons_show("%s - %s", pgp_key->fp, pgp_key->name);
+                cons_show("%s - %s", key->fp, key->name);
             } else {
-                cons_show("%s - %s (not in roster)", pgp_key->fp, pgp_key->name);
+                cons_show("%s - %s (not in roster)", key->fp, key->name);
             }
+            curr = g_list_next(curr);
         }
 
     } else if (g_strcmp0(args[0], "start") == 0) {
@@ -9733,7 +9612,7 @@ cmd_register(ProfWin* window, const char* const command, gchar** args)
         auto_char char* err_msg = NULL;
         gboolean res = strtoi_range(port_str, &port, 1, 65535, &err_msg);
         if (!res) {
-            cons_show("%s", err_msg);
+            cons_show(err_msg);
             cons_show("");
             port = 0;
             options_destroy(options);
@@ -9803,7 +9682,7 @@ cmd_strophe(ProfWin* window, const char* const command, gchar** args)
             prefs_set_string(PREF_STROPHE_VERBOSITY, args[1]);
             return TRUE;
         } else {
-            cons_show("%s", err_msg);
+            cons_show(err_msg);
         }
     } else if (g_strcmp0(args[0], "sm") == 0) {
         if (g_strcmp0(args[1], "no-resend") == 0) {

src/common.c

@@ -143,7 +143,7 @@ auto_close_gfd(gint* fd)
         return;
 
     if (close(*fd) == EOF)
-        log_error("%s", g_strerror(errno));
+        log_error(g_strerror(errno));
 }
 
 /**
@@ -158,7 +158,7 @@ auto_close_FILE(FILE** fd)
         return;
 
     if (fclose(*fd) == EOF)
-        log_error("%s", g_strerror(errno));
+        log_error(g_strerror(errno));
 }
 
 static gboolean

src/config/files.h

@@ -57,7 +57,6 @@
 #define DIR_OMEMO     "omemo"
 #define DIR_PLUGINS   "plugins"
 #define DIR_DATABASE  "database"
-#define DIR_FLATLOG   "flatlog"
 #define DIR_DOWNLOADS "downloads"
 #define DIR_EDITOR    "editor"
 #define DIR_CERTS     "certs"

src/database.c

@@ -35,164 +35,664 @@
 
 #include "config.h"
 
+#include <sys/stat.h>
+#include <sys/statvfs.h>
+#include <sqlite3.h>
 #include <glib.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 
 #include "log.h"
 #include "common.h"
-#include "config.h"
+#include "config/files.h"
 #include "database.h"
 #include "config/preferences.h"
-#include "config/accounts.h"
 #include "ui/ui.h"
 #include "xmpp/xmpp.h"
 #include "xmpp/message.h"
 
-db_backend_t* active_db_backend = NULL;
+static sqlite3* g_chatlog_database;
 
-void
-integrity_issue_free(integrity_issue_t* issue)
+static void _add_to_db(ProfMessage* message, char* type, const Jid* const from_jid, const Jid* const to_jid);
+static char* _get_db_filename(ProfAccount* account);
+static prof_msg_type_t _get_message_type_type(const char* const type);
+static prof_enc_t _get_message_enc_type(const char* const encstr);
+static int _get_db_version(void);
+static gboolean _migrate_to_v2(void);
+static gboolean _check_available_space_for_db_migration(char* path_to_db);
+
+static const int latest_version = 2;
+
+static char*
+_db_strdup(const char* str)
 {
-    if (issue) {
-        g_free(issue->file);
-        g_free(issue->message);
-        g_free(issue);
-    }
+    return str ? strdup(str) : NULL;
+}
+
+#define auto_sqlite __attribute__((__cleanup__(auto_free_sqlite)))
+
+static void
+auto_free_sqlite(gchar** str)
+{
+    if (str == NULL)
+        return;
+    sqlite3_free(*str);
+}
+
+static char*
+_get_db_filename(ProfAccount* account)
+{
+    return files_file_in_account_data_path(DIR_DATABASE, account->jid, "chatlog.db");
 }
 
 gboolean
 log_database_init(ProfAccount* account)
 {
-    auto_gchar gchar* pref_dblog = prefs_get_string(PREF_DBLOG);
-
-    // Select backend based on preference
-    if (g_strcmp0(pref_dblog, "flatfile") == 0) {
-        active_db_backend = db_backend_flatfile();
-        log_info("Using flat-file database backend");
-    } else {
-#ifdef HAVE_SQLITE
-        active_db_backend = db_backend_sqlite();
-        log_info("Using SQLite database backend");
-#else
-        log_info("SQLite not compiled in, falling back to flat-file backend");
-        active_db_backend = db_backend_flatfile();
-#endif
-    }
-
-    if (!active_db_backend) {
-        log_error("log_database_init: no backend available");
+    int ret = sqlite3_initialize();
+    if (ret != SQLITE_OK) {
+        log_error("Error initializing SQLite database: %d", ret);
         return FALSE;
     }
 
-    return active_db_backend->init(account);
+    auto_char char* filename = _get_db_filename(account);
+    if (!filename) {
+        return FALSE;
+    }
+
+    ret = sqlite3_open(filename, &g_chatlog_database);
+    if (ret != SQLITE_OK) {
+        const char* err_msg = sqlite3_errmsg(g_chatlog_database);
+        log_error("Error opening SQLite database: %s", err_msg);
+        return FALSE;
+    }
+
+    char* err_msg;
+
+    int db_version = _get_db_version();
+    if (db_version == latest_version) {
+        return TRUE;
+    }
+
+    // ChatLogs Table
+    // Contains all chat messages
+    //
+    // id is primary key
+    // from_jid is the sender's jid
+    // to_jid is the receiver's jid
+    // from_resource is the sender's resource
+    // to_resource is the receiver's resource
+    // message is the message's text
+    // timestamp is the timestamp like "2020/03/24 11:12:14"
+    // type is there to distinguish: message (chat), MUC message (muc), muc pm (mucpm)
+    // stanza_id is the ID in <message>
+    // archive_id is the stanza-id from from XEP-0359: Unique and Stable Stanza IDs used for XEP-0313: Message Archive Management
+    // encryption is to distinguish: none, omemo, otr, pgp
+    // marked_read is 0/1 whether a message has been marked as read via XEP-0333: Chat Markers
+    // replace_id is the ID from XEP-0308: Last Message Correction
+    // replaces_db_id is ID (primary key) of the original message that LMC message corrects/replaces
+    // replaced_by_db_id is ID (primary key) of the last correcting (LMC) message for the original message
+    char* query = "CREATE TABLE IF NOT EXISTS `ChatLogs` ("
+                  "`id` INTEGER PRIMARY KEY AUTOINCREMENT, "
+                  "`from_jid` TEXT NOT NULL, "
+                  "`to_jid` TEXT NOT NULL, "
+                  "`from_resource` TEXT, "
+                  "`to_resource` TEXT, "
+                  "`message` TEXT, "
+                  "`timestamp` TEXT, "
+                  "`type` TEXT, "
+                  "`stanza_id` TEXT, "
+                  "`archive_id` TEXT, "
+                  "`encryption` TEXT, "
+                  "`marked_read` INTEGER, "
+                  "`replace_id` TEXT, "
+                  "`replaces_db_id` INTEGER, "
+                  "`replaced_by_db_id` INTEGER)";
+    if (SQLITE_OK != sqlite3_exec(g_chatlog_database, query, NULL, 0, &err_msg)) {
+        goto out;
+    }
+
+    query = "CREATE TRIGGER IF NOT EXISTS update_corrected_message "
+            "AFTER INSERT ON ChatLogs "
+            "FOR EACH ROW "
+            "WHEN NEW.replaces_db_id IS NOT NULL "
+            "BEGIN "
+            "UPDATE ChatLogs "
+            "SET replaced_by_db_id = NEW.id "
+            "WHERE id = NEW.replaces_db_id; "
+            "END;";
+    if (SQLITE_OK != sqlite3_exec(g_chatlog_database, query, NULL, 0, &err_msg)) {
+        log_error("Unable to add `update_corrected_message` trigger.");
+        goto out;
+    }
+
+    query = "CREATE INDEX IF NOT EXISTS ChatLogs_timestamp_IDX ON `ChatLogs` (`timestamp`)";
+    if (SQLITE_OK != sqlite3_exec(g_chatlog_database, query, NULL, 0, &err_msg)) {
+        log_error("Unable to create index for timestamp.");
+        goto out;
+    }
+    query = "CREATE INDEX IF NOT EXISTS ChatLogs_to_from_jid_IDX ON `ChatLogs` (`to_jid`, `from_jid`)";
+    if (SQLITE_OK != sqlite3_exec(g_chatlog_database, query, NULL, 0, &err_msg)) {
+        log_error("Unable to create index for to_jid.");
+        goto out;
+    }
+
+    query = "CREATE TABLE IF NOT EXISTS `DbVersion` (`dv_id` INTEGER PRIMARY KEY, `version` INTEGER UNIQUE)";
+    if (SQLITE_OK != sqlite3_exec(g_chatlog_database, query, NULL, 0, &err_msg)) {
+        goto out;
+    }
+
+    if (db_version == -1) {
+        query = "INSERT OR IGNORE INTO `DbVersion` (`version`) VALUES ('2')";
+        if (SQLITE_OK != sqlite3_exec(g_chatlog_database, query, NULL, 0, &err_msg)) {
+            goto out;
+        }
+        db_version = _get_db_version();
+    }
+
+    // Unlikely event, but we don't want to migrate if we are just unable to determine the DB version
+    if (db_version == -1) {
+        cons_show_error("DB Initialization Error: Unable to check DB version.");
+        goto out;
+    }
+
+    if (db_version < latest_version) {
+        cons_show("Migrating database schema. This operation may take a while...");
+        if (db_version < 2 && (!_check_available_space_for_db_migration(filename) || !_migrate_to_v2())) {
+            cons_show_error("Database Initialization Error: Unable to migrate database to version 2. Please, check error logs for details.");
+            goto out;
+        }
+        cons_show("Database schema migration was successful.");
+    }
+
+    log_debug("Initialized SQLite database: %s", filename);
+    return TRUE;
+
+out:
+    if (err_msg) {
+        log_error("SQLite error in log_database_init(): %s", err_msg);
+        sqlite3_free(err_msg);
+    } else {
+        log_error("Unknown SQLite error in log_database_init().");
+    }
+    return FALSE;
 }
 
 void
 log_database_close(void)
 {
-    if (active_db_backend) {
-        active_db_backend->close();
+    log_debug("log_database_close() called");
+    if (g_chatlog_database) {
+        sqlite3_close(g_chatlog_database);
+        sqlite3_shutdown();
+        g_chatlog_database = NULL;
     }
-    active_db_backend = NULL;
-}
-
-gboolean
-log_database_switch_backend(const char* new_backend)
-{
-    // Close current backend
-    log_database_close();
-
-    // Update preference
-    prefs_set_string(PREF_DBLOG, new_backend);
-    prefs_save();
-
-    // Get current account to reinitialize
-    const char* account_name = session_get_account_name();
-    if (!account_name) {
-        log_error("log_database_switch_backend: no active session");
-        return FALSE;
-    }
-
-    ProfAccount* account = accounts_get_account(account_name);
-    if (!account) {
-        log_error("log_database_switch_backend: account '%s' not found", account_name);
-        return FALSE;
-    }
-
-    gboolean result = log_database_init(account);
-    account_free(account);
-    return result;
 }
 
 void
 log_database_add_incoming(ProfMessage* message)
 {
-    if (active_db_backend && active_db_backend->add_incoming) {
-        active_db_backend->add_incoming(message);
+    if (message->to_jid) {
+        _add_to_db(message, NULL, message->from_jid, message->to_jid);
+    } else {
+        _add_to_db(message, NULL, message->from_jid, connection_get_jid());
     }
 }
 
+static void
+_log_database_add_outgoing(char* type, const char* const id, const char* const barejid, const char* const message, const char* const replace_id, prof_enc_t enc)
+{
+    ProfMessage* msg = message_init();
+
+    msg->id = _db_strdup(id);
+    msg->from_jid = jid_create(barejid);
+    msg->plain = _db_strdup(message);
+    msg->replace_id = _db_strdup(replace_id);
+    msg->timestamp = g_date_time_new_now_local(); // TODO: get from outside. best to have whole ProfMessage from outside
+    msg->enc = enc;
+
+    _add_to_db(msg, type, connection_get_jid(), msg->from_jid); // TODO: myjid now in profmessage
+
+    message_free(msg);
+}
+
 void
 log_database_add_outgoing_chat(const char* const id, const char* const barejid, const char* const message, const char* const replace_id, prof_enc_t enc)
 {
-    if (active_db_backend && active_db_backend->add_outgoing_chat) {
-        active_db_backend->add_outgoing_chat(id, barejid, message, replace_id, enc);
-    }
+    _log_database_add_outgoing("chat", id, barejid, message, replace_id, enc);
 }
 
 void
 log_database_add_outgoing_muc(const char* const id, const char* const barejid, const char* const message, const char* const replace_id, prof_enc_t enc)
 {
-    if (active_db_backend && active_db_backend->add_outgoing_muc) {
-        active_db_backend->add_outgoing_muc(id, barejid, message, replace_id, enc);
-    }
+    _log_database_add_outgoing("muc", id, barejid, message, replace_id, enc);
 }
 
 void
 log_database_add_outgoing_muc_pm(const char* const id, const char* const barejid, const char* const message, const char* const replace_id, prof_enc_t enc)
 {
-    if (active_db_backend && active_db_backend->add_outgoing_muc_pm) {
-        active_db_backend->add_outgoing_muc_pm(id, barejid, message, replace_id, enc);
-    }
-}
-
-db_history_result_t
-log_database_get_previous_chat(const gchar* const contact_barejid, const gchar* start_time, const gchar* end_time, gboolean from_start, gboolean flip, GSList** result)
-{
-    if (active_db_backend && active_db_backend->get_previous_chat) {
-        return active_db_backend->get_previous_chat(contact_barejid, start_time, end_time, from_start, flip, result);
-    }
-    return DB_RESPONSE_ERROR;
+    _log_database_add_outgoing("mucpm", id, barejid, message, replace_id, enc);
 }
 
+// Get info (timestamp and stanza_id) of the first or last message in db
 ProfMessage*
 log_database_get_limits_info(const gchar* const contact_barejid, gboolean is_last)
 {
-    if (active_db_backend && active_db_backend->get_limits_info) {
-        return active_db_backend->get_limits_info(contact_barejid, is_last);
+    sqlite3_stmt* stmt = NULL;
+    const Jid* myjid = connection_get_jid();
+    if (!myjid->str)
+        return NULL;
+
+    const char* order = is_last ? "DESC" : "ASC";
+    auto_sqlite char* query = sqlite3_mprintf("SELECT `archive_id`, `timestamp` FROM `ChatLogs` WHERE "
+                                              "(`from_jid` = %Q AND `to_jid` = %Q) OR "
+                                              "(`from_jid` = %Q AND `to_jid` = %Q) "
+                                              "ORDER BY `timestamp` %s LIMIT 1;",
+                                              contact_barejid, myjid->barejid, myjid->barejid, contact_barejid, order);
+
+    if (!query) {
+        log_error("Could not allocate memory for SQL query in log_database_get_limits_info()");
+        return NULL;
     }
-    // Fallback: return an empty message with sane defaults
+
+    int rc = sqlite3_prepare_v2(g_chatlog_database, query, -1, &stmt, NULL);
+    if (rc != SQLITE_OK) {
+        log_error("Unknown SQLite error in log_database_get_last_info().");
+        return NULL;
+    }
+
     ProfMessage* msg = message_init();
-    if (is_last) {
-        msg->timestamp = g_date_time_new_now_utc();
+
+    if (sqlite3_step(stmt) == SQLITE_ROW) {
+        char* archive_id = (char*)sqlite3_column_text(stmt, 0);
+        char* date = (char*)sqlite3_column_text(stmt, 1);
+
+        msg->stanzaid = _db_strdup(archive_id);
+        msg->timestamp = g_date_time_new_from_iso8601(date, NULL);
     }
+    sqlite3_finalize(stmt);
+
     return msg;
 }
 
-GSList*
-log_database_verify_integrity(const gchar* const contact_barejid)
+// Query previous chats, constraints start_time and end_time. If end_time is
+// null the current time is used. from_start gets first few messages if true
+// otherwise the last ones. Flip flips the order of the results
+db_history_result_t
+log_database_get_previous_chat(const gchar* const contact_barejid, const gchar* start_time, const gchar* end_time, gboolean from_start, gboolean flip, GSList** result)
 {
-    if (active_db_backend && active_db_backend->verify_integrity) {
-        return active_db_backend->verify_integrity(contact_barejid);
+    if (!g_chatlog_database) {
+        log_warning("log_database_get_previous_chat() called but db is not initialized");
+        return DB_RESPONSE_ERROR;
+    }
+    sqlite3_stmt* stmt = NULL;
+    const Jid* myjid = connection_get_jid();
+    if (!myjid->str) {
+        log_warning("log_database_get_previous_chat() called but no connection detected.");
+        return DB_RESPONSE_ERROR;
     }
 
-    GSList* issues = NULL;
-    integrity_issue_t* issue = g_malloc0(sizeof(integrity_issue_t));
-    issue->level = INTEGRITY_WARNING;
-    issue->file = g_strdup("N/A");
-    issue->line = 0;
-    issue->message = g_strdup("Active backend does not support integrity verification");
-    issues = g_slist_append(issues, issue);
-    return issues;
+    // Flip order when querying older pages
+    gchar* sort1 = from_start ? "ASC" : "DESC";
+    gchar* sort2 = !flip ? "ASC" : "DESC";
+    GDateTime* now = g_date_time_new_now_local();
+    auto_gchar gchar* end_date_fmt = end_time ? g_strdup(end_time) : g_date_time_format_iso8601(now);
+    auto_sqlite gchar* query = sqlite3_mprintf("SELECT * FROM ("
+                                               "SELECT COALESCE(B.`message`, A.`message`) AS message, "
+                                               "A.`timestamp`, A.`from_jid`, A.`from_resource`, A.`to_jid`, A.`to_resource`, A.`type`, A.`encryption`, A.`stanza_id` FROM `ChatLogs` AS A "
+                                               "LEFT JOIN `ChatLogs` AS B ON (A.`replaced_by_db_id` = B.`id` AND A.`from_jid` = B.`from_jid`) "
+                                               "WHERE (A.`replaces_db_id` IS NULL) "
+                                               "AND ((A.`from_jid` = %Q AND A.`to_jid` = %Q) OR (A.`from_jid` = %Q AND A.`to_jid` = %Q)) "
+                                               "AND A.`timestamp` < %Q "
+                                               "AND (%Q IS NULL OR A.`timestamp` > %Q) "
+                                               "ORDER BY A.`timestamp` %s LIMIT %d) "
+                                               "ORDER BY `timestamp` %s;",
+                                               contact_barejid, myjid->barejid, myjid->barejid, contact_barejid, end_date_fmt, start_time, start_time, sort1, MESSAGES_TO_RETRIEVE, sort2);
+
+    g_date_time_unref(now);
+
+    if (!query) {
+        log_error("Could not allocate memory.");
+        return DB_RESPONSE_ERROR;
+    }
+
+    int rc = sqlite3_prepare_v2(g_chatlog_database, query, -1, &stmt, NULL);
+    if (rc != SQLITE_OK) {
+        log_error("SQLite error in log_database_get_previous_chat(): (error code: %d) %s", rc, sqlite3_errmsg(g_chatlog_database));
+        return DB_RESPONSE_ERROR;
+    }
+
+    while (sqlite3_step(stmt) == SQLITE_ROW) {
+        char* message = (char*)sqlite3_column_text(stmt, 0);
+        char* date = (char*)sqlite3_column_text(stmt, 1);
+        char* from_jid = (char*)sqlite3_column_text(stmt, 2);
+        char* from_resource = (char*)sqlite3_column_text(stmt, 3);
+        char* to_jid = (char*)sqlite3_column_text(stmt, 4);
+        char* to_resource = (char*)sqlite3_column_text(stmt, 5);
+        char* type = (char*)sqlite3_column_text(stmt, 6);
+        char* encryption = (char*)sqlite3_column_text(stmt, 7);
+        char* id = (char*)sqlite3_column_text(stmt, 8);
+
+        ProfMessage* msg = message_init();
+        msg->id = id ? strdup(id) : NULL;
+        msg->from_jid = jid_create_from_bare_and_resource(from_jid, from_resource);
+        msg->to_jid = jid_create_from_bare_and_resource(to_jid, to_resource);
+        msg->plain = strdup(message ?: "");
+        msg->timestamp = g_date_time_new_from_iso8601(date, NULL);
+        msg->type = _get_message_type_type(type);
+        msg->enc = _get_message_enc_type(encryption);
+
+        *result = g_slist_append(*result, msg);
+    }
+    sqlite3_finalize(stmt);
+
+    return g_slist_length(*result) != 0 ? DB_RESPONSE_SUCCESS : DB_RESPONSE_EMPTY;
+}
+
+static const char*
+_get_message_type_str(prof_msg_type_t type)
+{
+    switch (type) {
+    case PROF_MSG_TYPE_CHAT:
+        return "chat";
+    case PROF_MSG_TYPE_MUC:
+        return "muc";
+    case PROF_MSG_TYPE_MUCPM:
+        return "mucpm";
+    case PROF_MSG_TYPE_UNINITIALIZED:
+        return NULL;
+    }
+    return NULL;
+}
+
+static prof_msg_type_t
+_get_message_type_type(const char* const type)
+{
+    if (g_strcmp0(type, "chat") == 0) {
+        return PROF_MSG_TYPE_CHAT;
+    } else if (g_strcmp0(type, "muc") == 0) {
+        return PROF_MSG_TYPE_MUC;
+    } else if (g_strcmp0(type, "mucpm") == 0) {
+        return PROF_MSG_TYPE_MUCPM;
+    } else {
+        return PROF_MSG_TYPE_UNINITIALIZED;
+    }
+}
+
+static const char*
+_get_message_enc_str(prof_enc_t enc)
+{
+    switch (enc) {
+    case PROF_MSG_ENC_OX:
+        return "ox";
+    case PROF_MSG_ENC_PGP:
+        return "pgp";
+    case PROF_MSG_ENC_OTR:
+        return "otr";
+    case PROF_MSG_ENC_OMEMO:
+        return "omemo";
+    case PROF_MSG_ENC_NONE:
+        return "none";
+    }
+
+    return "none";
+}
+
+static prof_enc_t
+_get_message_enc_type(const char* const encstr)
+{
+    if (g_strcmp0(encstr, "ox") == 0) {
+        return PROF_MSG_ENC_OX;
+    } else if (g_strcmp0(encstr, "pgp") == 0) {
+        return PROF_MSG_ENC_PGP;
+    } else if (g_strcmp0(encstr, "otr") == 0) {
+        return PROF_MSG_ENC_OTR;
+    } else if (g_strcmp0(encstr, "omemo") == 0) {
+        return PROF_MSG_ENC_OMEMO;
+    }
+
+    return PROF_MSG_ENC_NONE;
+}
+
+static void
+_add_to_db(ProfMessage* message, char* type, const Jid* const from_jid, const Jid* const to_jid)
+{
+    auto_gchar gchar* pref_dblog = prefs_get_string(PREF_DBLOG);
+    sqlite_int64 original_message_id = -1;
+
+    if (g_strcmp0(pref_dblog, "off") == 0) {
+        return;
+    } else if (g_strcmp0(pref_dblog, "redact") == 0) {
+        if (message->plain) {
+            free(message->plain);
+        }
+        message->plain = strdup("[REDACTED]");
+    }
+
+    if (!g_chatlog_database) {
+        log_debug("log_database_add() called but db is not initialized");
+        return;
+    }
+
+    char* err_msg;
+    auto_gchar gchar* date_fmt = NULL;
+
+    if (message->timestamp) {
+        date_fmt = g_date_time_format_iso8601(message->timestamp);
+    } else {
+        GDateTime* dt = g_date_time_new_now_local();
+        date_fmt = g_date_time_format_iso8601(dt);
+        g_date_time_unref(dt);
+    }
+
+    const char* enc = _get_message_enc_str(message->enc);
+
+    if (!type) {
+        type = (char*)_get_message_type_str(message->type);
+    }
+
+    // Apply LMC and check its validity (XEP-0308)
+    if (message->replace_id) {
+        auto_sqlite char* replace_check_query = sqlite3_mprintf("SELECT `id`, `from_jid`, `replaces_db_id` FROM `ChatLogs` WHERE `stanza_id` = %Q ORDER BY `timestamp` DESC LIMIT 1",
+                                                                message->replace_id);
+
+        if (!replace_check_query) {
+            log_error("Could not allocate memory for SQL replace query in log_database_add()");
+            return;
+        }
+
+        sqlite3_stmt* lmc_stmt = NULL;
+
+        if (SQLITE_OK != sqlite3_prepare_v2(g_chatlog_database, replace_check_query, -1, &lmc_stmt, NULL)) {
+            log_error("SQLite error in _add_to_db() on selecting original message: %s", sqlite3_errmsg(g_chatlog_database));
+            return;
+        }
+
+        if (sqlite3_step(lmc_stmt) == SQLITE_ROW) {
+            original_message_id = sqlite3_column_int64(lmc_stmt, 0);
+            const char* from_jid_orig = (const char*)sqlite3_column_text(lmc_stmt, 1);
+
+            // Handle non-XEP-compliant replacement messages (edit->edit->original)
+            sqlite_int64 tmp = sqlite3_column_int64(lmc_stmt, 2);
+            original_message_id = tmp ? tmp : original_message_id;
+
+            if (g_strcmp0(from_jid_orig, from_jid->barejid) != 0) {
+                log_error("Mismatch in sender JIDs when trying to do LMC. Corrected message sender: %s. Original message sender: %s. Replace-ID: %s. Message: %s", from_jid->barejid, from_jid_orig, message->replace_id, message->plain);
+                cons_show_error("%s sent a message correction with mismatched sender. See log for details.", from_jid->barejid);
+                sqlite3_finalize(lmc_stmt);
+                return;
+            }
+        } else {
+            log_warning("Got LMC message that does not have original message counterpart in the database from %s", message->from_jid->fulljid);
+        }
+        sqlite3_finalize(lmc_stmt);
+    }
+
+    // stanza-id (XEP-0359) doesn't have to be present in the message.
+    // But if it's duplicated, it's a serious server-side problem, so we better track it.
+    // Unless it's MAM, in that case it's expected behaviour.
+    if (message->stanzaid && !message->is_mam) {
+        auto_sqlite char* duplicate_check_query = sqlite3_mprintf("SELECT 1 FROM `ChatLogs` WHERE (`archive_id` = %Q)",
+                                                                  message->stanzaid);
+
+        if (!duplicate_check_query) {
+            log_error("Could not allocate memory for SQL duplicate query in log_database_add()");
+            return;
+        }
+
+        sqlite3_stmt* stmt;
+
+        if (SQLITE_OK == sqlite3_prepare_v2(g_chatlog_database, duplicate_check_query, -1, &stmt, NULL)) {
+            if (sqlite3_step(stmt) == SQLITE_ROW) {
+                log_error("Duplicate stanza-id found for the message. stanza_id: %s; archive_id: %s; sender: %s; content: %s", message->id, message->stanzaid, from_jid->barejid, message->plain);
+                cons_show_error("Got a message with duplicate (server-generated) stanza-id from %s.", from_jid->fulljid);
+            }
+            sqlite3_finalize(stmt);
+        }
+    }
+
+    auto_sqlite char* orig_message_id = original_message_id == -1 ? NULL : sqlite3_mprintf("%d", original_message_id);
+
+    auto_sqlite char* query = sqlite3_mprintf("INSERT INTO `ChatLogs` "
+                                              "(`from_jid`, `from_resource`, `to_jid`, `to_resource`, "
+                                              "`message`, `timestamp`, `stanza_id`, `archive_id`, "
+                                              "`replaces_db_id`, `replace_id`, `type`, `encryption`) "
+                                              "VALUES (%Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q)",
+                                              from_jid->barejid,
+                                              from_jid->resourcepart,
+                                              to_jid->barejid,
+                                              to_jid->resourcepart,
+                                              message->plain,
+                                              date_fmt,
+                                              message->id,
+                                              message->stanzaid,
+                                              orig_message_id,
+                                              message->replace_id,
+                                              type,
+                                              enc);
+    if (!query) {
+        log_error("Could not allocate memory for SQL insert query in log_database_add()");
+        return;
+    }
+
+    log_debug("Writing to DB. Query: %s", query);
+
+    if (SQLITE_OK != sqlite3_exec(g_chatlog_database, query, NULL, 0, &err_msg)) {
+        if (err_msg) {
+            log_error("SQLite error in _add_to_db(): %s", err_msg);
+            sqlite3_free(err_msg);
+        } else {
+            log_error("Unknown SQLite error in _add_to_db().");
+        }
+    } else {
+        int inserted_rows_count = sqlite3_changes(g_chatlog_database);
+        if (inserted_rows_count < 1) {
+            log_error("SQLite did not insert message (rows: %d, id: %s, content: %s)", inserted_rows_count, message->id, message->plain);
+        }
+    }
+}
+
+static int
+_get_db_version(void)
+{
+    int current_version = -1;
+    const char* query = "SELECT `version` FROM `DbVersion` LIMIT 1";
+    sqlite3_stmt* statement;
+
+    if (sqlite3_prepare_v2(g_chatlog_database, query, -1, &statement, NULL) == SQLITE_OK) {
+        if (sqlite3_step(statement) == SQLITE_ROW) {
+            current_version = sqlite3_column_int(statement, 0);
+        }
+        sqlite3_finalize(statement);
+    }
+    return current_version;
+}
+
+/**
+ * Migration to version 2 introduces new columns. Returns TRUE on success.
+ *
+ * New columns:
+ * `replaces_db_id` database ID for correcting message of the original message
+ * `replaced_by_db_id` database ID for original message of the last correcting message
+ */
+static gboolean
+_migrate_to_v2(void)
+{
+    char* err_msg = NULL;
+
+    // from_resource, to_resource, message, timestamp, stanza_id, archive_id, replace_id, type, encryption
+    const char* sql_statements[] = {
+        "BEGIN TRANSACTION",
+        "ALTER TABLE `ChatLogs` ADD COLUMN `replaces_db_id` INTEGER;",
+        "ALTER TABLE `ChatLogs` ADD COLUMN `replaced_by_db_id` INTEGER;",
+        "UPDATE `ChatLogs` AS A "
+        "SET `replaces_db_id` = B.`id` "
+        "FROM `ChatLogs` AS B "
+        "WHERE A.`replace_id` IS NOT NULL AND A.`replace_id` != '' "
+        "AND A.`replace_id` = B.`stanza_id` "
+        "AND A.`from_jid` = B.`from_jid` AND A.`to_jid` = B.`to_jid`;",
+        "UPDATE `ChatLogs` AS A "
+        "SET `replaced_by_db_id` = B.`id` "
+        "FROM `ChatLogs` AS B "
+        "WHERE (A.`replace_id` IS NULL OR A.`replace_id` = '') "
+        "AND A.`id` = B.`replaces_db_id` "
+        "AND A.`from_jid` = B.`from_jid`;",
+        "UPDATE ChatLogs SET "
+        "from_resource = COALESCE(NULLIF(from_resource, ''), NULL), "
+        "to_resource = COALESCE(NULLIF(to_resource, ''), NULL), "
+        "message = COALESCE(NULLIF(message, ''), NULL), "
+        "timestamp = COALESCE(NULLIF(timestamp, ''), NULL), "
+        "stanza_id = COALESCE(NULLIF(stanza_id, ''), NULL), "
+        "archive_id = COALESCE(NULLIF(archive_id, ''), NULL), "
+        "replace_id = COALESCE(NULLIF(replace_id, ''), NULL), "
+        "type = COALESCE(NULLIF(type, ''), NULL), "
+        "encryption = COALESCE(NULLIF(encryption, ''), NULL);",
+        "UPDATE `DbVersion` SET `version` = 2;",
+        "END TRANSACTION"
+    };
+
+    int statements_count = sizeof(sql_statements) / sizeof(sql_statements[0]);
+
+    for (int i = 0; i < statements_count; i++) {
+        if (SQLITE_OK != sqlite3_exec(g_chatlog_database, sql_statements[i], NULL, 0, &err_msg)) {
+            log_error("SQLite error in _migrate_to_v2() on statement %d: %s", i, err_msg);
+            if (err_msg) {
+                sqlite3_free(err_msg);
+                err_msg = NULL;
+            }
+            goto cleanup;
+        }
+    }
+
+    return TRUE;
+
+cleanup:
+    if (SQLITE_OK != sqlite3_exec(g_chatlog_database, "ROLLBACK;", NULL, 0, &err_msg)) {
+        log_error("[DB Migration] Unable to ROLLBACK: %s", err_msg);
+        if (err_msg) {
+            sqlite3_free(err_msg);
+        }
+    }
+
+    return FALSE;
+}
+
+// Checks if there is more system storage space available than current database takes + 40% (for indexing and other potential size increases)
+static gboolean
+_check_available_space_for_db_migration(char* path_to_db)
+{
+    struct stat file_stat;
+    struct statvfs fs_stat;
+
+    if (statvfs(path_to_db, &fs_stat) == 0 && stat(path_to_db, &file_stat) == 0) {
+        unsigned long long file_size = file_stat.st_size / 1024;
+        unsigned long long available_space_kb = fs_stat.f_frsize * fs_stat.f_bavail / 1024;
+        log_debug("_check_available_space_for_db_migration(): Available space on disk: %llu KB; DB size: %llu KB", available_space_kb, file_size);
+
+        return (available_space_kb >= (file_size + (file_size * 10 / 4)));
+    } else {
+        log_error("Error checking available space.");
+        return FALSE;
+    }
 }

src/database.h

@@ -48,52 +48,7 @@ typedef enum {
     DB_RESPONSE_SUCCESS
 } db_history_result_t;
 
-// Integrity verification issue levels
-typedef enum {
-    INTEGRITY_ERROR,
-    INTEGRITY_WARNING,
-    INTEGRITY_INFO
-} integrity_level_t;
-
-// A single integrity issue found during verification
-typedef struct
-{
-    integrity_level_t level;
-    char* file;
-    int line;
-    char* message;
-} integrity_issue_t;
-
-void integrity_issue_free(integrity_issue_t* issue);
-
-// Backend vtable: pluggable storage backends implement this interface
-typedef struct db_backend_t
-{
-    const char* name;
-    gboolean (*init)(ProfAccount* account);
-    void (*close)(void);
-    void (*add_incoming)(ProfMessage* message);
-    void (*add_outgoing_chat)(const char* const id, const char* const barejid, const char* const message, const char* const replace_id, prof_enc_t enc);
-    void (*add_outgoing_muc)(const char* const id, const char* const barejid, const char* const message, const char* const replace_id, prof_enc_t enc);
-    void (*add_outgoing_muc_pm)(const char* const id, const char* const barejid, const char* const message, const char* const replace_id, prof_enc_t enc);
-    db_history_result_t (*get_previous_chat)(const gchar* const contact_barejid, const gchar* start_time, const gchar* end_time, gboolean from_start, gboolean flip, GSList** result);
-    ProfMessage* (*get_limits_info)(const gchar* const contact_barejid, gboolean is_last);
-    GSList* (*verify_integrity)(const gchar* const contact_barejid);
-} db_backend_t;
-
-// Active backend (set during init based on PREF_DBLOG)
-extern db_backend_t* active_db_backend;
-
-// Backend registry
-#ifdef HAVE_SQLITE
-db_backend_t* db_backend_sqlite(void);
-GSList* db_sqlite_list_contacts(void);
-#endif
-db_backend_t* db_backend_flatfile(void);
-
-// Public API (dispatches to active_db_backend)
 gboolean log_database_init(ProfAccount* account);
-gboolean log_database_switch_backend(const char* new_backend);
 void log_database_add_incoming(ProfMessage* message);
 void log_database_add_outgoing_chat(const char* const id, const char* const barejid, const char* const message, const char* const replace_id, prof_enc_t enc);
 void log_database_add_outgoing_muc(const char* const id, const char* const barejid, const char* const message, const char* const replace_id, prof_enc_t enc);
@@ -101,12 +56,5 @@ void log_database_add_outgoing_muc_pm(const char* const id, const char* const ba
 db_history_result_t log_database_get_previous_chat(const gchar* const contact_barejid, const gchar* start_time, const gchar* end_time, gboolean from_start, gboolean flip, GSList** result);
 ProfMessage* log_database_get_limits_info(const gchar* const contact_barejid, gboolean is_last);
 void log_database_close(void);
-GSList* log_database_verify_integrity(const gchar* const contact_barejid);
-
-// Cross-backend export/import (requires HAVE_SQLITE)
-#ifdef HAVE_SQLITE
-int log_database_export_to_flatfile(const gchar* const contact_jid);
-int log_database_import_from_flatfile(const gchar* const contact_jid);
-#endif
 
 #endif // DATABASE_H

src/database_export.c

@@ -1,531 +0,0 @@
-/*
- * database_export.c
- * vim: expandtab:ts=4:sts=4:sw=4
- *
- * Copyright (C) 2026 Profanity Contributors
- *
- * This file is part of Profanity.
- *
- * Profanity is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Profanity is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
- *
- * Cross-backend export/import for message history.
- * Reads from one backend, writes to the other, with merge + dedup.
- */
-
-#include "config.h"
-
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-
-#ifdef HAVE_SQLITE
-#include <sqlite3.h>
-#endif
-
-#include "log.h"
-#include "common.h"
-#include "config/files.h"
-#include "database.h"
-#include "database_flatfile.h"
-#include "config/preferences.h"
-#include "ui/ui.h"
-#include "xmpp/xmpp.h"
-#include "xmpp/message.h"
-
-// =========================================================================
-// Everything below is only used when HAVE_SQLITE is defined
-// =========================================================================
-
-#ifdef HAVE_SQLITE
-
-// =========================================================================
-// Dedup key: stanza_id if present, else hash of timestamp+from+body
-// =========================================================================
-
-static char*
-_make_dedup_key(const char* stanza_id, const char* timestamp, const char* from_jid, const char* body)
-{
-    if (stanza_id && strlen(stanza_id) > 0)
-        return g_strdup(stanza_id);
-
-    // Fallback: simple composite key
-    auto_gchar gchar* raw = g_strdup_printf("%s|%s|%.64s",
-                                            timestamp ? timestamp : "",
-                                            from_jid ? from_jid : "",
-                                            body ? body : "");
-    return g_compute_checksum_for_string(G_CHECKSUM_SHA256, raw, -1);
-}
-
-// =========================================================================
-// Helper: reverse ff_jid_to_dir (best-effort)
-// '_at_' -> '@'
-// =========================================================================
-
-static char*
-_dir_to_jid(const char* dirname)
-{
-    if (!dirname)
-        return NULL;
-    return str_replace(dirname, "_at_", "@");
-}
-
-// =========================================================================
-// Helper: list all contact JIDs from flatfile directory
-// Returns a GSList of g_strdup'd JID strings. Caller frees with g_slist_free_full(list, g_free).
-// =========================================================================
-
-static GSList*
-_ff_list_contacts(void)
-{
-    GSList* contacts = NULL;
-
-    if (!g_flatfile_account_jid)
-        return NULL;
-
-    auto_gchar gchar* data_path = files_get_data_path(DIR_FLATLOG);
-    auto_gchar gchar* my_dir = ff_jid_to_dir(g_flatfile_account_jid);
-    auto_gchar gchar* base_dir = g_strdup_printf("%s/%s", data_path, my_dir);
-
-    GError* err = NULL;
-    GDir* dir = g_dir_open(base_dir, 0, &err);
-    if (!dir) {
-        if (err) {
-            log_debug("export: cannot open flatlog dir %s: %s", base_dir, err->message);
-            g_error_free(err);
-        }
-        return NULL;
-    }
-
-    const gchar* entry;
-    while ((entry = g_dir_read_name(dir)) != NULL) {
-        auto_gchar gchar* full_path = g_strdup_printf("%s/%s/history.log", base_dir, entry);
-        if (g_file_test(full_path, G_FILE_TEST_IS_REGULAR)) {
-            char* jid = _dir_to_jid(entry);
-            if (jid) {
-                contacts = g_slist_append(contacts, jid);
-            }
-        }
-    }
-    g_dir_close(dir);
-
-    return contacts;
-}
-
-// =========================================================================
-// Helper: read ALL parsed lines from a flatfile for a contact
-// Returns GSList<ff_parsed_line_t*>. Caller frees with g_slist_free_full(list, (GDestroyNotify)ff_parsed_line_free).
-// =========================================================================
-
-static GSList*
-_ff_read_all_lines(const char* contact_barejid)
-{
-    GSList* lines = NULL;
-    auto_gchar gchar* log_path = ff_get_log_path(contact_barejid);
-    if (!log_path)
-        return NULL;
-
-    FILE* fp = fopen(log_path, "r");
-    if (!fp)
-        return NULL;
-
-    while (1) {
-        gboolean truncated = FALSE;
-        char* buf = ff_readline(fp, &truncated);
-        if (!buf)
-            break;
-        if (truncated) {
-            free(buf);
-            break;
-        }
-        if (buf[0] == '\0' || buf[0] == '#') {
-            free(buf);
-            continue;
-        }
-
-        ff_parsed_line_t* pl = ff_parse_line(buf);
-        free(buf);
-        if (pl) {
-            lines = g_slist_append(lines, pl);
-        }
-    }
-    fclose(fp);
-
-    return lines;
-}
-
-// =========================================================================
-// Export: SQLite -> flatfile (merge)
-// =========================================================================
-
-// Callback data for the SQLite query
-typedef struct
-{
-    GHashTable* seen_keys; // dedup set
-    FILE* fp;              // output file
-    int exported;          // counter
-    int skipped;           // counter
-} export_ctx_t;
-
-int
-log_database_export_to_flatfile(const gchar* const contact_jid)
-{
-    const Jid* myjid = connection_get_jid();
-    if (!myjid || !myjid->barejid) {
-        cons_show_error("Export failed: not connected.");
-        return -1;
-    }
-
-    if (!g_flatfile_account_jid) {
-        // Flatfile backend not initialized — init it temporarily
-        // We need g_flatfile_account_jid for path construction
-        g_free(g_flatfile_account_jid);
-        g_flatfile_account_jid = g_strdup(myjid->barejid);
-    }
-
-    // Get the SQLite backend
-    db_backend_t* sqlite_be = db_backend_sqlite();
-    if (!sqlite_be) {
-        cons_show_error("Export failed: SQLite backend not available.");
-        return -1;
-    }
-
-    // Determine contact list
-    GSList* contacts = NULL;
-    if (contact_jid) {
-        contacts = g_slist_append(contacts, g_strdup(contact_jid));
-    } else {
-        contacts = db_sqlite_list_contacts();
-        if (!contacts) {
-            cons_show("No contacts found in SQLite database.");
-            return 0;
-        }
-        cons_show("Exporting %d contact(s) to flat-file format...", g_slist_length(contacts));
-    }
-
-    int total_exported = 0;
-    int total_skipped = 0;
-
-    for (GSList* c = contacts; c; c = c->next) {
-        const char* contact = c->data;
-
-        // 1. Read existing flatfile lines for dedup
-        GHashTable* seen_keys = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
-
-        GSList* existing = _ff_read_all_lines(contact);
-        for (GSList* l = existing; l; l = l->next) {
-            ff_parsed_line_t* pl = l->data;
-            char* key = _make_dedup_key(pl->stanza_id, pl->timestamp_str, pl->from_jid, pl->message);
-            g_hash_table_add(seen_keys, key);
-        }
-        int existing_count = g_slist_length(existing);
-
-        // 2. Query SQLite for this contact — get ALL messages ordered by timestamp
-        // We read all messages by paginating through the existing get_previous_chat
-        // But it limits to MESSAGES_TO_RETRIEVE... We need a direct SQL query.
-        // Use the same approach as verify — iterate with raw SQL.
-
-        // For now, collect all messages into a list via repeated calls
-        // Actually, let's use a simpler approach: read all from flatfile existing data,
-        // then query SQLite for everything, merge, write back.
-
-        // Read all SQLite messages for this contact
-        GSList* sqlite_lines = NULL;
-        // Use the backend's get_previous_chat with a wide time range
-        // This is limited to MESSAGES_TO_RETRIEVE, so we need to paginate
-        gboolean has_more = TRUE;
-        gchar* start_time = NULL;
-
-        while (has_more) {
-            GSList* batch = NULL;
-            db_history_result_t res = sqlite_be->get_previous_chat(
-                contact, start_time, NULL, TRUE, FALSE, &batch);
-
-            if (res != DB_RESPONSE_SUCCESS || !batch) {
-                has_more = FALSE;
-                break;
-            }
-
-            int batch_size = g_slist_length(batch);
-
-            // Get the last timestamp for the next query
-            ProfMessage* last_msg = g_slist_last(batch)->data;
-            if (last_msg && last_msg->timestamp) {
-                g_free(start_time);
-                start_time = g_date_time_format_iso8601(last_msg->timestamp);
-            }
-
-            sqlite_lines = g_slist_concat(sqlite_lines, batch);
-
-            if (batch_size < MESSAGES_TO_RETRIEVE) {
-                has_more = FALSE;
-            }
-        }
-        g_free(start_time);
-
-        if (!sqlite_lines) {
-            log_debug("export: no SQLite messages for %s", contact);
-            g_hash_table_destroy(seen_keys);
-            g_slist_free_full(existing, (GDestroyNotify)ff_parsed_line_free);
-            continue;
-        }
-
-        // 3. Merge: write existing flatfile lines + new SQLite lines to temp file
-        auto_gchar gchar* log_path = ff_get_log_path(contact);
-        if (!log_path) {
-            g_hash_table_destroy(seen_keys);
-            g_slist_free_full(existing, (GDestroyNotify)ff_parsed_line_free);
-            g_slist_free_full(sqlite_lines, (GDestroyNotify)message_free);
-            continue;
-        }
-
-        // Ensure directory
-        auto_gchar gchar* dir = g_path_get_dirname(log_path);
-        ff_ensure_dir(dir);
-
-        auto_gchar gchar* tmp_path = g_strdup_printf("%s.export.tmp", log_path);
-        FILE* fp = fopen(tmp_path, "w");
-        if (!fp) {
-            log_error("export: cannot create %s: %s", tmp_path, strerror(errno));
-            g_hash_table_destroy(seen_keys);
-            g_slist_free_full(existing, (GDestroyNotify)ff_parsed_line_free);
-            g_slist_free_full(sqlite_lines, (GDestroyNotify)message_free);
-            continue;
-        }
-
-        // Lock the temp file
-        int fd = fileno(fp);
-        flock(fd, LOCK_EX);
-
-        fprintf(fp, "%s", FLATFILE_HEADER);
-
-        int contact_exported = 0;
-        int contact_skipped = 0;
-
-        // Write existing flatfile lines first (preserve originals)
-        for (GSList* l = existing; l; l = l->next) {
-            ff_parsed_line_t* pl = l->data;
-            ff_write_line(fp, pl->timestamp_str,
-                          pl->type, pl->enc,
-                          pl->stanza_id, pl->archive_id, pl->replace_id,
-                          pl->from_jid, pl->from_resource, pl->message);
-        }
-
-        // Write SQLite messages that aren't already in the flatfile
-        for (GSList* l = sqlite_lines; l; l = l->next) {
-            ProfMessage* msg = l->data;
-            if (!msg || !msg->timestamp)
-                continue;
-
-            auto_gchar gchar* ts = g_date_time_format_iso8601(msg->timestamp);
-            const char* from_jid = msg->from_jid ? msg->from_jid->barejid : "unknown";
-            const char* body = msg->plain ? msg->plain : "";
-            const char* sid = msg->id ? msg->id : "";
-
-            char* key = _make_dedup_key(sid, ts, from_jid, body);
-            if (g_hash_table_contains(seen_keys, key)) {
-                g_free(key);
-                contact_skipped++;
-                continue;
-            }
-            g_hash_table_add(seen_keys, key);
-
-            const char* type_str = ff_get_message_type_str(msg->type);
-            const char* enc_str = ff_get_message_enc_str(msg->enc);
-            const char* from_res = msg->from_jid ? msg->from_jid->resourcepart : NULL;
-
-            ff_write_line(fp, ts, type_str, enc_str,
-                          sid, msg->stanzaid, NULL,
-                          from_jid, from_res, body);
-            contact_exported++;
-        }
-
-        fflush(fp);
-        fclose(fp); // also releases flock
-
-        // Atomic rename
-        if (rename(tmp_path, log_path) != 0) {
-            log_error("export: rename %s -> %s failed: %s", tmp_path, log_path, strerror(errno));
-            unlink(tmp_path);
-        }
-
-        cons_show("Exported %s: %d new, %d skipped (already existed: %d)",
-                  contact, contact_exported, contact_skipped, existing_count);
-        total_exported += contact_exported;
-        total_skipped += contact_skipped;
-
-        g_hash_table_destroy(seen_keys);
-        g_slist_free_full(existing, (GDestroyNotify)ff_parsed_line_free);
-        g_slist_free_full(sqlite_lines, (GDestroyNotify)message_free);
-    }
-
-    g_slist_free_full(contacts, g_free);
-    return total_exported;
-}
-
-// =========================================================================
-// Import: flatfile -> SQLite (merge)
-// =========================================================================
-
-int
-log_database_import_from_flatfile(const gchar* const contact_jid)
-{
-    const Jid* myjid = connection_get_jid();
-    if (!myjid || !myjid->barejid) {
-        cons_show_error("Import failed: not connected.");
-        return -1;
-    }
-
-    if (!g_flatfile_account_jid) {
-        g_free(g_flatfile_account_jid);
-        g_flatfile_account_jid = g_strdup(myjid->barejid);
-    }
-
-    db_backend_t* sqlite_be = db_backend_sqlite();
-    if (!sqlite_be) {
-        cons_show_error("Import failed: SQLite backend not available.");
-        return -1;
-    }
-
-    // Determine contacts
-    GSList* contacts = NULL;
-    if (contact_jid) {
-        contacts = g_slist_append(contacts, g_strdup(contact_jid));
-    } else {
-        contacts = _ff_list_contacts();
-        if (!contacts) {
-            cons_show("No flat-file history found to import.");
-            return 0;
-        }
-    }
-
-    int total_imported = 0;
-    int total_skipped = 0;
-
-    for (GSList* c = contacts; c; c = c->next) {
-        const char* contact = c->data;
-
-        // 1. Read all flatfile lines
-        GSList* ff_lines = _ff_read_all_lines(contact);
-        if (!ff_lines) {
-            log_debug("import: no flatfile messages for %s", contact);
-            continue;
-        }
-
-        // 2. Build dedup set from SQLite (existing stanza_ids + fallback keys)
-        GHashTable* seen_keys = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
-
-        // Read all SQLite messages for this contact
-        gboolean has_more = TRUE;
-        gchar* start_time = NULL;
-
-        while (has_more) {
-            GSList* batch = NULL;
-            db_history_result_t res = sqlite_be->get_previous_chat(
-                contact, start_time, NULL, TRUE, FALSE, &batch);
-
-            if (res != DB_RESPONSE_SUCCESS || !batch) {
-                has_more = FALSE;
-                break;
-            }
-
-            int batch_size = g_slist_length(batch);
-
-            ProfMessage* last_msg = g_slist_last(batch)->data;
-            if (last_msg && last_msg->timestamp) {
-                g_free(start_time);
-                start_time = g_date_time_format_iso8601(last_msg->timestamp);
-            }
-
-            for (GSList* l = batch; l; l = l->next) {
-                ProfMessage* msg = l->data;
-                if (!msg)
-                    continue;
-                auto_gchar gchar* ts = msg->timestamp ? g_date_time_format_iso8601(msg->timestamp) : g_strdup("");
-                char* key = _make_dedup_key(msg->id, ts, msg->from_jid ? msg->from_jid->barejid : "", msg->plain);
-                g_hash_table_add(seen_keys, key);
-            }
-
-            g_slist_free_full(batch, (GDestroyNotify)message_free);
-
-            if (batch_size < MESSAGES_TO_RETRIEVE) {
-                has_more = FALSE;
-            }
-        }
-        g_free(start_time);
-
-        // 3. For each flatfile line not in seen_keys, insert via add_incoming/add_outgoing
-        int contact_imported = 0;
-        int contact_skipped = 0;
-
-        for (GSList* l = ff_lines; l; l = l->next) {
-            ff_parsed_line_t* pl = l->data;
-            if (!pl || !pl->timestamp)
-                continue;
-
-            auto_gchar gchar* ts = g_date_time_format_iso8601(pl->timestamp);
-            char* key = _make_dedup_key(pl->stanza_id, ts, pl->from_jid, pl->message);
-
-            if (g_hash_table_contains(seen_keys, key)) {
-                g_free(key);
-                contact_skipped++;
-                continue;
-            }
-            g_hash_table_add(seen_keys, key);
-
-            // Build a ProfMessage and insert via add_incoming
-            // (add_incoming uses _add_to_db which preserves the original timestamp)
-            gboolean is_outgoing = (g_strcmp0(pl->from_jid, myjid->barejid) == 0);
-
-            ProfMessage* msg = message_init();
-            msg->id = pl->stanza_id ? g_strdup(pl->stanza_id) : NULL;
-            msg->stanzaid = pl->archive_id ? g_strdup(pl->archive_id) : NULL;
-            msg->plain = g_strdup(pl->message ? pl->message : "");
-            msg->timestamp = g_date_time_ref(pl->timestamp);
-            msg->type = ff_get_message_type_type(pl->type);
-            msg->enc = ff_get_message_enc_type(pl->enc);
-            msg->replace_id = pl->replace_id ? g_strdup(pl->replace_id) : NULL;
-            msg->is_mam = TRUE; // Suppress dedup check in the backend
-
-            if (is_outgoing) {
-                msg->from_jid = jid_create(myjid->barejid);
-                msg->to_jid = jid_create(contact);
-            } else {
-                msg->from_jid = jid_create_from_bare_and_resource(pl->from_jid, pl->from_resource);
-                msg->to_jid = jid_create(myjid->barejid);
-            }
-
-            sqlite_be->add_incoming(msg);
-            message_free(msg);
-            contact_imported++;
-        }
-
-        cons_show("Imported %s: %d new, %d skipped (already in SQLite)",
-                  contact, contact_imported, contact_skipped);
-        total_imported += contact_imported;
-        total_skipped += contact_skipped;
-
-        g_hash_table_destroy(seen_keys);
-        g_slist_free_full(ff_lines, (GDestroyNotify)ff_parsed_line_free);
-    }
-
-    g_slist_free_full(contacts, g_free);
-    return total_imported;
-}
-
-#endif /* HAVE_SQLITE */

src/database_flatfile.c

@@ -1,995 +0,0 @@
-/*
- * database_flatfile.c
- * vim: expandtab:ts=4:sts=4:sw=4
- *
- * Copyright (C) 2026 Profanity Contributors
- *
- * This file is part of Profanity.
- *
- * Profanity is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Profanity is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
- *
- * Flat-file database backend: init/close, message write, message read,
- * LMC correction logic, and the backend vtable.
- *
- * Parser and escape helpers are in database_flatfile_parser.c.
- * Integrity verification is in database_flatfile_verify.c.
- * Shared types and prototypes are in database_flatfile.h.
- */
-
-#include "config.h"
-
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/file.h>
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-#include "log.h"
-#include "common.h"
-#include "config/files.h"
-#include "database.h"
-#include "database_flatfile.h"
-#include "config/preferences.h"
-#include "ui/ui.h"
-#include "xmpp/xmpp.h"
-#include "xmpp/message.h"
-
-// =========================================================================
-// Shared global — account JID stored during init for path construction
-// =========================================================================
-
-char* g_flatfile_account_jid = NULL;
-static GHashTable* g_contact_states = NULL;
-
-// =========================================================================
-// Per-contact state / sparse index
-// =========================================================================
-
-ff_contact_state_t*
-ff_state_new(const char* filepath)
-{
-    ff_contact_state_t* state = g_malloc0(sizeof(ff_contact_state_t));
-    state->filepath = g_strdup(filepath);
-    state->cursor_offset = -1;
-    return state;
-}
-
-void
-ff_state_free(ff_contact_state_t* state)
-{
-    if (!state)
-        return;
-    g_free(state->filepath);
-    g_free(state->entries);
-    g_free(state);
-}
-
-static gboolean
-_ff_state_build(ff_contact_state_t* state)
-{
-    FILE* fp = fopen(state->filepath, "r");
-    if (!fp)
-        return FALSE;
-
-    int c1 = fgetc(fp);
-    int c2 = fgetc(fp);
-    int c3 = fgetc(fp);
-    if (c1 == 0xEF && c2 == 0xBB && c3 == 0xBF) {
-        state->bom_len = 3;
-    } else {
-        state->bom_len = 0;
-        fseek(fp, 0, SEEK_SET);
-    }
-
-    state->n_entries = 0;
-    state->total_lines = 0;
-    size_t msg_count = 0;
-
-    while (1) {
-        off_t pos = ftell(fp);
-        gboolean truncated = FALSE;
-        char* buf = ff_readline(fp, &truncated);
-        if (!buf)
-            break;
-        if (truncated) {
-            free(buf);
-            break;
-        }
-
-        if (buf[0] == '\0' || buf[0] == '#') {
-            free(buf);
-            continue;
-        }
-
-        state->total_lines++;
-
-        if (msg_count % FF_INDEX_STEP == 0) {
-            char* space = strchr(buf, ' ');
-            if (space) {
-                char* ts_str = g_strndup(buf, space - buf);
-                GDateTime* dt = g_date_time_new_from_iso8601(ts_str, NULL);
-                if (dt) {
-                    if (state->n_entries >= state->cap_entries) {
-                        state->cap_entries = state->cap_entries ? state->cap_entries * 2 : 64;
-                        state->entries = g_realloc(state->entries,
-                                                   state->cap_entries * sizeof(ff_index_entry_t));
-                    }
-                    state->entries[state->n_entries].byte_offset = pos;
-                    state->entries[state->n_entries].timestamp_epoch = g_date_time_to_unix(dt);
-                    state->n_entries++;
-                    g_date_time_unref(dt);
-                }
-                g_free(ts_str);
-            }
-        }
-        msg_count++;
-        free(buf);
-    }
-
-    fclose(fp);
-
-    struct stat st;
-    if (stat(state->filepath, &st) == 0) {
-        state->stamp.mtime = st.st_mtime;
-        state->stamp.size = st.st_size;
-        state->stamp.inode = st.st_ino;
-    }
-
-    log_debug("flatfile: index built for %s (%zu entries, %zu lines)",
-              state->filepath, state->n_entries, state->total_lines);
-    return TRUE;
-}
-
-static gboolean
-_ff_state_extend(ff_contact_state_t* state)
-{
-    struct stat st;
-    if (stat(state->filepath, &st) != 0)
-        return FALSE;
-
-    if (st.st_size <= state->stamp.size)
-        return _ff_state_build(state);
-
-    FILE* fp = fopen(state->filepath, "r");
-    if (!fp)
-        return FALSE;
-
-    fseek(fp, state->stamp.size, SEEK_SET);
-    if (state->stamp.size > 0) {
-        fseek(fp, state->stamp.size - 1, SEEK_SET);
-        int prev = fgetc(fp);
-        if (prev != '\n' && prev != EOF) {
-            int ch;
-            while ((ch = fgetc(fp)) != EOF && ch != '\n') {
-            }
-        }
-    }
-
-    // Use a local counter for new messages so index step alignment
-    // doesn't depend on the total from the initial build.
-    size_t new_count = 0;
-
-    while (1) {
-        off_t pos = ftell(fp);
-        gboolean truncated = FALSE;
-        char* buf = ff_readline(fp, &truncated);
-        if (!buf)
-            break;
-        if (truncated) {
-            free(buf);
-            break;
-        }
-
-        if (buf[0] == '\0' || buf[0] == '#') {
-            free(buf);
-            continue;
-        }
-
-        state->total_lines++;
-
-        if (new_count % FF_INDEX_STEP == 0) {
-            char* space = strchr(buf, ' ');
-            if (space) {
-                char* ts_str = g_strndup(buf, space - buf);
-                GDateTime* dt = g_date_time_new_from_iso8601(ts_str, NULL);
-                if (dt) {
-                    if (state->n_entries >= state->cap_entries) {
-                        state->cap_entries = state->cap_entries ? state->cap_entries * 2 : 64;
-                        state->entries = g_realloc(state->entries,
-                                                   state->cap_entries * sizeof(ff_index_entry_t));
-                    }
-                    state->entries[state->n_entries].byte_offset = pos;
-                    state->entries[state->n_entries].timestamp_epoch = g_date_time_to_unix(dt);
-                    state->n_entries++;
-                    g_date_time_unref(dt);
-                }
-                g_free(ts_str);
-            }
-        }
-        new_count++;
-        free(buf);
-    }
-
-    fclose(fp);
-
-    state->stamp.mtime = st.st_mtime;
-    state->stamp.size = st.st_size;
-    state->stamp.inode = st.st_ino;
-
-    log_debug("flatfile: index extended for %s (%zu entries, %zu lines)",
-              state->filepath, state->n_entries, state->total_lines);
-    return TRUE;
-}
-
-gboolean
-ff_state_ensure_fresh(ff_contact_state_t* state)
-{
-    if (!state || !state->filepath)
-        return FALSE;
-
-    struct stat st;
-    if (stat(state->filepath, &st) != 0) {
-        state->total_lines = 0;
-        state->n_entries = 0;
-        state->stamp.size = 0;
-        return FALSE;
-    }
-
-    if (state->stamp.size == 0 && state->n_entries == 0)
-        return _ff_state_build(state);
-
-    if (st.st_mtime == state->stamp.mtime
-        && st.st_size == state->stamp.size
-        && st.st_ino == state->stamp.inode) {
-        return TRUE;
-    }
-
-    if (st.st_ino == state->stamp.inode && st.st_size > state->stamp.size)
-        return _ff_state_extend(state);
-
-    state->cursor_offset = -1;
-    return _ff_state_build(state);
-}
-
-off_t
-ff_state_offset_for_time(ff_contact_state_t* state, const char* iso_time)
-{
-    if (!state || !iso_time || state->n_entries == 0)
-        return state ? (off_t)state->bom_len : 0;
-
-    GDateTime* dt = g_date_time_new_from_iso8601(iso_time, NULL);
-    if (!dt)
-        return state->bom_len;
-
-    gint64 target = g_date_time_to_unix(dt);
-    g_date_time_unref(dt);
-
-    size_t lo = 0, hi = state->n_entries;
-    while (lo < hi) {
-        size_t mid = lo + (hi - lo) / 2;
-        if (state->entries[mid].timestamp_epoch <= target)
-            lo = mid + 1;
-        else
-            hi = mid;
-    }
-
-    if (lo == 0)
-        return state->bom_len;
-    return state->entries[lo - 1].byte_offset;
-}
-
-static ff_contact_state_t*
-_ff_get_state(const char* contact_barejid)
-{
-    if (!g_contact_states || !contact_barejid)
-        return NULL;
-
-    ff_contact_state_t* state = g_hash_table_lookup(g_contact_states, contact_barejid);
-    if (state)
-        return state;
-
-    auto_gchar gchar* filepath = ff_get_log_path(contact_barejid);
-    if (!filepath)
-        return NULL;
-
-    state = ff_state_new(filepath);
-    g_hash_table_insert(g_contact_states, g_strdup(contact_barejid), state);
-    return state;
-}
-
-// =========================================================================
-// Core write logic
-// =========================================================================
-
-static void
-_ff_add_message(const char* type, const char* stanza_id, const char* archive_id,
-                const char* replace_id, const char* from_barejid, const char* from_resource,
-                const char* to_barejid, const char* message_text, GDateTime* timestamp,
-                prof_enc_t enc)
-{
-    auto_gchar gchar* pref_dblog = prefs_get_string(PREF_DBLOG);
-
-    if (g_strcmp0(pref_dblog, "off") == 0) {
-        return;
-    }
-
-    // "redact" replaces the message content.
-    char* effective_msg = NULL;
-    if (g_strcmp0(pref_dblog, "redact") == 0) {
-        effective_msg = g_strdup("[REDACTED]");
-    } else {
-        effective_msg = g_strdup(message_text ? message_text : "");
-    }
-
-    GDateTime* dt = timestamp ? g_date_time_ref(timestamp) : g_date_time_new_now_local();
-    auto_gchar gchar* date_fmt = g_date_time_format_iso8601(dt);
-    g_date_time_unref(dt);
-
-    // Determine which JID to use for the log file path (the "other" party)
-    const char* contact = NULL;
-    const Jid* myjid = connection_get_jid();
-    if (myjid && myjid->barejid && g_strcmp0(from_barejid, myjid->barejid) == 0) {
-        contact = to_barejid;
-    } else {
-        contact = from_barejid;
-    }
-
-    auto_gchar gchar* log_path = ff_get_log_path(contact);
-
-    if (!log_path) {
-        log_error("flatfile: could not determine log path for %s", contact);
-        g_free(effective_msg);
-        return;
-    }
-
-    // Ensure directory exists
-    auto_gchar gchar* dir = g_path_get_dirname(log_path);
-    if (!ff_ensure_dir(dir)) {
-        g_free(effective_msg);
-        return;
-    }
-
-    // Open the file with O_NOFOLLOW to prevent symlink attacks,
-    // and O_APPEND for safe concurrent appends.
-    // Try O_CREAT|O_EXCL first to detect new files atomically (no TOCTOU).
-    int fd = open(log_path, O_WRONLY | O_APPEND | O_CREAT | O_EXCL | O_NOFOLLOW,
-                  S_IRUSR | S_IWUSR);
-    gboolean is_new = (fd >= 0);
-    if (fd < 0) {
-        if (errno == EEXIST) {
-            // File already exists — open for append
-            fd = open(log_path, O_WRONLY | O_APPEND | O_NOFOLLOW);
-        }
-        if (fd < 0) {
-            // ELOOP (symlink) or other error
-            log_error("flatfile: could not open %s for writing (errno=%d: %s)",
-                      log_path, errno, strerror(errno));
-            g_free(effective_msg);
-            return;
-        }
-    }
-
-    FILE* fp = fdopen(fd, "a");
-    if (!fp) {
-        log_error("flatfile: fdopen failed for %s (errno=%d)", log_path, errno);
-        close(fd);
-        g_free(effective_msg);
-        return;
-    }
-
-    // Advisory lock to prevent interleaved writes from concurrent instances
-    if (flock(fd, LOCK_EX) != 0) {
-        log_warning("flatfile: flock(%s) failed (errno=%d: %s), writing anyway",
-                    log_path, errno, strerror(errno));
-    }
-
-    if (is_new) {
-        if (fprintf(fp, "%s", FLATFILE_HEADER) < 0) {
-            log_error("flatfile: failed to write header to %s (errno=%d)",
-                      log_path, errno);
-        }
-    }
-
-    ff_write_line(fp, date_fmt, type, ff_get_message_enc_str(enc),
-                  stanza_id, archive_id, replace_id,
-                  from_barejid, from_resource, effective_msg);
-
-    fflush(fp);
-    // fclose also releases the flock
-    fclose(fp);
-    g_free(effective_msg);
-}
-
-// =========================================================================
-// Backend callbacks: init / close
-// =========================================================================
-
-static gboolean
-_flatfile_init(ProfAccount* account)
-{
-    if (!account || !account->jid) {
-        log_error("flatfile: cannot init without account JID");
-        return FALSE;
-    }
-
-    g_free(g_flatfile_account_jid);
-    g_flatfile_account_jid = g_strdup(account->jid);
-
-    // Ensure base directory exists
-    auto_gchar gchar* data_path = files_get_data_path(DIR_FLATLOG);
-    auto_gchar gchar* my_dir = ff_jid_to_dir(g_flatfile_account_jid);
-    auto_gchar gchar* base_dir = g_strdup_printf("%s/%s", data_path, my_dir);
-
-    if (!ff_ensure_dir(base_dir)) {
-        return FALSE;
-    }
-
-    if (g_contact_states) {
-        g_hash_table_destroy(g_contact_states);
-    }
-    g_contact_states = g_hash_table_new_full(g_str_hash, g_str_equal,
-                                             g_free, (GDestroyNotify)ff_state_free);
-
-    log_info("Initialized flat-file database backend: %s", base_dir);
-    return TRUE;
-}
-
-static void
-_flatfile_close(void)
-{
-    if (g_contact_states) {
-        g_hash_table_destroy(g_contact_states);
-        g_contact_states = NULL;
-    }
-    g_free(g_flatfile_account_jid);
-    g_flatfile_account_jid = NULL;
-    log_debug("flatfile: closed");
-}
-
-// =========================================================================
-// Backend callbacks: add message
-// =========================================================================
-
-// =========================================================================
-// Incoming message validation helpers
-// =========================================================================
-
-// Search log file for a line containing aid:{archive_id}, return TRUE if found.
-static gboolean
-_ff_has_archive_id(const char* log_path, const char* archive_id)
-{
-    if (!log_path || !archive_id || strlen(archive_id) == 0)
-        return FALSE;
-
-    FILE* fp = fopen(log_path, "r");
-    if (!fp)
-        return FALSE;
-
-    auto_gchar gchar* needle = g_strdup_printf("aid:%s", archive_id);
-    gboolean found = FALSE;
-
-    while (!found) {
-        gboolean trunc = FALSE;
-        char* line = ff_readline(fp, &trunc);
-        if (!line)
-            break;
-        if (trunc) {
-            free(line);
-            break;
-        }
-        if (strstr(line, needle)) {
-            found = TRUE;
-        }
-        free(line);
-    }
-
-    fclose(fp);
-    return found;
-}
-
-// Search log file for a line with stanza id matching replace_id, return the
-// from_jid of the original message (caller must g_free). Returns NULL if not found.
-static char*
-_ff_find_original_sender(const char* log_path, const char* replace_id)
-{
-    if (!log_path || !replace_id || strlen(replace_id) == 0)
-        return NULL;
-
-    FILE* fp = fopen(log_path, "r");
-    if (!fp)
-        return NULL;
-
-    auto_gchar gchar* needle = g_strdup_printf("id:%s", replace_id);
-    char* sender = NULL;
-
-    while (!sender) {
-        gboolean trunc = FALSE;
-        char* line = ff_readline(fp, &trunc);
-        if (!line)
-            break;
-        if (trunc) {
-            free(line);
-            break;
-        }
-        if (strstr(line, needle)) {
-            ff_parsed_line_t* pl = ff_parse_line(line);
-            if (pl && pl->stanza_id && g_strcmp0(pl->stanza_id, replace_id) == 0) {
-                sender = g_strdup(pl->from_jid);
-            }
-            if (pl)
-                ff_parsed_line_free(pl);
-        }
-        free(line);
-    }
-
-    fclose(fp);
-    return sender;
-}
-
-static void
-_flatfile_add_incoming(ProfMessage* message)
-{
-    if (!message || !message->from_jid)
-        return;
-
-    const Jid* to_jid = message->to_jid ? message->to_jid : connection_get_jid();
-    const char* type = ff_get_message_type_str(message->type);
-
-    // Determine contact JID for log path (same logic as _ff_add_message)
-    const char* contact = NULL;
-    const Jid* myjid = connection_get_jid();
-    if (myjid && myjid->barejid && g_strcmp0(message->from_jid->barejid, myjid->barejid) == 0) {
-        contact = to_jid->barejid;
-    } else {
-        contact = message->from_jid->barejid;
-    }
-    auto_gchar gchar* log_path = ff_get_log_path(contact);
-
-    // MAM dedup: skip if this stanza-id already exists in the log (XEP-0313 replay)
-    if (message->stanzaid && !message->is_mam && log_path) {
-        if (_ff_has_archive_id(log_path, message->stanzaid)) {
-            log_error("flatfile: duplicate stanza-id '%s' from %s, skipping",
-                      message->stanzaid, message->from_jid->barejid);
-            cons_show_error("Got a message with duplicate (server-generated) stanza-id from %s.",
-                            message->from_jid->fulljid);
-            return;
-        }
-    }
-
-    // LMC sender validation: verify the correction comes from the original sender
-    if (message->replace_id && log_path) {
-        auto_gchar gchar* original_sender = _ff_find_original_sender(log_path, message->replace_id);
-        if (original_sender && g_strcmp0(original_sender, message->from_jid->barejid) != 0) {
-            log_error("flatfile: LMC sender mismatch — corrected msg sender: %s, original: %s, replace-id: %s",
-                      message->from_jid->barejid, original_sender, message->replace_id);
-            cons_show_error("%s sent a message correction with mismatched sender. See log for details.",
-                            message->from_jid->barejid);
-            return;
-        }
-    }
-
-    _ff_add_message(type, message->id, message->stanzaid, message->replace_id,
-                    message->from_jid->barejid, message->from_jid->resourcepart,
-                    to_jid->barejid, message->plain,
-                    message->timestamp, message->enc);
-}
-
-static void
-_flatfile_add_outgoing_chat(const char* const id, const char* const barejid,
-                            const char* const message, const char* const replace_id, prof_enc_t enc)
-{
-    const Jid* myjid = connection_get_jid();
-    _ff_add_message("chat", id, NULL, replace_id,
-                    myjid ? myjid->barejid : "me", myjid ? myjid->resourcepart : NULL,
-                    barejid, message, NULL, enc);
-}
-
-static void
-_flatfile_add_outgoing_muc(const char* const id, const char* const barejid,
-                           const char* const message, const char* const replace_id, prof_enc_t enc)
-{
-    const Jid* myjid = connection_get_jid();
-    _ff_add_message("muc", id, NULL, replace_id,
-                    myjid ? myjid->barejid : "me", myjid ? myjid->resourcepart : NULL,
-                    barejid, message, NULL, enc);
-}
-
-static void
-_flatfile_add_outgoing_muc_pm(const char* const id, const char* const barejid,
-                              const char* const message, const char* const replace_id, prof_enc_t enc)
-{
-    const Jid* myjid = connection_get_jid();
-    _ff_add_message("mucpm", id, NULL, replace_id,
-                    myjid ? myjid->barejid : "me", myjid ? myjid->resourcepart : NULL,
-                    barejid, message, NULL, enc);
-}
-
-// =========================================================================
-// Read logic
-// =========================================================================
-
-// Apply LMC: for messages with corrects:X, find original and replace its text
-static void
-_ff_apply_lmc(GSList* parsed_lines, GSList** result)
-{
-    // Build a hash: stanza_id -> parsed_line for quick lookup
-    GHashTable* id_map = g_hash_table_new(g_str_hash, g_str_equal);
-    for (GSList* l = parsed_lines; l; l = l->next) {
-        ff_parsed_line_t* pl = l->data;
-        if (pl->stanza_id && strlen(pl->stanza_id) > 0) {
-            g_hash_table_insert(id_map, pl->stanza_id, pl);
-        }
-    }
-
-    // Track which lines are corrections (skip them in output, apply to originals)
-    GHashTable* corrections = g_hash_table_new(g_direct_hash, g_direct_equal);
-    // Map: original line ptr -> latest correcting line ptr
-    GHashTable* correction_map = g_hash_table_new(g_direct_hash, g_direct_equal);
-
-    for (GSList* l = parsed_lines; l; l = l->next) {
-        ff_parsed_line_t* pl = l->data;
-        if (pl->replace_id && strlen(pl->replace_id) > 0) {
-            ff_parsed_line_t* original = g_hash_table_lookup(id_map, pl->replace_id);
-            if (original) {
-                // Follow chain to the root original, with cycle/depth guard
-                ff_parsed_line_t* root = original;
-                GHashTable* visited = g_hash_table_new(g_direct_hash, g_direct_equal);
-                g_hash_table_insert(visited, root, root);
-                int depth = 0;
-                while (root->replace_id && strlen(root->replace_id) > 0 && depth < FF_MAX_LMC_DEPTH) {
-                    ff_parsed_line_t* parent = g_hash_table_lookup(id_map, root->replace_id);
-                    if (parent && !g_hash_table_contains(visited, parent)) {
-                        g_hash_table_insert(visited, parent, parent);
-                        root = parent;
-                        depth++;
-                    } else {
-                        break;
-                    }
-                }
-                g_hash_table_destroy(visited);
-                if (depth >= FF_MAX_LMC_DEPTH) {
-                    log_warning("flatfile: LMC correction chain too deep (>%d), ignoring", FF_MAX_LMC_DEPTH);
-                }
-                g_hash_table_insert(correction_map, root, pl);
-                g_hash_table_insert(corrections, pl, pl);
-            }
-        }
-    }
-
-    // Build result: for each non-correction line, output it (with corrected text if applicable)
-    for (GSList* l = parsed_lines; l; l = l->next) {
-        ff_parsed_line_t* pl = l->data;
-        if (g_hash_table_lookup(corrections, pl)) {
-            continue; // skip correction-only lines
-        }
-
-        ff_parsed_line_t* latest_correction = g_hash_table_lookup(correction_map, pl);
-        ProfMessage* msg;
-        if (latest_correction) {
-            // Use corrected text with original's metadata
-            msg = ff_parsed_to_profmessage(pl);
-            g_free(msg->plain);
-            msg->plain = g_strdup(latest_correction->message ? latest_correction->message : "");
-        } else {
-            msg = ff_parsed_to_profmessage(pl);
-        }
-        *result = g_slist_append(*result, msg);
-    }
-
-    g_hash_table_destroy(id_map);
-    g_hash_table_destroy(corrections);
-    g_hash_table_destroy(correction_map);
-}
-
-// =========================================================================
-// Backend callbacks: query history
-// =========================================================================
-
-static db_history_result_t
-_flatfile_get_previous_chat(const gchar* const contact_barejid, const gchar* start_time,
-                            const gchar* end_time, gboolean from_start, gboolean flip,
-                            GSList** result)
-{
-    if (!g_flatfile_account_jid) {
-        log_warning("flatfile: get_previous_chat called but not initialized");
-        return DB_RESPONSE_ERROR;
-    }
-
-    const Jid* myjid = connection_get_jid();
-    if (!myjid || !myjid->barejid) {
-        log_warning("flatfile: no connection JID available");
-        return DB_RESPONSE_ERROR;
-    }
-
-    // Get or create per-contact state with sparse index
-    ff_contact_state_t* state = _ff_get_state(contact_barejid);
-    if (!state)
-        return DB_RESPONSE_ERROR;
-
-    // Ensure index is up-to-date (stat check -> build/extend if file changed)
-    if (!ff_state_ensure_fresh(state))
-        return DB_RESPONSE_EMPTY;
-    if (state->total_lines == 0)
-        return DB_RESPONSE_EMPTY;
-
-    // Reset cursor for filtered (non-Page-Up) queries
-    if (start_time)
-        state->cursor_offset = -1;
-
-    // Determine read byte-range using the sparse index
-    off_t read_from = state->bom_len;
-    off_t read_to = state->stamp.size;
-
-    // Use stored cursor for sequential Page Up (skip bisect)
-    if (!start_time && end_time && state->cursor_offset >= 0) {
-        read_to = state->cursor_offset;
-    } else if (end_time) {
-        // Upper-bound: find first index entry AFTER end_time
-        GDateTime* edt = g_date_time_new_from_iso8601(end_time, NULL);
-        if (edt) {
-            gint64 end_epoch = g_date_time_to_unix(edt);
-            g_date_time_unref(edt);
-            size_t lo = 0, hi = state->n_entries;
-            while (lo < hi) {
-                size_t mid = lo + (hi - lo) / 2;
-                if (state->entries[mid].timestamp_epoch <= end_epoch)
-                    lo = mid + 1;
-                else
-                    hi = mid;
-            }
-            // lo = first entry with timestamp > end_epoch
-            // Use next entry's offset as read_to (+ 1 entry margin)
-            if (lo + 1 < state->n_entries)
-                read_to = state->entries[lo + 1].byte_offset;
-            // else read_to stays at EOF
-        }
-    }
-
-    if (start_time) {
-        read_from = ff_state_offset_for_time(state, start_time);
-    }
-
-    // For "last N messages": back up from read_to using index
-    if (!from_start) {
-        int margin_entries = (MESSAGES_TO_RETRIEVE * 3) / FF_INDEX_STEP + 2;
-
-        // Find index entry closest to (but before) read_to
-        size_t entry_idx = 0;
-        for (size_t i = 0; i < state->n_entries; i++) {
-            if (state->entries[i].byte_offset >= read_to)
-                break;
-            entry_idx = i;
-        }
-
-        size_t start_entry = entry_idx > (size_t)margin_entries
-                                 ? entry_idx - margin_entries
-                                 : 0;
-        off_t backed = state->entries[start_entry].byte_offset;
-        if (backed > read_from)
-            read_from = backed;
-    }
-
-    // Open file and read lines in [read_from, read_to)
-    FILE* fp = fopen(state->filepath, "r");
-    if (!fp)
-        return DB_RESPONSE_EMPTY;
-
-    fseek(fp, read_from, SEEK_SET);
-
-    // Pre-parse time filter boundaries once (avoid per-line allocation)
-    GDateTime* start_dt = start_time ? g_date_time_new_from_iso8601(start_time, NULL) : NULL;
-    GDateTime* end_dt = end_time ? g_date_time_new_from_iso8601(end_time, NULL) : NULL;
-
-    GSList* all_parsed = NULL;
-    while (1) {
-        off_t pos = ftell(fp);
-        if (pos < 0 || pos >= read_to)
-            break;
-
-        gboolean truncated = FALSE;
-        char* buf = ff_readline(fp, &truncated);
-        if (!buf)
-            break;
-        if (truncated) {
-            free(buf);
-            break;
-        }
-
-        ff_parsed_line_t* pl = ff_parse_line(buf);
-        free(buf);
-        if (!pl)
-            continue;
-
-        pl->file_offset = pos;
-
-        // Time filters
-        if (start_dt && g_date_time_compare(pl->timestamp, start_dt) <= 0) {
-            ff_parsed_line_free(pl);
-            continue;
-        }
-        if (end_dt && g_date_time_compare(pl->timestamp, end_dt) >= 0) {
-            ff_parsed_line_free(pl);
-            continue;
-        }
-
-        // JID filter
-        gboolean matches = FALSE;
-        if (myjid->barejid && contact_barejid) {
-            if ((g_strcmp0(pl->from_jid, contact_barejid) == 0)
-                || (g_strcmp0(pl->from_jid, myjid->barejid) == 0)) {
-                matches = TRUE;
-            }
-        } else {
-            matches = TRUE;
-        }
-        if (!matches) {
-            ff_parsed_line_free(pl);
-            continue;
-        }
-
-        all_parsed = g_slist_append(all_parsed, pl);
-    }
-    fclose(fp);
-
-    if (start_dt)
-        g_date_time_unref(start_dt);
-    if (end_dt)
-        g_date_time_unref(end_dt);
-
-    if (!all_parsed)
-        return DB_RESPONSE_EMPTY;
-
-    // Update cursor: byte offset of oldest parsed message in this batch
-    ff_parsed_line_t* oldest = all_parsed->data;
-    state->cursor_offset = oldest->file_offset;
-
-    // Apply LMC corrections and build ProfMessage list
-    GSList* pre_result = NULL;
-    _ff_apply_lmc(all_parsed, &pre_result);
-    g_slist_free_full(all_parsed, (GDestroyNotify)ff_parsed_line_free);
-
-    if (!pre_result)
-        return DB_RESPONSE_EMPTY;
-
-    // Paginate: keep first or last MESSAGES_TO_RETRIEVE
-    guint total = g_slist_length(pre_result);
-    if (total > MESSAGES_TO_RETRIEVE) {
-        if (from_start) {
-            GSList* nth = g_slist_nth(pre_result, MESSAGES_TO_RETRIEVE);
-            if (nth) {
-                GSList* prev = g_slist_nth(pre_result, MESSAGES_TO_RETRIEVE - 1);
-                if (prev)
-                    prev->next = NULL;
-                g_slist_free_full(nth, (GDestroyNotify)message_free);
-            }
-        } else {
-            guint skip = total - MESSAGES_TO_RETRIEVE;
-            GSList* keep_start = g_slist_nth(pre_result, skip);
-            GSList* prev = g_slist_nth(pre_result, skip - 1);
-            if (prev)
-                prev->next = NULL;
-            g_slist_free_full(pre_result, (GDestroyNotify)message_free);
-            pre_result = keep_start;
-        }
-    }
-
-    if (flip) {
-        pre_result = g_slist_reverse(pre_result);
-    }
-
-    *result = pre_result;
-    return g_slist_length(*result) != 0 ? DB_RESPONSE_SUCCESS : DB_RESPONSE_EMPTY;
-}
-
-static ProfMessage*
-_flatfile_get_limits_info(const gchar* const contact_barejid, gboolean is_last)
-{
-    ProfMessage* msg = message_init();
-
-    if (!g_flatfile_account_jid || !contact_barejid) {
-        if (is_last)
-            msg->timestamp = g_date_time_new_now_utc();
-        return msg;
-    }
-
-    ff_contact_state_t* state = _ff_get_state(contact_barejid);
-    if (!state) {
-        if (is_last)
-            msg->timestamp = g_date_time_new_now_utc();
-        return msg;
-    }
-
-    if (!ff_state_ensure_fresh(state) || state->total_lines == 0) {
-        if (is_last)
-            msg->timestamp = g_date_time_new_now_utc();
-        return msg;
-    }
-
-    FILE* fp = fopen(state->filepath, "r");
-    if (!fp) {
-        if (is_last)
-            msg->timestamp = g_date_time_new_now_utc();
-        return msg;
-    }
-
-    ff_parsed_line_t* found = NULL;
-
-    if (!is_last) {
-        // First message: start from beginning (skip BOM)
-        fseek(fp, state->bom_len, SEEK_SET);
-        char* buf;
-        while ((buf = ff_readline(fp, NULL)) != NULL) {
-            found = ff_parse_line(buf);
-            free(buf);
-            if (found)
-                break;
-        }
-    } else {
-        // Last message: seek near end using index for efficiency
-        off_t seek_pos = 0;
-        if (state->n_entries > 0)
-            seek_pos = state->entries[state->n_entries - 1].byte_offset;
-        fseek(fp, seek_pos, SEEK_SET);
-
-        char* buf;
-        while ((buf = ff_readline(fp, NULL)) != NULL) {
-            ff_parsed_line_t* pl = ff_parse_line(buf);
-            free(buf);
-            if (pl) {
-                if (found)
-                    ff_parsed_line_free(found);
-                found = pl;
-            }
-        }
-    }
-    fclose(fp);
-
-    if (found) {
-        msg->stanzaid = found->archive_id ? g_strdup(found->archive_id) : NULL;
-        msg->timestamp = g_date_time_ref(found->timestamp);
-        ff_parsed_line_free(found);
-    } else if (is_last) {
-        msg->timestamp = g_date_time_new_now_utc();
-    }
-
-    return msg;
-}
-
-// =========================================================================
-// Backend vtable
-// =========================================================================
-
-static db_backend_t flatfile_backend = {
-    .name = "flatfile",
-    .init = _flatfile_init,
-    .close = _flatfile_close,
-    .add_incoming = _flatfile_add_incoming,
-    .add_outgoing_chat = _flatfile_add_outgoing_chat,
-    .add_outgoing_muc = _flatfile_add_outgoing_muc,
-    .add_outgoing_muc_pm = _flatfile_add_outgoing_muc_pm,
-    .get_previous_chat = _flatfile_get_previous_chat,
-    .get_limits_info = _flatfile_get_limits_info,
-    .verify_integrity = ff_verify_integrity,
-};
-
-db_backend_t*
-db_backend_flatfile(void)
-{
-    return &flatfile_backend;
-}

src/database_flatfile.h

@@ -1,147 +0,0 @@
-/*
- * database_flatfile.h
- * vim: expandtab:ts=4:sts=4:sw=4
- *
- * Copyright (C) 2026 Profanity Contributors
- *
- * This file is part of Profanity.
- *
- * Profanity is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Profanity is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
- *
- * Internal header shared between database_flatfile*.c modules.
- * Not part of the public API — do not include from outside the flatfile backend.
- */
-
-#ifndef DATABASE_FLATFILE_H
-#define DATABASE_FLATFILE_H
-
-#include <glib.h>
-#include <stdio.h>
-#include <sys/types.h>
-
-#include "database.h"
-#include "xmpp/xmpp.h"
-#include "xmpp/message.h"
-
-// --- Constants ---
-
-#define DIR_FLATLOG      "flatlog"
-#define FLATFILE_HEADER  "# profanity chat log — UTF-8, LF line endings\n# vim: set fileencoding=utf-8 fileformat=unix :\n"
-#define FF_MAX_LINE_LEN  (10 * 1024 * 1024) /* 10 MB — reject lines longer than this */
-#define FF_MAX_LMC_DEPTH 100                /* max correction chain depth */
-
-// --- Shared global ---
-
-// Account JID stored during init for path construction.
-// Defined in database_flatfile.c, used by all flatfile modules.
-extern char* g_flatfile_account_jid;
-
-// --- Parsed line structure ---
-
-typedef struct
-{
-    char* timestamp_str;
-    GDateTime* timestamp;
-    char* type;
-    char* enc;
-    char* stanza_id;
-    char* archive_id;
-    char* replace_id;
-    char* from_jid;
-    char* from_resource;
-    char* message;
-    off_t file_offset;
-} ff_parsed_line_t;
-
-// --- Sparse index for single-file lookup ---
-
-#define FF_INDEX_STEP 500
-
-typedef struct
-{
-    off_t byte_offset;
-    gint64 timestamp_epoch;
-} ff_index_entry_t;
-
-typedef struct
-{
-    time_t mtime;
-    off_t size;
-    ino_t inode;
-} ff_file_stamp_t;
-
-typedef struct
-{
-    char* filepath;
-    ff_index_entry_t* entries;
-    size_t n_entries;
-    size_t cap_entries;
-    size_t total_lines;
-    ff_file_stamp_t stamp;
-    off_t cursor_offset;
-    int bom_len;
-} ff_contact_state_t;
-
-// State management
-ff_contact_state_t* ff_state_new(const char* filepath);
-void ff_state_free(ff_contact_state_t* state);
-gboolean ff_state_ensure_fresh(ff_contact_state_t* state);
-off_t ff_state_offset_for_time(ff_contact_state_t* state, const char* iso_time);
-
-// --- Type conversion helpers ---
-
-const char* ff_get_message_type_str(prof_msg_type_t type);
-prof_msg_type_t ff_get_message_type_type(const char* const type);
-const char* ff_get_message_enc_str(prof_enc_t enc);
-prof_enc_t ff_get_message_enc_type(const char* const encstr);
-
-// --- Path helpers ---
-
-char* ff_jid_to_dir(const char* jid);
-char* ff_get_contact_dir(const char* contact_barejid);
-char* ff_get_log_path(const char* contact_barejid);
-gboolean ff_ensure_dir(const char* path);
-
-// --- Escape / unescape ---
-
-char* ff_escape_message(const char* text);
-char* ff_unescape_message(const char* text);
-char* ff_escape_meta_value(const char* val);
-char* ff_unescape_meta_value(const char* val);
-
-// --- I/O ---
-
-char* ff_readline(FILE* fp, gboolean* truncated);
-void ff_write_line(FILE* fp, const char* timestamp, const char* type, const char* enc,
-                   const char* stanza_id, const char* archive_id, const char* replace_id,
-                   const char* from_jid, const char* from_resource, const char* message_text);
-
-// --- Parser helpers ---
-
-const char* ff_find_unescaped_char(const char* str, char ch);
-char** ff_split_meta(const char* meta);
-const char* ff_find_unescaped_colonspace(const char* str);
-char* ff_unescape_sender_resource(const char* res);
-
-// --- Parser ---
-
-void ff_parsed_line_free(ff_parsed_line_t* pl);
-ff_parsed_line_t* ff_parse_line(const char* line);
-ProfMessage* ff_parsed_to_profmessage(ff_parsed_line_t* pl);
-
-// --- Integrity verification (database_flatfile_verify.c) ---
-
-GSList* ff_verify_integrity(const gchar* const contact_barejid);
-
-#endif

src/database_flatfile_parser.c

@@ -1,755 +0,0 @@
-/*
- * database_flatfile_parser.c
- * vim: expandtab:ts=4:sts=4:sw=4
- *
- * Copyright (C) 2026 Profanity Contributors
- *
- * This file is part of Profanity.
- *
- * Profanity is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Profanity is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
- *
- * Flat-file backend: type helpers, path helpers, escape/unescape,
- * line I/O, and the tolerant log-line parser.
- */
-
-#include "config.h"
-
-#include <sys/stat.h>
-#include <glib.h>
-#include <glib/gstdio.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-#include "log.h"
-#include "common.h"
-#include "config/files.h"
-#include "database_flatfile.h"
-
-// =========================================================================
-// Type conversion helpers
-// =========================================================================
-
-const char*
-ff_get_message_type_str(prof_msg_type_t type)
-{
-    switch (type) {
-    case PROF_MSG_TYPE_CHAT:
-        return "chat";
-    case PROF_MSG_TYPE_MUC:
-        return "muc";
-    case PROF_MSG_TYPE_MUCPM:
-        return "mucpm";
-    case PROF_MSG_TYPE_UNINITIALIZED:
-        return "chat";
-    }
-    return "chat";
-}
-
-prof_msg_type_t
-ff_get_message_type_type(const char* const type)
-{
-    if (g_strcmp0(type, "chat") == 0) {
-        return PROF_MSG_TYPE_CHAT;
-    } else if (g_strcmp0(type, "muc") == 0) {
-        return PROF_MSG_TYPE_MUC;
-    } else if (g_strcmp0(type, "mucpm") == 0) {
-        return PROF_MSG_TYPE_MUCPM;
-    }
-    return PROF_MSG_TYPE_CHAT;
-}
-
-const char*
-ff_get_message_enc_str(prof_enc_t enc)
-{
-    switch (enc) {
-    case PROF_MSG_ENC_OX:
-        return "ox";
-    case PROF_MSG_ENC_PGP:
-        return "pgp";
-    case PROF_MSG_ENC_OTR:
-        return "otr";
-    case PROF_MSG_ENC_OMEMO:
-        return "omemo";
-    case PROF_MSG_ENC_NONE:
-        return "none";
-    }
-    return "none";
-}
-
-prof_enc_t
-ff_get_message_enc_type(const char* const encstr)
-{
-    if (g_strcmp0(encstr, "ox") == 0) {
-        return PROF_MSG_ENC_OX;
-    } else if (g_strcmp0(encstr, "pgp") == 0) {
-        return PROF_MSG_ENC_PGP;
-    } else if (g_strcmp0(encstr, "otr") == 0) {
-        return PROF_MSG_ENC_OTR;
-    } else if (g_strcmp0(encstr, "omemo") == 0) {
-        return PROF_MSG_ENC_OMEMO;
-    }
-    return PROF_MSG_ENC_NONE;
-}
-
-// =========================================================================
-// Path helpers
-// =========================================================================
-
-// Sanitise a JID for use as a directory name.
-// 1. Replace '@' with '_at_'
-// 2. Reject / strip path-separator and traversal characters: '/', '\0', '..'
-// This prevents a malicious federated JID like "../../../tmp/pwned" from
-// escaping the log directory tree.
-char*
-ff_jid_to_dir(const char* jid)
-{
-    if (!jid || jid[0] == '\0')
-        return NULL;
-
-    // Replace '@' first
-    char* step1 = str_replace(jid, "@", "_at_");
-    if (!step1)
-        return NULL;
-
-    // Replace '/' and '\\' with '_' to prevent path traversal
-    GString* out = g_string_sized_new(strlen(step1));
-    for (const char* p = step1; *p; p++) {
-        if (*p == '/' || *p == '\\') {
-            g_string_append_c(out, '_');
-        } else {
-            g_string_append_c(out, *p);
-        }
-    }
-    free(step1);
-
-    // Collapse any remaining ".." sequences to "__" (belt-and-suspenders)
-    char* result = g_string_free(out, FALSE);
-    char* dotdot;
-    while ((dotdot = strstr(result, "..")) != NULL) {
-        dotdot[0] = '_';
-        dotdot[1] = '_';
-    }
-
-    // Reject empty result
-    if (result[0] == '\0') {
-        g_free(result);
-        return NULL;
-    }
-    return result;
-}
-
-// Get the base directory for a contact's logs:
-// ~/.local/share/profanity/flatlog/{my_jid_dir}/{contact_jid_dir}/
-char*
-ff_get_contact_dir(const char* contact_barejid)
-{
-    if (!g_flatfile_account_jid || !contact_barejid)
-        return NULL;
-
-    auto_gchar gchar* data_path = files_get_data_path(DIR_FLATLOG);
-    auto_gchar gchar* my_dir = ff_jid_to_dir(g_flatfile_account_jid);
-    auto_gchar gchar* contact_dir = ff_jid_to_dir(contact_barejid);
-
-    char* result = g_strdup_printf("%s/%s/%s", data_path, my_dir, contact_dir);
-    return result;
-}
-
-// Get the single log file path for a contact: {contact_dir}/history.log
-char*
-ff_get_log_path(const char* contact_barejid)
-{
-    auto_gchar gchar* contact_dir = ff_get_contact_dir(contact_barejid);
-    if (!contact_dir)
-        return NULL;
-
-    char* result = g_strdup_printf("%s/history.log", contact_dir);
-    return result;
-}
-
-// Ensure the directory exists, create if needed.
-// Refuses to follow symlinks at the final component.
-gboolean
-ff_ensure_dir(const char* path)
-{
-    if (g_file_test(path, G_FILE_TEST_IS_DIR)) {
-        // Verify it's not a symlink
-        struct stat st;
-        if (g_lstat(path, &st) == 0 && S_ISLNK(st.st_mode)) {
-            log_error("flatfile: directory path is a symlink, refusing: %s", path);
-            return FALSE;
-        }
-        return TRUE;
-    }
-    if (g_mkdir_with_parents(path, S_IRWXU) != 0) {
-        log_error("flatfile: Could not create directory: %s (errno=%d)", path, errno);
-        return FALSE;
-    }
-    return TRUE;
-}
-
-// =========================================================================
-// Escape / unescape helpers
-// =========================================================================
-//
-// Message text and metadata values from remote peers can contain arbitrary
-// characters including newlines, pipes and brackets. Without escaping, a
-// crafted message could inject fake log lines (log injection / format
-// injection). We escape on write and unescape on read.
-
-// Escape message body: \ -> \\, \n -> \n literal, \r -> \r literal
-char*
-ff_escape_message(const char* text)
-{
-    if (!text)
-        return g_strdup("");
-    GString* out = g_string_sized_new(strlen(text));
-    for (const char* p = text; *p; p++) {
-        switch (*p) {
-        case '\\':
-            g_string_append(out, "\\\\");
-            break;
-        case '\n':
-            g_string_append(out, "\\n");
-            break;
-        case '\r':
-            g_string_append(out, "\\r");
-            break;
-        default:
-            g_string_append_c(out, *p);
-            break;
-        }
-    }
-    return g_string_free(out, FALSE);
-}
-
-// Unescape message body: \\  -> \, \n -> newline, \r -> CR
-char*
-ff_unescape_message(const char* text)
-{
-    if (!text)
-        return g_strdup("");
-    GString* out = g_string_sized_new(strlen(text));
-    for (const char* p = text; *p; p++) {
-        if (*p == '\\' && *(p + 1)) {
-            p++;
-            switch (*p) {
-            case '\\':
-                g_string_append_c(out, '\\');
-                break;
-            case 'n':
-                g_string_append_c(out, '\n');
-                break;
-            case 'r':
-                g_string_append_c(out, '\r');
-                break;
-            default:
-                g_string_append_c(out, '\\');
-                g_string_append_c(out, *p);
-                break;
-            }
-        } else {
-            g_string_append_c(out, *p);
-        }
-    }
-    return g_string_free(out, FALSE);
-}
-
-// Escape metadata value (stanza_id, archive_id, replace_id):
-// these come from remote servers and may contain |, ], \, newlines.
-char*
-ff_escape_meta_value(const char* val)
-{
-    if (!val || strlen(val) == 0)
-        return NULL;
-    GString* out = g_string_sized_new(strlen(val));
-    for (const char* p = val; *p; p++) {
-        switch (*p) {
-        case '|':
-            g_string_append(out, "\\|");
-            break;
-        case ']':
-            g_string_append(out, "\\]");
-            break;
-        case '\\':
-            g_string_append(out, "\\\\");
-            break;
-        case '\n':
-            g_string_append(out, "\\n");
-            break;
-        case '\r':
-            g_string_append(out, "\\r");
-            break;
-        default:
-            g_string_append_c(out, *p);
-            break;
-        }
-    }
-    return g_string_free(out, FALSE);
-}
-
-// Unescape metadata value
-char*
-ff_unescape_meta_value(const char* val)
-{
-    if (!val)
-        return NULL;
-    GString* out = g_string_sized_new(strlen(val));
-    for (const char* p = val; *p; p++) {
-        if (*p == '\\' && *(p + 1)) {
-            p++;
-            switch (*p) {
-            case '|':
-                g_string_append_c(out, '|');
-                break;
-            case ']':
-                g_string_append_c(out, ']');
-                break;
-            case '\\':
-                g_string_append_c(out, '\\');
-                break;
-            case 'n':
-                g_string_append_c(out, '\n');
-                break;
-            case 'r':
-                g_string_append_c(out, '\r');
-                break;
-            default:
-                g_string_append_c(out, '\\');
-                g_string_append_c(out, *p);
-                break;
-            }
-        } else {
-            g_string_append_c(out, *p);
-        }
-    }
-    return g_string_free(out, FALSE);
-}
-
-// =========================================================================
-// Readline helper
-// =========================================================================
-//
-// POSIX getline() for dynamic-length lines. Returns line without trailing
-// newline, or NULL on EOF. Sets *truncated=TRUE if the line had no trailing
-// newline at EOF (partial write detection).
-char*
-ff_readline(FILE* fp, gboolean* truncated)
-{
-    char* line = NULL;
-    size_t cap = 0;
-    ssize_t nread = getline(&line, &cap, fp);
-    if (nread == -1) {
-        free(line);
-        return NULL;
-    }
-    // Guard against pathological lines that could exhaust memory.
-    // getline() already allocated, so we free and skip if too long.
-    if (nread > FF_MAX_LINE_LEN) {
-        log_error("flatfile: line too long (%zd bytes), skipping", nread);
-        // Check newline termination before freeing
-        gboolean had_newline = (nread > 0 && line[nread - 1] == '\n');
-        free(line);
-        // Skip to next newline if the overlength line wasn't newline-terminated
-        if (!had_newline) {
-            int ch;
-            while ((ch = fgetc(fp)) != EOF && ch != '\n') {}
-        }
-        if (truncated)
-            *truncated = FALSE;
-        // Return empty string so caller's loop continues (parse will reject it).
-        // Use malloc() so callers can always use free() consistently.
-        char* empty = malloc(1);
-        if (empty)
-            empty[0] = '\0';
-        return empty;
-    }
-    if (truncated)
-        *truncated = FALSE;
-    if (nread > 0 && line[nread - 1] == '\n') {
-        line[--nread] = '\0';
-    } else if (feof(fp)) {
-        // Line without trailing newline at EOF — likely a partial write
-        if (truncated)
-            *truncated = TRUE;
-    }
-    return line;
-}
-
-// =========================================================================
-// Line writer
-// =========================================================================
-//
-// Format: {ISO8601} [{type}|{enc}|id:{stanza_id}|aid:{archive_id}|corrects:{replace_id}] {from_jid}/{resource}: {message}
-//
-// Message text is escaped: \\ -> \\\\, newline -> \\n, CR -> \\r
-// Metadata values are escaped: |, ], \\, newline, CR
-// Lines starting with '#' are comments.
-// Empty lines are skipped.
-
-void
-ff_write_line(FILE* fp, const char* timestamp, const char* type, const char* enc,
-              const char* stanza_id, const char* archive_id, const char* replace_id,
-              const char* from_jid, const char* from_resource, const char* message_text)
-{
-    // Escape metadata values from remote peers
-    auto_gchar gchar* safe_sid = ff_escape_meta_value(stanza_id);
-    auto_gchar gchar* safe_aid = ff_escape_meta_value(archive_id);
-    auto_gchar gchar* safe_rid = ff_escape_meta_value(replace_id);
-
-    // Build metadata section: [type|enc|id:...|aid:...|corrects:...]
-    GString* meta = g_string_new("[");
-    g_string_append(meta, type ? type : "chat");
-    g_string_append_c(meta, '|');
-    g_string_append(meta, enc ? enc : "none");
-    if (safe_sid) {
-        g_string_append_printf(meta, "|id:%s", safe_sid);
-    }
-    if (safe_aid) {
-        g_string_append_printf(meta, "|aid:%s", safe_aid);
-    }
-    if (safe_rid) {
-        g_string_append_printf(meta, "|corrects:%s", safe_rid);
-    }
-    g_string_append_c(meta, ']');
-
-    // Build sender — escape ": " in the resource part to prevent
-    // the parser from splitting at the wrong point.
-    GString* sender = g_string_new(from_jid ? from_jid : "unknown");
-    if (from_resource && strlen(from_resource) > 0) {
-        // Escape backslash and colon-space in resource
-        GString* safe_res = g_string_sized_new(strlen(from_resource));
-        for (const char* p = from_resource; *p; p++) {
-            if (*p == '\\') {
-                g_string_append(safe_res, "\\\\");
-            } else if (*p == ':' && *(p + 1) == ' ') {
-                g_string_append(safe_res, "\\: ");
-                p++; // skip the space too
-            } else {
-                g_string_append_c(safe_res, *p);
-            }
-        }
-        g_string_append_printf(sender, "/%s", safe_res->str);
-        g_string_free(safe_res, TRUE);
-    }
-
-    // Escape message body to prevent log injection
-    char* safe_msg = ff_escape_message(message_text);
-
-    // Build complete line and write with a single fwrite()
-    GString* full_line = g_string_new(NULL);
-    g_string_printf(full_line, "%s %s %s: %s\n",
-                    timestamp, meta->str, sender->str, safe_msg);
-
-    size_t to_write = full_line->len;
-    size_t written = fwrite(full_line->str, 1, to_write, fp);
-    if (written != to_write) {
-        log_error("flatfile: partial write (%zu/%zu)", written, to_write);
-    }
-
-    g_string_free(full_line, TRUE);
-    g_free(safe_msg);
-    g_string_free(meta, TRUE);
-    g_string_free(sender, TRUE);
-}
-
-// =========================================================================
-// Parser helpers
-// =========================================================================
-
-// Find the first occurrence of 'ch' that is not preceded by an unescaped backslash.
-const char*
-ff_find_unescaped_char(const char* str, char ch)
-{
-    if (!str)
-        return NULL;
-    for (const char* p = str; *p; p++) {
-        if (*p == '\\' && *(p + 1)) {
-            p++; // skip escaped character
-            continue;
-        }
-        if (*p == ch)
-            return p;
-    }
-    return NULL;
-}
-
-// Split metadata content on unescaped '|'. Returns a NULL-terminated array.
-// Caller must g_strfreev() the result.
-char**
-ff_split_meta(const char* meta)
-{
-    GPtrArray* arr = g_ptr_array_new();
-    const char* start = meta;
-    for (const char* p = meta;; p++) {
-        if (*p == '\\' && *(p + 1)) {
-            p++; // skip escaped char
-            continue;
-        }
-        if (*p == '|' || *p == '\0') {
-            g_ptr_array_add(arr, g_strndup(start, p - start));
-            if (*p == '\0')
-                break;
-            start = p + 1;
-        }
-    }
-    g_ptr_array_add(arr, NULL);
-    return (char**)g_ptr_array_free(arr, FALSE);
-}
-
-// Find first unescaped ": " (colon-space) in a string.
-const char*
-ff_find_unescaped_colonspace(const char* str)
-{
-    if (!str)
-        return NULL;
-    for (const char* p = str; *p; p++) {
-        if (*p == '\\' && *(p + 1)) {
-            p++; // skip escaped character
-            continue;
-        }
-        if (*p == ':' && *(p + 1) == ' ') {
-            return p;
-        }
-    }
-    return NULL;
-}
-
-// Unescape a sender resource: "\\" -> '\', "\: " -> ": "
-char*
-ff_unescape_sender_resource(const char* res)
-{
-    if (!res)
-        return NULL;
-    GString* out = g_string_sized_new(strlen(res));
-    for (const char* p = res; *p; p++) {
-        if (*p == '\\' && *(p + 1)) {
-            p++;
-            if (*p == '\\') {
-                g_string_append_c(out, '\\');
-            } else if (*p == ':' && *(p + 1) == ' ') {
-                g_string_append(out, ": ");
-                p++; // skip the space
-            } else {
-                // Unknown escape — preserve literally
-                g_string_append_c(out, '\\');
-                g_string_append_c(out, *p);
-            }
-        } else {
-            g_string_append_c(out, *p);
-        }
-    }
-    return g_string_free(out, FALSE);
-}
-
-// =========================================================================
-// Line parser
-// =========================================================================
-
-void
-ff_parsed_line_free(ff_parsed_line_t* pl)
-{
-    if (!pl)
-        return;
-    g_free(pl->timestamp_str);
-    if (pl->timestamp)
-        g_date_time_unref(pl->timestamp);
-    g_free(pl->type);
-    g_free(pl->enc);
-    g_free(pl->stanza_id);
-    g_free(pl->archive_id);
-    g_free(pl->replace_id);
-    g_free(pl->from_jid);
-    g_free(pl->from_resource);
-    g_free(pl->message);
-    g_free(pl);
-}
-
-// Parse a single line. Returns NULL on parse failure.
-// Line format: {timestamp} [{metadata}] {sender}: {message}
-ff_parsed_line_t*
-ff_parse_line(const char* line)
-{
-    if (!line || line[0] == '\0' || line[0] == '#') {
-        return NULL;
-    }
-
-    // Strip trailing \r if present (CRLF handling)
-    char* work = g_strdup(line);
-    gsize len = strlen(work);
-    if (len > 0 && work[len - 1] == '\r') {
-        work[len - 1] = '\0';
-        len--;
-    }
-    if (len == 0) {
-        g_free(work);
-        return NULL;
-    }
-
-    // UTF-8 validation
-    const gchar* end;
-    if (!g_utf8_validate(work, -1, &end)) {
-        log_warning("flatfile: invalid UTF-8 at byte offset %ld", (long)(end - work));
-        // Attempt Latin-1 fallback
-        gsize br, bw;
-        GError* err = NULL;
-        char* converted = g_convert(work, -1, "UTF-8", "ISO-8859-1", &br, &bw, &err);
-        if (converted) {
-            g_free(work);
-            work = converted;
-        } else {
-            if (err)
-                g_error_free(err);
-            g_free(work);
-            return NULL;
-        }
-    }
-
-    ff_parsed_line_t* result = g_malloc0(sizeof(ff_parsed_line_t));
-    result->file_offset = -1;
-
-    // Parse timestamp — everything up to first space followed by '['
-    char* bracket_start = strchr(work, '[');
-    char* first_space = strchr(work, ' ');
-
-    if (bracket_start && first_space && first_space < bracket_start) {
-        // Standard format with metadata: {timestamp} [{meta}] {sender}: {msg}
-        result->timestamp_str = g_strndup(work, first_space - work);
-
-        // Parse metadata section [...]
-        const char* bracket_end = ff_find_unescaped_char(bracket_start + 1, ']');
-        if (bracket_end) {
-            char* meta_content = g_strndup(bracket_start + 1, bracket_end - bracket_start - 1);
-
-            // Split by unescaped '|'
-            char** parts = ff_split_meta(meta_content);
-            if (parts) {
-                int i = 0;
-                for (; parts[i]; i++) {
-                    if (i == 0) {
-                        result->type = g_strdup(parts[i]);
-                    } else if (i == 1) {
-                        result->enc = g_strdup(parts[i]);
-                    } else if (g_str_has_prefix(parts[i], "id:")) {
-                        result->stanza_id = ff_unescape_meta_value(parts[i] + 3);
-                    } else if (g_str_has_prefix(parts[i], "aid:")) {
-                        result->archive_id = ff_unescape_meta_value(parts[i] + 4);
-                    } else if (g_str_has_prefix(parts[i], "corrects:")) {
-                        result->replace_id = ff_unescape_meta_value(parts[i] + 9);
-                    }
-                }
-                g_strfreev(parts);
-            }
-            g_free(meta_content);
-
-            // Parse sender: message after '] '
-            const char* after_meta = bracket_end + 1;
-            if (*after_meta == ' ')
-                after_meta++;
-
-            // Find first *unescaped* ': ' which separates sender from message.
-            const char* colon = ff_find_unescaped_colonspace(after_meta);
-            if (colon) {
-                char* raw_sender = g_strndup(after_meta, colon - after_meta);
-
-                // Split sender into jid/resource, then unescape resource
-                char* slash = strchr(raw_sender, '/');
-                if (slash) {
-                    result->from_jid = g_strndup(raw_sender, slash - raw_sender);
-                    result->from_resource = ff_unescape_sender_resource(slash + 1);
-                } else {
-                    result->from_jid = g_strdup(raw_sender);
-                }
-                g_free(raw_sender);
-
-                result->message = ff_unescape_message(colon + 2);
-            } else {
-                // No ': ' found, treat entire rest as message with unknown sender
-                result->from_jid = g_strdup("unknown");
-                result->message = ff_unescape_message(after_meta);
-            }
-        } else {
-            // No closing bracket — malformed metadata
-            ff_parsed_line_free(result);
-            g_free(work);
-            return NULL;
-        }
-    } else if (first_space) {
-        // Legacy/simple format without metadata: {timestamp} - {sender}: {msg}
-        result->timestamp_str = g_strndup(work, first_space - work);
-        result->type = g_strdup("chat");
-        result->enc = g_strdup("none");
-
-        char* rest = first_space + 1;
-        // Skip " - " if present (chatlog.c format)
-        if (g_str_has_prefix(rest, "- ")) {
-            rest += 2;
-        }
-
-        char* colon = strstr(rest, ": ");
-        if (colon) {
-            char* sender = g_strndup(rest, colon - rest);
-            char* slash = strchr(sender, '/');
-            if (slash) {
-                result->from_jid = g_strndup(sender, slash - sender);
-                result->from_resource = g_strdup(slash + 1);
-            } else {
-                result->from_jid = g_strdup(sender);
-            }
-            g_free(sender);
-            result->message = ff_unescape_message(colon + 2);
-        } else {
-            result->from_jid = g_strdup("unknown");
-            result->message = ff_unescape_message(rest);
-        }
-    } else {
-        // No space at all — can't parse
-        ff_parsed_line_free(result);
-        g_free(work);
-        return NULL;
-    }
-
-    // Parse timestamp
-    result->timestamp = g_date_time_new_from_iso8601(result->timestamp_str, NULL);
-    if (!result->timestamp) {
-        log_warning("flatfile: unparsable timestamp: %s", result->timestamp_str);
-        ff_parsed_line_free(result);
-        g_free(work);
-        return NULL;
-    }
-
-    // Default type/enc if missing
-    if (!result->type)
-        result->type = g_strdup("chat");
-    if (!result->enc)
-        result->enc = g_strdup("none");
-
-    g_free(work);
-    return result;
-}
-
-// Convert parsed line to ProfMessage
-ProfMessage*
-ff_parsed_to_profmessage(ff_parsed_line_t* pl)
-{
-    ProfMessage* msg = message_init();
-    msg->id = pl->stanza_id ? g_strdup(pl->stanza_id) : NULL;
-    msg->from_jid = jid_create_from_bare_and_resource(pl->from_jid, pl->from_resource);
-    msg->plain = g_strdup(pl->message ? pl->message : "");
-    msg->timestamp = g_date_time_ref(pl->timestamp);
-    msg->type = ff_get_message_type_type(pl->type);
-    msg->enc = ff_get_message_enc_type(pl->enc);
-    return msg;
-}

src/database_flatfile_verify.c

@@ -1,309 +0,0 @@
-/*
- * database_flatfile_verify.c
- * vim: expandtab:ts=4:sts=4:sw=4
- *
- * Copyright (C) 2026 Profanity Contributors
- *
- * This file is part of Profanity.
- *
- * Profanity is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Profanity is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
- *
- * Flat-file backend: integrity verification (/history verify).
- * Checks: parsability, timestamp ordering, duplicate IDs, broken LMC
- * references, file permissions, BOM, CRLF, UTF-8, control chars.
- */
-
-#include "config.h"
-
-#include <sys/stat.h>
-#include <glib.h>
-#include <glib/gstdio.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "log.h"
-#include "config/files.h"
-#include "database_flatfile.h"
-
-GSList*
-ff_verify_integrity(const gchar* const contact_barejid)
-{
-    GSList* issues = NULL;
-
-    if (!g_flatfile_account_jid) {
-        integrity_issue_t* issue = g_malloc0(sizeof(integrity_issue_t));
-        issue->level = INTEGRITY_ERROR;
-        issue->file = g_strdup("N/A");
-        issue->line = 0;
-        issue->message = g_strdup("Flat-file backend not initialized");
-        issues = g_slist_append(issues, issue);
-        return issues;
-    }
-
-    // If contact specified, verify just that contact; otherwise discover all contacts
-    GSList* contact_dirs = NULL;
-
-    if (contact_barejid) {
-        auto_gchar gchar* cdir = ff_get_contact_dir(contact_barejid);
-        if (cdir && g_file_test(cdir, G_FILE_TEST_IS_DIR)) {
-            contact_dirs = g_slist_append(contact_dirs, g_strdup(cdir));
-        } else {
-            integrity_issue_t* issue = g_malloc0(sizeof(integrity_issue_t));
-            issue->level = INTEGRITY_INFO;
-            issue->file = g_strdup(contact_barejid);
-            issue->line = 0;
-            issue->message = g_strdup("No log files found for this contact");
-            issues = g_slist_append(issues, issue);
-            return issues;
-        }
-    } else {
-        // Discover all contact directories
-        auto_gchar gchar* data_path = files_get_data_path(DIR_FLATLOG);
-        auto_gchar gchar* my_dir = ff_jid_to_dir(g_flatfile_account_jid);
-        auto_gchar gchar* base_dir = g_strdup_printf("%s/%s", data_path, my_dir);
-
-        GDir* dir = g_dir_open(base_dir, 0, NULL);
-        if (dir) {
-            const gchar* dname;
-            while ((dname = g_dir_read_name(dir)) != NULL) {
-                char* full = g_strdup_printf("%s/%s", base_dir, dname);
-                if (g_file_test(full, G_FILE_TEST_IS_DIR)) {
-                    contact_dirs = g_slist_append(contact_dirs, full);
-                } else {
-                    g_free(full);
-                }
-            }
-            g_dir_close(dir);
-        }
-    }
-
-    // Verify each contact directory (single history.log per contact)
-    for (GSList* cd = contact_dirs; cd; cd = cd->next) {
-        const char* cdir_path = cd->data;
-
-        auto_gchar gchar* filepath = g_strdup_printf("%s/history.log", cdir_path);
-        if (!g_file_test(filepath, G_FILE_TEST_EXISTS))
-            continue;
-
-        const char* basename = "history.log";
-
-        // Check file permissions
-        struct stat st;
-        if (g_stat(filepath, &st) == 0) {
-            if ((st.st_mode & 0777) != (S_IRUSR | S_IWUSR)) {
-                integrity_issue_t* issue = g_malloc0(sizeof(integrity_issue_t));
-                issue->level = INTEGRITY_WARNING;
-                issue->file = g_strdup(basename);
-                issue->line = 0;
-                issue->message = g_strdup_printf("File permissions are %o, expected 600 (sensitive data)", st.st_mode & 0777);
-                issues = g_slist_append(issues, issue);
-            }
-        }
-
-        FILE* fp = fopen(filepath, "r");
-        if (!fp)
-            continue;
-
-        // BOM check
-        int c1 = fgetc(fp);
-        int c2 = fgetc(fp);
-        int c3 = fgetc(fp);
-        if (c1 == 0xEF && c2 == 0xBB && c3 == 0xBF) {
-            integrity_issue_t* issue = g_malloc0(sizeof(integrity_issue_t));
-            issue->level = INTEGRITY_INFO;
-            issue->file = g_strdup(basename);
-            issue->line = 0;
-            issue->message = g_strdup("File has UTF-8 BOM — harmless but unnecessary");
-            issues = g_slist_append(issues, issue);
-        } else {
-            fseek(fp, 0, SEEK_SET);
-        }
-
-        char* buf = NULL;
-        int lineno = 0;
-        GDateTime* prev_ts = NULL;
-        GHashTable* seen_ids = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
-        GHashTable* all_stanza_ids = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
-        gboolean has_crlf = FALSE;
-        gboolean is_empty = TRUE;
-
-        while ((buf = ff_readline(fp, NULL)) != NULL) {
-            lineno++;
-            gsize len = strlen(buf);
-
-            if (len > 0 && buf[len - 1] == '\r') {
-                has_crlf = TRUE;
-                buf[--len] = '\0';
-            }
-
-            if (len == 0 || buf[0] == '#') {
-                free(buf);
-                continue;
-            }
-            is_empty = FALSE;
-
-            const gchar* end;
-            if (!g_utf8_validate(buf, -1, &end)) {
-                integrity_issue_t* issue = g_malloc0(sizeof(integrity_issue_t));
-                issue->level = INTEGRITY_ERROR;
-                issue->file = g_strdup(basename);
-                issue->line = lineno;
-                issue->message = g_strdup_printf("Invalid UTF-8 at byte offset %ld", (long)(end - buf));
-                issues = g_slist_append(issues, issue);
-                free(buf);
-                continue;
-            }
-
-            for (gsize i = 0; i < len; i++) {
-                unsigned char ch = (unsigned char)buf[i];
-                if (ch < 0x20 && ch != '\t') {
-                    integrity_issue_t* issue = g_malloc0(sizeof(integrity_issue_t));
-                    issue->level = INTEGRITY_WARNING;
-                    issue->file = g_strdup(basename);
-                    issue->line = lineno;
-                    issue->message = g_strdup_printf("Contains control character 0x%02x", ch);
-                    issues = g_slist_append(issues, issue);
-                    break;
-                }
-            }
-
-            ff_parsed_line_t* pl = ff_parse_line(buf);
-            if (!pl) {
-                integrity_issue_t* issue = g_malloc0(sizeof(integrity_issue_t));
-                issue->level = INTEGRITY_ERROR;
-                issue->file = g_strdup(basename);
-                issue->line = lineno;
-                issue->message = g_strdup("Unparsable line");
-                issues = g_slist_append(issues, issue);
-                free(buf);
-                continue;
-            }
-
-            free(buf);
-
-            // Timestamp ordering
-            if (prev_ts && g_date_time_compare(pl->timestamp, prev_ts) < 0) {
-                auto_gchar gchar* ts_cur = g_date_time_format_iso8601(pl->timestamp);
-                auto_gchar gchar* ts_prev = g_date_time_format_iso8601(prev_ts);
-                integrity_issue_t* issue = g_malloc0(sizeof(integrity_issue_t));
-                issue->level = INTEGRITY_WARNING;
-                issue->file = g_strdup(basename);
-                issue->line = lineno;
-                issue->message = g_strdup_printf("Timestamp out of order (%s after %s)", ts_cur, ts_prev);
-                issues = g_slist_append(issues, issue);
-            }
-            if (prev_ts)
-                g_date_time_unref(prev_ts);
-            prev_ts = g_date_time_ref(pl->timestamp);
-
-            // Duplicate stanza-id / archive-id
-            if (pl->stanza_id && strlen(pl->stanza_id) > 0) {
-                if (g_hash_table_contains(seen_ids, pl->stanza_id)) {
-                    integrity_issue_t* issue = g_malloc0(sizeof(integrity_issue_t));
-                    issue->level = INTEGRITY_WARNING;
-                    issue->file = g_strdup(basename);
-                    issue->line = lineno;
-                    issue->message = g_strdup_printf("Duplicate stanza-id \"%s\"", pl->stanza_id);
-                    issues = g_slist_append(issues, issue);
-                } else {
-                    g_hash_table_insert(seen_ids, g_strdup(pl->stanza_id), GINT_TO_POINTER(lineno));
-                }
-                g_hash_table_insert(all_stanza_ids, g_strdup(pl->stanza_id), GINT_TO_POINTER(lineno));
-            }
-            if (pl->archive_id && strlen(pl->archive_id) > 0) {
-                if (g_hash_table_contains(seen_ids, pl->archive_id)) {
-                    integrity_issue_t* issue = g_malloc0(sizeof(integrity_issue_t));
-                    issue->level = INTEGRITY_WARNING;
-                    issue->file = g_strdup(basename);
-                    issue->line = lineno;
-                    issue->message = g_strdup_printf("Duplicate archive-id \"%s\"", pl->archive_id);
-                    issues = g_slist_append(issues, issue);
-                } else {
-                    g_hash_table_insert(seen_ids, g_strdup(pl->archive_id), GINT_TO_POINTER(lineno));
-                }
-            }
-
-            ff_parsed_line_free(pl);
-        }
-
-        fclose(fp);
-
-        if (has_crlf) {
-            integrity_issue_t* issue = g_malloc0(sizeof(integrity_issue_t));
-            issue->level = INTEGRITY_WARNING;
-            issue->file = g_strdup(basename);
-            issue->line = 0;
-            issue->message = g_strdup("File uses Windows line endings (CRLF) — consider converting to LF");
-            issues = g_slist_append(issues, issue);
-        }
-
-        if (is_empty) {
-            integrity_issue_t* issue = g_malloc0(sizeof(integrity_issue_t));
-            issue->level = INTEGRITY_INFO;
-            issue->file = g_strdup(basename);
-            issue->line = 0;
-            issue->message = g_strdup("File is empty (no message lines)");
-            issues = g_slist_append(issues, issue);
-        }
-
-        // Second pass: check LMC references
-        fp = fopen(filepath, "r");
-        if (fp) {
-            int b1 = fgetc(fp);
-            int b2 = fgetc(fp);
-            int b3 = fgetc(fp);
-            if (!(b1 == 0xEF && b2 == 0xBB && b3 == 0xBF))
-                fseek(fp, 0, SEEK_SET);
-
-            lineno = 0;
-            while ((buf = ff_readline(fp, NULL)) != NULL) {
-                lineno++;
-                gsize len = strlen(buf);
-                if (len > 0 && buf[len - 1] == '\r')
-                    buf[--len] = '\0';
-                if (len == 0 || buf[0] == '#') {
-                    free(buf);
-                    continue;
-                }
-
-                ff_parsed_line_t* pl = ff_parse_line(buf);
-                free(buf);
-                if (!pl)
-                    continue;
-
-                if (pl->replace_id && strlen(pl->replace_id) > 0) {
-                    if (!g_hash_table_contains(all_stanza_ids, pl->replace_id)) {
-                        integrity_issue_t* issue = g_malloc0(sizeof(integrity_issue_t));
-                        issue->level = INTEGRITY_ERROR;
-                        issue->file = g_strdup(basename);
-                        issue->line = lineno;
-                        issue->message = g_strdup_printf("Broken correction reference: corrects:%s not found", pl->replace_id);
-                        issues = g_slist_append(issues, issue);
-                    }
-                }
-                ff_parsed_line_free(pl);
-            }
-            fclose(fp);
-        }
-
-        if (prev_ts)
-            g_date_time_unref(prev_ts);
-        g_hash_table_destroy(seen_ids);
-        g_hash_table_destroy(all_stanza_ids);
-    }
-
-    g_slist_free_full(contact_dirs, g_free);
-    return issues;
-}

src/database_sqlite.c

@@ -1,853 +0,0 @@
-/*
- * database_sqlite.c
- * vim: expandtab:ts=4:sts=4:sw=4
- *
- * Copyright (C) 2020 - 2025 Michael Vetter <jubalh@iodoru.org>
- *
- * This file is part of Profanity.
- *
- * Profanity is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Profanity is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give permission to
- * link the code of portions of this program with the OpenSSL library under
- * certain conditions as described in each individual source file, and
- * distribute linked combinations including the two.
- *
- * You must obey the GNU General Public License in all respects for all of the
- * code used other than OpenSSL. If you modify file(s) with this exception, you
- * may extend this exception to your version of the file(s), but you are not
- * obligated to do so. If you do not wish to do so, delete this exception
- * statement from your version. If you delete this exception statement from all
- * source files in the program, then also delete it here.
- *
- */
-
-#include "config.h"
-
-#include <sys/stat.h>
-#include <sys/statvfs.h>
-#include <sqlite3.h>
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-#include "log.h"
-#include "common.h"
-#include "config/files.h"
-#include "database.h"
-#include "config/preferences.h"
-#include "ui/ui.h"
-#include "xmpp/xmpp.h"
-#include "xmpp/message.h"
-
-static sqlite3* g_chatlog_database;
-
-static void _add_to_db(ProfMessage* message, char* type, const Jid* const from_jid, const Jid* const to_jid);
-static char* _get_db_filename(ProfAccount* account);
-static prof_msg_type_t _get_message_type_type(const char* const type);
-static prof_enc_t _get_message_enc_type(const char* const encstr);
-static int _get_db_version(void);
-static gboolean _migrate_to_v2(void);
-static gboolean _check_available_space_for_db_migration(char* path_to_db);
-
-static const int latest_version = 2;
-
-// Helper: close DB handle (if any), warn on busy, and shutdown SQLite
-static void
-_db_teardown(const char* ctx)
-{
-    if (g_chatlog_database) {
-        int rc = sqlite3_close_v2(g_chatlog_database);
-        if (rc != SQLITE_OK) {
-            log_warning("sqlite3_close_v2 in %s returned %d; database may still have active statements.",
-                        ctx ? ctx : "db_teardown", rc);
-        }
-        g_chatlog_database = NULL;
-    }
-    sqlite3_shutdown();
-}
-
-// Helper: prepare a statement and log a contextual error on failure
-static gboolean
-_db_prepare_ctx(const char* query, sqlite3_stmt** stmt, const char* ctx)
-{
-    int rc = sqlite3_prepare_v2(g_chatlog_database, query, -1, stmt, NULL);
-    if (rc != SQLITE_OK) {
-        log_error("SQLite error in %s: (error code: %d) %s",
-                  ctx ? ctx : "sqlite3_prepare_v2",
-                  rc,
-                  sqlite3_errmsg(g_chatlog_database));
-        return FALSE;
-    }
-    return TRUE;
-}
-
-static char*
-_db_strdup(const char* str)
-{
-    return str ? strdup(str) : NULL;
-}
-
-#define auto_sqlite __attribute__((__cleanup__(auto_free_sqlite)))
-
-static void
-auto_free_sqlite(gchar** str)
-{
-    if (str == NULL)
-        return;
-    sqlite3_free(*str);
-}
-
-static char*
-_get_db_filename(ProfAccount* account)
-{
-    return files_file_in_account_data_path(DIR_DATABASE, account->jid, "chatlog.db");
-}
-
-static gboolean
-_sqlite_init(ProfAccount* account)
-{
-    int ret = sqlite3_initialize();
-    if (ret != SQLITE_OK) {
-        log_error("Error initializing SQLite database: %d", ret);
-        return FALSE;
-    }
-
-    auto_char char* filename = _get_db_filename(account);
-    if (!filename) {
-        sqlite3_shutdown();
-        return FALSE;
-    }
-
-    ret = sqlite3_open(filename, &g_chatlog_database);
-    if (ret != SQLITE_OK) {
-        const char* err_msg = g_chatlog_database ? sqlite3_errmsg(g_chatlog_database) : "(no handle)";
-        log_error("Error opening SQLite database: %s", err_msg);
-        _db_teardown("_sqlite_init(open)");
-        return FALSE;
-    }
-
-    char* err_msg = NULL;
-
-    int db_version = _get_db_version();
-    if (db_version == latest_version) {
-        return TRUE;
-    }
-
-    char* query = "CREATE TABLE IF NOT EXISTS `ChatLogs` ("
-                  "`id` INTEGER PRIMARY KEY AUTOINCREMENT, "
-                  "`from_jid` TEXT NOT NULL, "
-                  "`to_jid` TEXT NOT NULL, "
-                  "`from_resource` TEXT, "
-                  "`to_resource` TEXT, "
-                  "`message` TEXT, "
-                  "`timestamp` TEXT, "
-                  "`type` TEXT, "
-                  "`stanza_id` TEXT, "
-                  "`archive_id` TEXT, "
-                  "`encryption` TEXT, "
-                  "`marked_read` INTEGER, "
-                  "`replace_id` TEXT, "
-                  "`replaces_db_id` INTEGER, "
-                  "`replaced_by_db_id` INTEGER)";
-    if (SQLITE_OK != sqlite3_exec(g_chatlog_database, query, NULL, 0, &err_msg)) {
-        goto out;
-    }
-
-    query = "CREATE TRIGGER IF NOT EXISTS update_corrected_message "
-            "AFTER INSERT ON ChatLogs "
-            "FOR EACH ROW "
-            "WHEN NEW.replaces_db_id IS NOT NULL "
-            "BEGIN "
-            "UPDATE ChatLogs "
-            "SET replaced_by_db_id = NEW.id "
-            "WHERE id = NEW.replaces_db_id; "
-            "END;";
-    if (SQLITE_OK != sqlite3_exec(g_chatlog_database, query, NULL, 0, &err_msg)) {
-        log_error("Unable to add `update_corrected_message` trigger.");
-        goto out;
-    }
-
-    query = "CREATE INDEX IF NOT EXISTS ChatLogs_timestamp_IDX ON `ChatLogs` (`timestamp`)";
-    if (SQLITE_OK != sqlite3_exec(g_chatlog_database, query, NULL, 0, &err_msg)) {
-        log_error("Unable to create index for timestamp.");
-        goto out;
-    }
-    query = "CREATE INDEX IF NOT EXISTS ChatLogs_to_from_jid_IDX ON `ChatLogs` (`to_jid`, `from_jid`)";
-    if (SQLITE_OK != sqlite3_exec(g_chatlog_database, query, NULL, 0, &err_msg)) {
-        log_error("Unable to create index for to_jid.");
-        goto out;
-    }
-
-    query = "CREATE TABLE IF NOT EXISTS `DbVersion` (`dv_id` INTEGER PRIMARY KEY, `version` INTEGER UNIQUE)";
-    if (SQLITE_OK != sqlite3_exec(g_chatlog_database, query, NULL, 0, &err_msg)) {
-        goto out;
-    }
-
-    if (db_version == -1) {
-        query = "INSERT OR IGNORE INTO `DbVersion` (`version`) VALUES ('2')";
-        if (SQLITE_OK != sqlite3_exec(g_chatlog_database, query, NULL, 0, &err_msg)) {
-            goto out;
-        }
-        db_version = _get_db_version();
-    }
-
-    if (db_version == -1) {
-        cons_show_error("DB Initialization Error: Unable to check DB version.");
-        goto out;
-    }
-
-    if (db_version < latest_version) {
-        cons_show("Migrating database schema. This operation may take a while...");
-        if (db_version < 2 && (!_check_available_space_for_db_migration(filename) || !_migrate_to_v2())) {
-            cons_show_error("Database Initialization Error: Unable to migrate database to version 2. Please, check error logs for details.");
-            goto out;
-        }
-        cons_show("Database schema migration was successful.");
-    }
-
-    log_debug("Initialized SQLite database: %s", filename);
-    return TRUE;
-
-out:
-    if (err_msg) {
-        log_error("SQLite error in _sqlite_init(): %s", err_msg);
-        sqlite3_free(err_msg);
-    } else {
-        log_error("Unknown SQLite error in _sqlite_init().");
-    }
-    _db_teardown("_sqlite_init(out)");
-    return FALSE;
-}
-
-static void
-_sqlite_close(void)
-{
-    log_debug("_sqlite_close() called");
-    _db_teardown("_sqlite_close");
-}
-
-static void
-_sqlite_add_incoming(ProfMessage* message)
-{
-    if (message->to_jid) {
-        _add_to_db(message, NULL, message->from_jid, message->to_jid);
-    } else {
-        _add_to_db(message, NULL, message->from_jid, connection_get_jid());
-    }
-}
-
-static void
-_log_database_add_outgoing(char* type, const char* const id, const char* const barejid, const char* const message, const char* const replace_id, prof_enc_t enc)
-{
-    ProfMessage* msg = message_init();
-
-    msg->id = _db_strdup(id);
-    msg->from_jid = jid_create(barejid);
-    msg->plain = _db_strdup(message);
-    msg->replace_id = _db_strdup(replace_id);
-    msg->timestamp = g_date_time_new_now_local();
-    msg->enc = enc;
-
-    _add_to_db(msg, type, connection_get_jid(), msg->from_jid);
-
-    message_free(msg);
-}
-
-static void
-_sqlite_add_outgoing_chat(const char* const id, const char* const barejid, const char* const message, const char* const replace_id, prof_enc_t enc)
-{
-    _log_database_add_outgoing("chat", id, barejid, message, replace_id, enc);
-}
-
-static void
-_sqlite_add_outgoing_muc(const char* const id, const char* const barejid, const char* const message, const char* const replace_id, prof_enc_t enc)
-{
-    _log_database_add_outgoing("muc", id, barejid, message, replace_id, enc);
-}
-
-static void
-_sqlite_add_outgoing_muc_pm(const char* const id, const char* const barejid, const char* const message, const char* const replace_id, prof_enc_t enc)
-{
-    _log_database_add_outgoing("mucpm", id, barejid, message, replace_id, enc);
-}
-
-static ProfMessage*
-_sqlite_get_limits_info(const gchar* const contact_barejid, gboolean is_last)
-{
-    sqlite3_stmt* stmt = NULL;
-    const Jid* myjid = connection_get_jid();
-    ProfMessage* msg = message_init();
-    if (!myjid || !myjid->str) {
-        if (is_last) {
-            msg->timestamp = g_date_time_new_now_utc();
-        }
-        return msg;
-    }
-
-    const char* order = is_last ? "DESC" : "ASC";
-    auto_sqlite char* query = sqlite3_mprintf("SELECT `archive_id`, `timestamp` FROM `ChatLogs` WHERE "
-                                              "(`from_jid` = %Q AND `to_jid` = %Q) OR "
-                                              "(`from_jid` = %Q AND `to_jid` = %Q) "
-                                              "ORDER BY `timestamp` %s LIMIT 1;",
-                                              contact_barejid, myjid->barejid, myjid->barejid, contact_barejid, order);
-
-    if (!query) {
-        log_error("Could not allocate memory for SQL query in _sqlite_get_limits_info()");
-        if (is_last) {
-            msg->timestamp = g_date_time_new_now_utc();
-        }
-        return msg;
-    }
-
-    if (!_db_prepare_ctx(query, &stmt, "_sqlite_get_limits_info()")) {
-        if (is_last) {
-            msg->timestamp = g_date_time_new_now_utc();
-        }
-        return msg;
-    }
-
-    if (sqlite3_step(stmt) == SQLITE_ROW) {
-        char* archive_id = (char*)sqlite3_column_text(stmt, 0);
-        char* date = (char*)sqlite3_column_text(stmt, 1);
-
-        msg->stanzaid = _db_strdup(archive_id);
-        msg->timestamp = g_date_time_new_from_iso8601(date, NULL);
-    }
-    sqlite3_finalize(stmt);
-
-    if (!msg->timestamp && is_last) {
-        msg->timestamp = g_date_time_new_now_utc();
-    }
-
-    return msg;
-}
-
-static db_history_result_t
-_sqlite_get_previous_chat(const gchar* const contact_barejid, const gchar* start_time, const gchar* end_time, gboolean from_start, gboolean flip, GSList** result)
-{
-    if (!g_chatlog_database) {
-        log_warning("_sqlite_get_previous_chat() called but db is not initialized");
-        return DB_RESPONSE_ERROR;
-    }
-    sqlite3_stmt* stmt = NULL;
-    const Jid* myjid = connection_get_jid();
-    if (!myjid->str) {
-        log_warning("_sqlite_get_previous_chat() called but no connection detected.");
-        return DB_RESPONSE_ERROR;
-    }
-
-    gchar* sort1 = from_start ? "ASC" : "DESC";
-    gchar* sort2 = !flip ? "ASC" : "DESC";
-    GDateTime* now = g_date_time_new_now_local();
-    auto_gchar gchar* end_date_fmt = end_time ? g_strdup(end_time) : g_date_time_format_iso8601(now);
-    auto_sqlite gchar* query = sqlite3_mprintf("SELECT * FROM ("
-                                               "SELECT COALESCE(B.`message`, A.`message`) AS message, "
-                                               "A.`timestamp`, A.`from_jid`, A.`from_resource`, A.`to_jid`, A.`to_resource`, A.`type`, A.`encryption`, A.`stanza_id` FROM `ChatLogs` AS A "
-                                               "LEFT JOIN `ChatLogs` AS B ON (A.`replaced_by_db_id` = B.`id` AND A.`from_jid` = B.`from_jid`) "
-                                               "WHERE (A.`replaces_db_id` IS NULL) "
-                                               "AND ((A.`from_jid` = %Q AND A.`to_jid` = %Q) OR (A.`from_jid` = %Q AND A.`to_jid` = %Q)) "
-                                               "AND A.`timestamp` < %Q "
-                                               "AND (%Q IS NULL OR A.`timestamp` > %Q) "
-                                               "ORDER BY A.`timestamp` %s LIMIT %d) "
-                                               "ORDER BY `timestamp` %s;",
-                                               contact_barejid, myjid->barejid, myjid->barejid, contact_barejid, end_date_fmt, start_time, start_time, sort1, MESSAGES_TO_RETRIEVE, sort2);
-
-    g_date_time_unref(now);
-
-    if (!query) {
-        log_error("Could not allocate memory.");
-        return DB_RESPONSE_ERROR;
-    }
-
-    if (!_db_prepare_ctx(query, &stmt, "_sqlite_get_previous_chat()")) {
-        return DB_RESPONSE_ERROR;
-    }
-
-    while (sqlite3_step(stmt) == SQLITE_ROW) {
-        char* message = (char*)sqlite3_column_text(stmt, 0);
-        char* date = (char*)sqlite3_column_text(stmt, 1);
-        char* from_jid = (char*)sqlite3_column_text(stmt, 2);
-        char* from_resource = (char*)sqlite3_column_text(stmt, 3);
-        char* to_jid = (char*)sqlite3_column_text(stmt, 4);
-        char* to_resource = (char*)sqlite3_column_text(stmt, 5);
-        char* type = (char*)sqlite3_column_text(stmt, 6);
-        char* encryption = (char*)sqlite3_column_text(stmt, 7);
-        char* id = (char*)sqlite3_column_text(stmt, 8);
-
-        ProfMessage* msg = message_init();
-        msg->id = id ? strdup(id) : NULL;
-        msg->from_jid = jid_create_from_bare_and_resource(from_jid, from_resource);
-        msg->to_jid = jid_create_from_bare_and_resource(to_jid, to_resource);
-        msg->plain = strdup(message ?: "");
-        msg->timestamp = g_date_time_new_from_iso8601(date, NULL);
-        msg->type = _get_message_type_type(type);
-        msg->enc = _get_message_enc_type(encryption);
-
-        *result = g_slist_append(*result, msg);
-    }
-    sqlite3_finalize(stmt);
-
-    return g_slist_length(*result) != 0 ? DB_RESPONSE_SUCCESS : DB_RESPONSE_EMPTY;
-}
-
-static GSList*
-_sqlite_verify_integrity(const gchar* const contact_barejid)
-{
-    GSList* issues = NULL;
-
-    if (!g_chatlog_database) {
-        integrity_issue_t* issue = g_malloc0(sizeof(integrity_issue_t));
-        issue->level = INTEGRITY_ERROR;
-        issue->file = g_strdup("chatlog.db");
-        issue->line = 0;
-        issue->message = g_strdup("Database not initialized");
-        issues = g_slist_append(issues, issue);
-        return issues;
-    }
-
-    // PRAGMA integrity_check
-    sqlite3_stmt* stmt = NULL;
-    if (_db_prepare_ctx("PRAGMA integrity_check", &stmt, "_sqlite_verify_integrity()")) {
-        while (sqlite3_step(stmt) == SQLITE_ROW) {
-            const char* result = (const char*)sqlite3_column_text(stmt, 0);
-            if (g_strcmp0(result, "ok") != 0) {
-                integrity_issue_t* issue = g_malloc0(sizeof(integrity_issue_t));
-                issue->level = INTEGRITY_ERROR;
-                issue->file = g_strdup("chatlog.db");
-                issue->line = 0;
-                issue->message = g_strdup_printf("SQLite integrity check: %s", result);
-                issues = g_slist_append(issues, issue);
-            }
-        }
-        sqlite3_finalize(stmt);
-    }
-
-    // Check timestamp ordering for a specific contact or all
-    const Jid* myjid = connection_get_jid();
-    if (myjid && myjid->barejid) {
-        auto_sqlite char* query = NULL;
-        if (contact_barejid) {
-            query = sqlite3_mprintf(
-                "SELECT A.`id`, A.`timestamp`, B.`id`, B.`timestamp` FROM `ChatLogs` A "
-                "JOIN `ChatLogs` B ON B.`id` = A.`id` + 1 "
-                "WHERE A.`timestamp` > B.`timestamp` "
-                "AND ((A.`from_jid` = %Q AND A.`to_jid` = %Q) OR (A.`from_jid` = %Q AND A.`to_jid` = %Q)) "
-                "LIMIT 50",
-                contact_barejid, myjid->barejid, myjid->barejid, contact_barejid);
-        } else {
-            query = sqlite3_mprintf(
-                "SELECT A.`id`, A.`timestamp`, B.`id`, B.`timestamp` FROM `ChatLogs` A "
-                "JOIN `ChatLogs` B ON B.`id` = A.`id` + 1 "
-                "WHERE A.`timestamp` > B.`timestamp` "
-                "LIMIT 50");
-        }
-
-        if (query && _db_prepare_ctx(query, &stmt, "_sqlite_verify_integrity(timestamp_order)")) {
-            while (sqlite3_step(stmt) == SQLITE_ROW) {
-                int id_a = sqlite3_column_int(stmt, 0);
-                const char* ts_a = (const char*)sqlite3_column_text(stmt, 1);
-                int id_b = sqlite3_column_int(stmt, 2);
-                const char* ts_b = (const char*)sqlite3_column_text(stmt, 3);
-
-                integrity_issue_t* issue = g_malloc0(sizeof(integrity_issue_t));
-                issue->level = INTEGRITY_WARNING;
-                issue->file = g_strdup("chatlog.db");
-                issue->line = id_a;
-                issue->message = g_strdup_printf("Timestamp out of order: row %d (%s) > row %d (%s)",
-                                                 id_a, ts_a ? ts_a : "NULL", id_b, ts_b ? ts_b : "NULL");
-                issues = g_slist_append(issues, issue);
-            }
-            sqlite3_finalize(stmt);
-        }
-
-        // Check broken LMC references
-        auto_sqlite char* lmc_query = sqlite3_mprintf(
-            "SELECT A.`id`, A.`replaces_db_id` FROM `ChatLogs` A "
-            "WHERE A.`replaces_db_id` IS NOT NULL "
-            "AND NOT EXISTS (SELECT 1 FROM `ChatLogs` B WHERE B.`id` = A.`replaces_db_id`) "
-            "LIMIT 50");
-
-        if (lmc_query && _db_prepare_ctx(lmc_query, &stmt, "_sqlite_verify_integrity(lmc_check)")) {
-            while (sqlite3_step(stmt) == SQLITE_ROW) {
-                int id = sqlite3_column_int(stmt, 0);
-                int replaces_id = sqlite3_column_int(stmt, 1);
-
-                integrity_issue_t* issue = g_malloc0(sizeof(integrity_issue_t));
-                issue->level = INTEGRITY_ERROR;
-                issue->file = g_strdup("chatlog.db");
-                issue->line = id;
-                issue->message = g_strdup_printf("Broken LMC reference: row %d references non-existent row %d",
-                                                 id, replaces_id);
-                issues = g_slist_append(issues, issue);
-            }
-            sqlite3_finalize(stmt);
-        }
-    }
-
-    return issues;
-}
-
-// --- Type conversion helpers ---
-
-static const char*
-_get_message_type_str(prof_msg_type_t type)
-{
-    switch (type) {
-    case PROF_MSG_TYPE_CHAT:
-        return "chat";
-    case PROF_MSG_TYPE_MUC:
-        return "muc";
-    case PROF_MSG_TYPE_MUCPM:
-        return "mucpm";
-    case PROF_MSG_TYPE_UNINITIALIZED:
-        return NULL;
-    }
-    return NULL;
-}
-
-static prof_msg_type_t
-_get_message_type_type(const char* const type)
-{
-    if (g_strcmp0(type, "chat") == 0) {
-        return PROF_MSG_TYPE_CHAT;
-    } else if (g_strcmp0(type, "muc") == 0) {
-        return PROF_MSG_TYPE_MUC;
-    } else if (g_strcmp0(type, "mucpm") == 0) {
-        return PROF_MSG_TYPE_MUCPM;
-    } else {
-        return PROF_MSG_TYPE_UNINITIALIZED;
-    }
-}
-
-static const char*
-_get_message_enc_str(prof_enc_t enc)
-{
-    switch (enc) {
-    case PROF_MSG_ENC_OX:
-        return "ox";
-    case PROF_MSG_ENC_PGP:
-        return "pgp";
-    case PROF_MSG_ENC_OTR:
-        return "otr";
-    case PROF_MSG_ENC_OMEMO:
-        return "omemo";
-    case PROF_MSG_ENC_NONE:
-        return "none";
-    }
-
-    return "none";
-}
-
-static prof_enc_t
-_get_message_enc_type(const char* const encstr)
-{
-    if (g_strcmp0(encstr, "ox") == 0) {
-        return PROF_MSG_ENC_OX;
-    } else if (g_strcmp0(encstr, "pgp") == 0) {
-        return PROF_MSG_ENC_PGP;
-    } else if (g_strcmp0(encstr, "otr") == 0) {
-        return PROF_MSG_ENC_OTR;
-    } else if (g_strcmp0(encstr, "omemo") == 0) {
-        return PROF_MSG_ENC_OMEMO;
-    }
-
-    return PROF_MSG_ENC_NONE;
-}
-
-// --- Core write logic ---
-
-static void
-_add_to_db(ProfMessage* message, char* type, const Jid* const from_jid, const Jid* const to_jid)
-{
-    auto_gchar gchar* pref_dblog = prefs_get_string(PREF_DBLOG);
-    sqlite_int64 original_message_id = -1;
-
-    if (g_strcmp0(pref_dblog, "off") == 0) {
-        return;
-    } else if (g_strcmp0(pref_dblog, "redact") == 0) {
-        if (message->plain) {
-            free(message->plain);
-        }
-        message->plain = strdup("[REDACTED]");
-    }
-
-    if (!g_chatlog_database) {
-        log_debug("_add_to_db() called but db is not initialized");
-        return;
-    }
-
-    char* err_msg;
-    auto_gchar gchar* date_fmt = NULL;
-
-    if (message->timestamp) {
-        date_fmt = g_date_time_format_iso8601(message->timestamp);
-    } else {
-        GDateTime* dt = g_date_time_new_now_local();
-        date_fmt = g_date_time_format_iso8601(dt);
-        g_date_time_unref(dt);
-    }
-
-    const char* enc = _get_message_enc_str(message->enc);
-
-    if (!type) {
-        type = (char*)_get_message_type_str(message->type);
-    }
-
-    // Apply LMC and check its validity (XEP-0308)
-    if (message->replace_id) {
-        auto_sqlite char* replace_check_query = sqlite3_mprintf("SELECT `id`, `from_jid`, `replaces_db_id` FROM `ChatLogs` WHERE `stanza_id` = %Q ORDER BY `timestamp` DESC LIMIT 1",
-                                                                message->replace_id);
-
-        if (!replace_check_query) {
-            log_error("Could not allocate memory for SQL replace query in _add_to_db()");
-            return;
-        }
-
-        sqlite3_stmt* lmc_stmt = NULL;
-        if (!_db_prepare_ctx(replace_check_query, &lmc_stmt, "_add_to_db(replace_check)")) {
-            return;
-        }
-
-        if (sqlite3_step(lmc_stmt) == SQLITE_ROW) {
-            original_message_id = sqlite3_column_int64(lmc_stmt, 0);
-            const char* from_jid_orig = (const char*)sqlite3_column_text(lmc_stmt, 1);
-
-            sqlite_int64 tmp = sqlite3_column_int64(lmc_stmt, 2);
-            original_message_id = tmp ? tmp : original_message_id;
-
-            if (g_strcmp0(from_jid_orig, from_jid->barejid) != 0) {
-                log_error("Mismatch in sender JIDs when trying to do LMC. Corrected message sender: %s. Original message sender: %s. Replace-ID: %s. Message: %s", from_jid->barejid, from_jid_orig, message->replace_id, message->plain);
-                cons_show_error("%s sent a message correction with mismatched sender. See log for details.", from_jid->barejid);
-                sqlite3_finalize(lmc_stmt);
-                return;
-            }
-        } else {
-            log_warning("Got LMC message that does not have original message counterpart in the database from %s", message->from_jid->fulljid);
-        }
-        sqlite3_finalize(lmc_stmt);
-    }
-
-    if (message->stanzaid && !message->is_mam) {
-        auto_sqlite char* duplicate_check_query = sqlite3_mprintf("SELECT 1 FROM `ChatLogs` WHERE (`archive_id` = %Q)",
-                                                                  message->stanzaid);
-
-        if (!duplicate_check_query) {
-            log_error("Could not allocate memory for SQL duplicate query in _add_to_db()");
-            return;
-        }
-
-        sqlite3_stmt* stmt;
-        if (_db_prepare_ctx(duplicate_check_query, &stmt, "_add_to_db(duplicate_check)")) {
-            if (sqlite3_step(stmt) == SQLITE_ROW) {
-                log_error("Duplicate stanza-id found for the message. stanza_id: %s; archive_id: %s; sender: %s; content: %s", message->id, message->stanzaid, from_jid->barejid, message->plain);
-                cons_show_error("Got a message with duplicate (server-generated) stanza-id from %s.", from_jid->fulljid);
-            }
-            sqlite3_finalize(stmt);
-        }
-    }
-
-    auto_sqlite char* orig_message_id = original_message_id == -1 ? NULL : sqlite3_mprintf("%d", original_message_id);
-
-    auto_sqlite char* query = sqlite3_mprintf("INSERT INTO `ChatLogs` "
-                                              "(`from_jid`, `from_resource`, `to_jid`, `to_resource`, "
-                                              "`message`, `timestamp`, `stanza_id`, `archive_id`, "
-                                              "`replaces_db_id`, `replace_id`, `type`, `encryption`) "
-                                              "VALUES (%Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q)",
-                                              from_jid->barejid,
-                                              from_jid->resourcepart,
-                                              to_jid->barejid,
-                                              to_jid->resourcepart,
-                                              message->plain,
-                                              date_fmt,
-                                              message->id,
-                                              message->stanzaid,
-                                              orig_message_id,
-                                              message->replace_id,
-                                              type,
-                                              enc);
-    if (!query) {
-        log_error("Could not allocate memory for SQL insert query in _add_to_db()");
-        return;
-    }
-
-    log_debug("Writing to DB. Query: %s", query);
-
-    if (SQLITE_OK != sqlite3_exec(g_chatlog_database, query, NULL, 0, &err_msg)) {
-        if (err_msg) {
-            log_error("SQLite error in _add_to_db(): %s", err_msg);
-            sqlite3_free(err_msg);
-        } else {
-            log_error("Unknown SQLite error in _add_to_db().");
-        }
-    } else {
-        int inserted_rows_count = sqlite3_changes(g_chatlog_database);
-        if (inserted_rows_count < 1) {
-            log_error("SQLite did not insert message (rows: %d, id: %s, content: %s)", inserted_rows_count, message->id, message->plain);
-        }
-    }
-}
-
-// --- DB version and migration ---
-
-static int
-_get_db_version(void)
-{
-    int current_version = -1;
-    const char* query = "SELECT `version` FROM `DbVersion` LIMIT 1";
-    sqlite3_stmt* statement;
-    if (_db_prepare_ctx(query, &statement, "_get_db_version()")) {
-        if (sqlite3_step(statement) == SQLITE_ROW) {
-            current_version = sqlite3_column_int(statement, 0);
-        }
-        sqlite3_finalize(statement);
-    }
-    return current_version;
-}
-
-static gboolean
-_migrate_to_v2(void)
-{
-    char* err_msg = NULL;
-
-    const char* sql_statements[] = {
-        "BEGIN TRANSACTION",
-        "ALTER TABLE `ChatLogs` ADD COLUMN `replaces_db_id` INTEGER;",
-        "ALTER TABLE `ChatLogs` ADD COLUMN `replaced_by_db_id` INTEGER;",
-        "UPDATE `ChatLogs` AS A "
-        "SET `replaces_db_id` = B.`id` "
-        "FROM `ChatLogs` AS B "
-        "WHERE A.`replace_id` IS NOT NULL AND A.`replace_id` != '' "
-        "AND A.`replace_id` = B.`stanza_id` "
-        "AND A.`from_jid` = B.`from_jid` AND A.`to_jid` = B.`to_jid`;",
-        "UPDATE `ChatLogs` AS A "
-        "SET `replaced_by_db_id` = B.`id` "
-        "FROM `ChatLogs` AS B "
-        "WHERE (A.`replace_id` IS NULL OR A.`replace_id` = '') "
-        "AND A.`id` = B.`replaces_db_id` "
-        "AND A.`from_jid` = B.`from_jid`;",
-        "UPDATE ChatLogs SET "
-        "from_resource = COALESCE(NULLIF(from_resource, ''), NULL), "
-        "to_resource = COALESCE(NULLIF(to_resource, ''), NULL), "
-        "message = COALESCE(NULLIF(message, ''), NULL), "
-        "timestamp = COALESCE(NULLIF(timestamp, ''), NULL), "
-        "stanza_id = COALESCE(NULLIF(stanza_id, ''), NULL), "
-        "archive_id = COALESCE(NULLIF(archive_id, ''), NULL), "
-        "replace_id = COALESCE(NULLIF(replace_id, ''), NULL), "
-        "type = COALESCE(NULLIF(type, ''), NULL), "
-        "encryption = COALESCE(NULLIF(encryption, ''), NULL);",
-        "UPDATE `DbVersion` SET `version` = 2;",
-        "END TRANSACTION"
-    };
-
-    int statements_count = sizeof(sql_statements) / sizeof(sql_statements[0]);
-
-    for (int i = 0; i < statements_count; i++) {
-        if (SQLITE_OK != sqlite3_exec(g_chatlog_database, sql_statements[i], NULL, 0, &err_msg)) {
-            log_error("SQLite error in _migrate_to_v2() on statement %d: %s", i, err_msg);
-            if (err_msg) {
-                sqlite3_free(err_msg);
-                err_msg = NULL;
-            }
-            goto cleanup;
-        }
-    }
-
-    return TRUE;
-
-cleanup:
-    if (SQLITE_OK != sqlite3_exec(g_chatlog_database, "ROLLBACK;", NULL, 0, &err_msg)) {
-        log_error("[DB Migration] Unable to ROLLBACK: %s", err_msg);
-        if (err_msg) {
-            sqlite3_free(err_msg);
-        }
-    }
-
-    return FALSE;
-}
-
-static gboolean
-_check_available_space_for_db_migration(char* path_to_db)
-{
-    struct stat file_stat;
-    struct statvfs fs_stat;
-
-    if (statvfs(path_to_db, &fs_stat) == 0 && stat(path_to_db, &file_stat) == 0) {
-        unsigned long long file_size = file_stat.st_size / 1024;
-        unsigned long long available_space_kb = fs_stat.f_frsize * fs_stat.f_bavail / 1024;
-        log_debug("_check_available_space_for_db_migration(): Available space on disk: %llu KB; DB size: %llu KB", available_space_kb, file_size);
-
-        return (available_space_kb >= (file_size + (file_size * 10 / 4)));
-    } else {
-        log_error("Error checking available space.");
-        return FALSE;
-    }
-}
-
-// --- Backend vtable ---
-
-static db_backend_t sqlite_backend = {
-    .name = "sqlite",
-    .init = _sqlite_init,
-    .close = _sqlite_close,
-    .add_incoming = _sqlite_add_incoming,
-    .add_outgoing_chat = _sqlite_add_outgoing_chat,
-    .add_outgoing_muc = _sqlite_add_outgoing_muc,
-    .add_outgoing_muc_pm = _sqlite_add_outgoing_muc_pm,
-    .get_previous_chat = _sqlite_get_previous_chat,
-    .get_limits_info = _sqlite_get_limits_info,
-    .verify_integrity = _sqlite_verify_integrity,
-};
-
-db_backend_t*
-db_backend_sqlite(void)
-{
-    return &sqlite_backend;
-}
-
-GSList*
-db_sqlite_list_contacts(void)
-{
-    GSList* contacts = NULL;
-    if (!g_chatlog_database)
-        return NULL;
-
-    const Jid* myjid = connection_get_jid();
-    if (!myjid || !myjid->barejid)
-        return NULL;
-
-    const char* q = "SELECT DISTINCT `from_jid` FROM `ChatLogs` "
-                    "WHERE `from_jid` != ? "
-                    "UNION "
-                    "SELECT DISTINCT `to_jid` FROM `ChatLogs` "
-                    "WHERE `to_jid` != ?";
-    sqlite3_stmt* stmt = NULL;
-    if (!_db_prepare_ctx(q, &stmt, "db_sqlite_list_contacts"))
-        return NULL;
-
-    sqlite3_bind_text(stmt, 1, myjid->barejid, -1, SQLITE_STATIC);
-    sqlite3_bind_text(stmt, 2, myjid->barejid, -1, SQLITE_STATIC);
-
-    while (sqlite3_step(stmt) == SQLITE_ROW) {
-        const char* jid = (const char*)sqlite3_column_text(stmt, 0);
-        if (jid && strlen(jid) > 0) {
-            contacts = g_slist_append(contacts, g_strdup(jid));
-        }
-    }
-    sqlite3_finalize(stmt);
-
-    return contacts;
-}

src/omemo/omemo.c

@@ -532,13 +532,11 @@ omemo_set_device_list(const char* const from, GList* device_list)
                 for (device_id = device_list; device_id != NULL; device_id = device_id->next) {
                     GHashTable* known_identities = g_hash_table_lookup(omemo_ctx.known_devices, jid->barejid);
                     if (known_identities) {
-                        GHashTableIter iter;
-                        gpointer key, value;
-                        g_hash_table_iter_init(&iter, known_identities);
-                        while (g_hash_table_iter_next(&iter, &key, &value)) {
-                            if (device_id->data == value) {
-                                cons_show("OMEMO: Adding firstusage trust for %s device %d - Fingerprint %s", jid->barejid, device_id->data, omemo_format_fingerprint(key));
-                                omemo_trust(jid->barejid, omemo_format_fingerprint(key));
+                        GList* fp = NULL;
+                        for (fp = g_hash_table_get_keys(known_identities); fp != NULL; fp = fp->next) {
+                            if (device_id->data == g_hash_table_lookup(known_identities, fp->data)) {
+                                cons_show("OMEMO: Adding firstusage trust for %s device %d - Fingerprint %s", jid->barejid, device_id->data, omemo_format_fingerprint(fp->data));
+                                omemo_trust(jid->barejid, omemo_format_fingerprint(fp->data));
                             }
                         }
                     }

src/pgp/gpg.c

@@ -345,13 +345,14 @@ p_gpg_list_keys(void)
 
     // TODO: move autocomplete in other place
     autocomplete_clear(key_ac);
-    GHashTableIter iter;
-    gpointer key, value;
-    g_hash_table_iter_init(&iter, result);
-    while (g_hash_table_iter_next(&iter, &key, &value)) {
-        ProfPGPKey* pgp_key = (ProfPGPKey*)value;
-        autocomplete_add(key_ac, pgp_key->id);
+    GList* ids = g_hash_table_get_keys(result);
+    GList* curr = ids;
+    while (curr) {
+        ProfPGPKey* key = g_hash_table_lookup(result, curr->data);
+        autocomplete_add(key_ac, key->id);
+        curr = curr->next;
     }
+    g_list_free(ids);
 
     return result;
 }

src/plugins/autocompleters.c

@@ -141,16 +141,18 @@ autocompleters_complete(const char* const input, gboolean previous)
     while (curr_hash) {
         GHashTable* key_to_ac = curr_hash->data;
 
-        GHashTableIter iter;
-        gpointer key, value;
-        g_hash_table_iter_init(&iter, key_to_ac);
-        while (g_hash_table_iter_next(&iter, &key, &value)) {
-            result = autocomplete_param_with_ac(input, key, value, TRUE, previous);
+        GList* keys = g_hash_table_get_keys(key_to_ac);
+        GList* curr = keys;
+        while (curr) {
+            result = autocomplete_param_with_ac(input, curr->data, g_hash_table_lookup(key_to_ac, curr->data), TRUE, previous);
             if (result) {
                 g_list_free(ac_hashes);
+                g_list_free(keys);
                 return result;
             }
+            curr = g_list_next(curr);
         }
+        g_list_free(keys);
 
         curr_hash = g_list_next(curr_hash);
     }
@@ -160,19 +162,22 @@ autocompleters_complete(const char* const input, gboolean previous)
     curr_hash = filepath_hashes;
     while (curr_hash) {
         GHashTable* prefixes_hash = curr_hash->data;
-        GHashTableIter iter;
-        gpointer key, value;
-        g_hash_table_iter_init(&iter, prefixes_hash);
-        while (g_hash_table_iter_next(&iter, &key, &value)) {
-            char* prefix = (char*)key;
+        GList* prefixes = g_hash_table_get_keys(prefixes_hash);
+        GList* curr_prefix = prefixes;
+        while (curr_prefix) {
+            char* prefix = curr_prefix->data;
             if (g_str_has_prefix(input, prefix)) {
                 result = cmd_ac_complete_filepath(input, prefix, previous);
                 if (result) {
                     g_list_free(filepath_hashes);
+                    g_list_free(prefixes);
                     return result;
                 }
             }
+
+            curr_prefix = g_list_next(curr_prefix);
         }
+        g_list_free(prefixes);
 
         curr_hash = g_list_next(curr_hash);
     }

src/plugins/callbacks.c

@@ -149,14 +149,15 @@ callbacks_remove(const char* const plugin_name)
 {
     GHashTable* command_hash = g_hash_table_lookup(p_commands, plugin_name);
     if (command_hash) {
-        GHashTableIter iter;
-        gpointer key, value;
-        g_hash_table_iter_init(&iter, command_hash);
-        while (g_hash_table_iter_next(&iter, &key, &value)) {
-            char* command = (char*)key;
+        GList* commands = g_hash_table_get_keys(command_hash);
+        GList* curr = commands;
+        while (curr) {
+            char* command = curr->data;
             cmd_ac_remove(command);
             cmd_ac_remove_help(&command[1]);
+            curr = g_list_next(curr);
         }
+        g_list_free(commands);
     }
 
     g_hash_table_remove(p_commands, plugin_name);
@@ -164,12 +165,13 @@ callbacks_remove(const char* const plugin_name)
 
     GHashTable* tag_to_win_cb_hash = g_hash_table_lookup(p_window_callbacks, plugin_name);
     if (tag_to_win_cb_hash) {
-        GHashTableIter iter;
-        gpointer key, value;
-        g_hash_table_iter_init(&iter, tag_to_win_cb_hash);
-        while (g_hash_table_iter_next(&iter, &key, &value)) {
-            wins_close_plugin(key);
+        GList* tags = g_hash_table_get_keys(tag_to_win_cb_hash);
+        GList* curr = tags;
+        while (curr) {
+            wins_close_plugin(curr->data);
+            curr = g_list_next(curr);
         }
+        g_list_free(tags);
     }
 
     g_hash_table_remove(p_window_callbacks, plugin_name);

src/plugins/disco.c

@@ -107,11 +107,10 @@ disco_remove_features(const char* plugin_name)
         return;
     }
 
-    GHashTableIter iter;
-    gpointer key, value;
-    g_hash_table_iter_init(&iter, plugin_features_set);
-    while (g_hash_table_iter_next(&iter, &key, &value)) {
-        char* feature = (char*)key;
+    GList* plugin_feature_list = g_hash_table_get_keys(plugin_features_set);
+    GList* curr = plugin_feature_list;
+    while (curr) {
+        char* feature = curr->data;
         if (g_hash_table_contains(features, feature)) {
             void* refcountp = g_hash_table_lookup(features, feature);
             int refcount = GPOINTER_TO_INT(refcountp);
@@ -122,7 +121,10 @@ disco_remove_features(const char* plugin_name)
                 g_hash_table_replace(features, strdup(feature), GINT_TO_POINTER(refcount));
             }
         }
+
+        curr = g_list_next(curr);
     }
+    g_list_free(plugin_feature_list);
 }
 
 GList*

src/plugins/python_plugins.c

@@ -887,8 +887,8 @@ _python_undefined_error(ProfPlugin* plugin, char* hook, char* type)
     g_string_append(err_msg, hook);
     g_string_append(err_msg, "(): return value undefined, expected ");
     g_string_append(err_msg, type);
-    log_error("%s", err_msg->str);
-    cons_show_error("%s", err_msg->str);
+    log_error(err_msg->str);
+    cons_show_error(err_msg->str);
     g_string_free(err_msg, TRUE);
 }
 
@@ -901,8 +901,8 @@ _python_type_error(ProfPlugin* plugin, char* hook, char* type)
     g_string_append(err_msg, hook);
     g_string_append(err_msg, "(): incorrect return type, expected ");
     g_string_append(err_msg, type);
-    log_error("%s", err_msg->str);
-    cons_show_error("%s", err_msg->str);
+    log_error(err_msg->str);
+    cons_show_error(err_msg->str);
     g_string_free(err_msg, TRUE);
 }
 

src/profanity.c

@@ -135,7 +135,7 @@ prof_run(gchar* log_level, gchar* account_name, gchar* config_file, gchar* log_f
                          */
                         min_runtime += waittime;
                     } else {
-                        log_error("%s", err_msg);
+                        log_error(err_msg);
                         g_free(err_msg);
                         commands = NULL;
                     }
@@ -245,7 +245,7 @@ _init(char* log_level, char* config_file, char* log_file, char* theme_name)
     if (prof_log_level == PROF_LEVEL_DEBUG) {
         ProfWin* console = wins_get_console();
         win_println(console, THEME_DEFAULT, "-", "Debug mode enabled! Logging to: ");
-        win_println(console, THEME_DEFAULT, "-", "%s", get_log_file_location());
+        win_println(console, THEME_DEFAULT, "-", get_log_file_location());
     }
     session_init();
     cmd_init();

src/tools/http_upload.c

@@ -311,7 +311,7 @@ http_file_put(void* userdata)
             }
             win_update_entry_message(upload->window, upload->put_url, err_msg);
         }
-        cons_show_error("%s", err_msg);
+        cons_show_error(err_msg);
     } else {
         if (!upload->cancel) {
             auto_gchar gchar* status_msg = g_strdup_printf("Uploading '%s': 100%%", upload->filename);
@@ -327,7 +327,7 @@ http_file_put(void* userdata)
                 if (!fail_msg) {
                     fail_msg = g_strdup(FALLBACK_MSG);
                 }
-                cons_show_error("%s", fail_msg);
+                cons_show_error(fail_msg);
             } else {
                 switch (upload->window->type) {
                 case WIN_CHAT:

src/ui/buffer.c

@@ -140,10 +140,6 @@ void
 buffer_remove_entry(ProfBuff buffer, int entry)
 {
     GSList* node = g_slist_nth(buffer->entries, entry);
-    if (node == NULL) {
-        // Index out of range; nothing to remove
-        return;
-    }
     ProfBuffEntry* e = node->data;
     buffer->lines -= e->_lines;
     _free_entry(e);
@@ -172,9 +168,6 @@ ProfBuffEntry*
 buffer_get_entry(ProfBuff buffer, int entry)
 {
     GSList* node = g_slist_nth(buffer->entries, entry);
-    if (node == NULL) {
-        return NULL;
-    }
     return node->data;
 }
 
@@ -196,7 +189,6 @@ buffer_get_entry_by_id(ProfBuff buffer, const char* const id)
 static ProfBuffEntry*
 _create_entry(const char* show_char, int pad_indent, GDateTime* time, int flags, theme_item_t theme_item, const char* const display_from, const char* const from_jid, const char* const message, DeliveryReceipt* receipt, const char* const id, int y_start_pos, int y_end_pos)
 {
-    assert(time != NULL);
     ProfBuffEntry* e = malloc(sizeof(struct prof_buff_entry_t));
     e->show_char = STRDUP_OR_NULL(show_char);
     e->pad_indent = pad_indent;

src/ui/chatwin.c

@@ -592,11 +592,8 @@ chatwin_db_history(ProfChatWin* chatwin, const gchar* start_time, const gchar* e
 {
     auto_gchar gchar* _end_time = NULL;
     if (!end_time && buffer_size(((ProfWin*)chatwin)->layout->buffer) > 0) {
-        ProfBuffEntry* first = buffer_get_entry(((ProfWin*)chatwin)->layout->buffer, 0);
-        if (first && first->time) {
-            _end_time = g_date_time_format_iso8601(first->time);
-            end_time = _end_time;
-        }
+        _end_time = g_date_time_format_iso8601(buffer_get_entry(((ProfWin*)chatwin)->layout->buffer, 0)->time);
+        end_time = _end_time;
     }
 
     GSList* history = NULL;

src/ui/console.c

@@ -152,7 +152,7 @@ cons_bad_cmd_usage(const char* const cmd)
     g_string_printf(msg, "Invalid usage, see '/help %s' for details.", &cmd[1]);
 
     cons_show("");
-    cons_show("%s", msg->str);
+    cons_show(msg->str);
 
     g_string_free(msg, TRUE);
 }
@@ -773,7 +773,7 @@ cons_show_disco_info(const char* jid, GSList* identities, GSList* features)
             if (identity->category) {
                 identity_str = g_string_append(identity_str, identity->category);
             }
-            cons_show("%s", identity_str->str);
+            cons_show(identity_str->str);
             g_string_free(identity_str, TRUE);
             identities = g_slist_next(identities);
         }
@@ -938,7 +938,7 @@ cons_show_account_list(gchar** accounts)
                 theme_item_t presence_colour = theme_main_presence_attrs(string_from_resource_presence(presence));
                 win_println(console, presence_colour, "-", "%s", accounts[i]);
             } else {
-                cons_show("%s", accounts[i]);
+                cons_show(accounts[i]);
             }
         }
         cons_show("");
@@ -1019,7 +1019,7 @@ cons_show_account(ProfAccount* account)
             }
             curr = curr->next;
         }
-        cons_show("%s", manual->str);
+        cons_show(manual->str);
         g_string_free(manual, TRUE);
     }
     if (g_list_length(account->otr_opportunistic) > 0) {
@@ -1032,7 +1032,7 @@ cons_show_account(ProfAccount* account)
             }
             curr = curr->next;
         }
-        cons_show("%s", opportunistic->str);
+        cons_show(opportunistic->str);
         g_string_free(opportunistic, TRUE);
     }
     if (g_list_length(account->otr_always) > 0) {
@@ -1045,7 +1045,7 @@ cons_show_account(ProfAccount* account)
             }
             curr = curr->next;
         }
-        cons_show("%s", always->str);
+        cons_show(always->str);
         g_string_free(always, TRUE);
     }
 
@@ -2297,7 +2297,7 @@ cons_show_themes(GSList* themes)
     } else {
         cons_show("Available themes:");
         while (themes) {
-            cons_show("%s", themes->data);
+            cons_show(themes->data);
             themes = g_slist_next(themes);
         }
     }
@@ -2315,7 +2315,7 @@ cons_show_scripts(GSList* scripts)
     } else {
         cons_show("Scripts:");
         while (scripts) {
-            cons_show("%s", scripts->data);
+            cons_show(scripts->data);
             scripts = g_slist_next(scripts);
         }
     }

src/ui/core.c

@@ -445,7 +445,7 @@ ui_handle_error(const char* const err_msg)
     GString* msg = g_string_new("");
     g_string_printf(msg, "Error %s", err_msg);
 
-    cons_show_error("%s", msg->str);
+    cons_show_error(msg->str);
 
     g_string_free(msg, TRUE);
 }
@@ -461,7 +461,7 @@ ui_invalid_command_usage(const char* const cmd, void (*setting_func)(void))
         (*setting_func)();
     } else {
         cons_show("");
-        cons_show("%s", msg->str);
+        cons_show(msg->str);
         ProfWin* current = wins_get_current();
         if (current->type == WIN_CHAT) {
             win_println(current, THEME_DEFAULT, "-", "%s", msg->str);

src/ui/inputwin.c

@@ -144,14 +144,10 @@ void
 create_input_window(void)
 {
     /* MB_CUR_MAX is evaluated at runtime depending on the current
-     * locale; ensure our own compiled-in maximum is sufficient.
-     * Fail gracefully instead of aborting in production.
+     * locale, therefore we check that our own version is big enough
+     * and bail out if it isn't.
      */
-    if (MB_CUR_MAX > PROF_MB_CUR_MAX) {
-        log_error("Locale MB_CUR_MAX (%zu) exceeds compiled limit (%d)", (size_t)MB_CUR_MAX, PROF_MB_CUR_MAX);
-        cons_show_error("Unsupported locale. Before running, execute in terminal: export LC_ALL=C.UTF-8");
-        return;
-    }
+    assert(MB_CUR_MAX <= PROF_MB_CUR_MAX);
 #ifdef NCURSES_REENTRANT
     set_escdelay(25);
 #else
@@ -167,10 +163,6 @@ create_input_window(void)
     rl_callback_handler_install(NULL, _inp_rl_linehandler);
 
     inp_win = newpad(1, INP_WIN_MAX);
-    if (!inp_win) {
-        log_error("Failed to allocate input window pad");
-        return;
-    }
     wbkgd(inp_win, theme_attrs(THEME_INPUT_TEXT));
     keypad(inp_win, TRUE);
     wmove(inp_win, 0, 0);
@@ -246,9 +238,6 @@ inp_readline(void)
 void
 inp_win_resize(void)
 {
-    if (!inp_win) {
-        return;
-    }
     int col = getcurx(inp_win);
     int wcols = getmaxx(stdscr);
 
@@ -296,10 +285,8 @@ void
 inp_close(void)
 {
     rl_callback_handler_remove();
-    if (inp_win) {
-        delwin(inp_win);
-        inp_win = NULL;
-    }
+    delwin(inp_win);
+    inp_win = NULL;
     fclose(discard);
     discard = NULL;
 }
@@ -307,9 +294,6 @@ inp_close(void)
 char*
 inp_get_line(void)
 {
-    if (!inp_win) {
-        return NULL;
-    }
     werase(inp_win);
     wmove(inp_win, 0, 0);
     _inp_win_update_virtual();
@@ -334,9 +318,6 @@ inp_set_line(const char* const new_line)
 char*
 inp_get_password(void)
 {
-    if (!inp_win) {
-        return NULL;
-    }
     werase(inp_win);
     wmove(inp_win, 0, 0);
     _inp_win_update_virtual();

src/ui/statusbar.c

@@ -40,8 +40,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "log.h"
-
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
 #elif HAVE_NCURSES_H
@@ -113,24 +111,16 @@ status_bar_init(void)
 
     int row = screen_statusbar_row();
     int cols = getmaxx(stdscr);
-    if (cols <= 0) {
-        log_warning("status_bar_init: invalid cols %d, defaulting to 1", cols);
-        cols = 1;
-    }
     statusbar_win = newwin(1, cols, row, 0);
 
-    if (statusbar_win) {
-        status_bar_draw();
-    }
+    status_bar_draw();
 }
 
 void
 status_bar_close(void)
 {
-    if (statusbar_win) {
-        delwin(statusbar_win);
-        statusbar_win = NULL;
-    }
+    delwin(statusbar_win);
+    statusbar_win = NULL;
     if (statusbar) {
         if (statusbar->time) {
             g_free(statusbar->time);
@@ -155,14 +145,7 @@ status_bar_close(void)
 void
 status_bar_resize(void)
 {
-    if (!statusbar_win) {
-        return;
-    }
     int cols = getmaxx(stdscr);
-    if (cols <= 0) {
-        log_warning("status_bar_resize: invalid cols %d, defaulting to 1", cols);
-        cols = 1;
-    }
     werase(statusbar_win);
     int row = screen_statusbar_row();
     wresize(statusbar_win, 1, cols);
@@ -302,9 +285,6 @@ status_bar_clear_fulljid(void)
 void
 status_bar_draw(void)
 {
-    if (!statusbar_win) {
-        return;
-    }
     werase(statusbar_win);
     wbkgd(statusbar_win, theme_attrs(THEME_STATUS_TEXT));
 
@@ -694,13 +674,8 @@ _display_name(StatusBarTab* tab)
         fullname = g_strconcat(mucwin_title, " conf", NULL);
     } else if (tab->window_type == WIN_PRIVATE) {
         auto_jid Jid* jid = jid_create(tab->identifier);
-        if (jid) {
-            auto_gchar gchar* mucwin_title = mucwin_generate_title(jid->barejid, PREF_STATUSBAR_ROOM_TITLE);
-            fullname = g_strconcat(mucwin_title, "/", jid->resourcepart, NULL);
-        } else {
-            // Fallback: use identifier directly if JID parsing failed
-            fullname = strdup(tab->identifier);
-        }
+        auto_gchar gchar* mucwin_title = mucwin_generate_title(jid->barejid, PREF_STATUSBAR_ROOM_TITLE);
+        fullname = g_strconcat(mucwin_title, "/", jid->resourcepart, NULL);
     } else {
         fullname = strdup("window");
     }

src/ui/titlebar.c

@@ -73,16 +73,9 @@ void
 create_title_bar(void)
 {
     int cols = getmaxx(stdscr);
-    if (cols <= 0) {
-        cols = 1;
-    }
 
     int row = screen_titlebar_row();
     win = newwin(1, cols, row, 0);
-    if (!win) {
-        // Failed to create title bar window; skip initialization to avoid NULL deref
-        return;
-    }
     wbkgd(win, theme_attrs(THEME_TITLE_TEXT));
     title_bar_console();
     title_bar_set_presence(CONTACT_OFFLINE);
@@ -95,18 +88,13 @@ create_title_bar(void)
 void
 free_title_bar(void)
 {
-    if (win) {
-        delwin(win);
-        win = NULL;
-    }
+    delwin(win);
+    win = NULL;
 }
 
 void
 title_bar_update_virtual(void)
 {
-    if (!win) {
-        return;
-    }
     ProfWin* window = wins_get_current();
     if (window->type != WIN_CONSOLE) {
         if (typing_elapsed) {
@@ -126,13 +114,7 @@ title_bar_update_virtual(void)
 void
 title_bar_resize(void)
 {
-    if (!win) {
-        return;
-    }
     int cols = getmaxx(stdscr);
-    if (cols <= 0) {
-        cols = 1;
-    }
 
     werase(win);
 
@@ -149,9 +131,6 @@ title_bar_resize(void)
 void
 title_bar_console(void)
 {
-    if (!win) {
-        return;
-    }
     werase(win);
     if (typing_elapsed) {
         g_timer_destroy(typing_elapsed);
@@ -213,9 +192,6 @@ title_bar_set_typing(gboolean is_typing)
 static void
 _title_bar_draw(void)
 {
-    if (!win) {
-        return;
-    }
     int pos;
     int maxrightpos;
     ProfWin* current = wins_get_current();

src/ui/window.c

@@ -75,22 +75,12 @@ static void _win_print_internal(ProfWin* window, const char* show_char, int pad_
                                 int flags, theme_item_t theme_item, const char* const from, const char* const message, DeliveryReceipt* receipt);
 static void _win_print_wrapped(WINDOW* win, const char* const message, size_t indent, int pad_indent);
 
-// Helper: clamp a subwindow width to a sane range [1, cols-1] if possible
-static int
-_check_subwin_width(int cols, int width)
-{
-    return cols <= 1 ? 1 : CLAMP(width, 1, cols - 1);
-}
-
 int
 win_roster_cols(void)
 {
     int roster_win_percent = prefs_get_roster_size();
     int cols = getmaxx(stdscr);
-    int width = CEILING((((double)cols) / 100) * roster_win_percent);
-    // Clamp to a sane range to avoid zero/full-width pads
-    width = _check_subwin_width(cols, width);
-    return width;
+    return CEILING((((double)cols) / 100) * roster_win_percent);
 }
 
 int
@@ -98,10 +88,7 @@ win_occpuants_cols(void)
 {
     int occupants_win_percent = prefs_get_occupants_size();
     int cols = getmaxx(stdscr);
-    int width = CEILING((((double)cols) / 100) * occupants_win_percent);
-    // Clamp to a sane range to avoid zero/full-width pads
-    width = _check_subwin_width(cols, width);
-    return width;
+    return CEILING((((double)cols) / 100) * occupants_win_percent);
 }
 
 static ProfLayout*
@@ -157,7 +144,6 @@ win_create_console(void)
 ProfWin*
 win_create_chat(const char* const barejid)
 {
-    assert(barejid != NULL);
     ProfChatWin* new_win = malloc(sizeof(ProfChatWin));
     new_win->window.type = WIN_CHAT;
     new_win->window.scroll_state = WIN_SCROLL_INNER;
@@ -189,7 +175,6 @@ win_create_chat(const char* const barejid)
 ProfWin*
 win_create_muc(const char* const roomjid)
 {
-    assert(roomjid != NULL);
     ProfMucWin* new_win = malloc(sizeof(ProfMucWin));
     int cols = getmaxx(stdscr);
 
@@ -248,8 +233,6 @@ win_create_muc(const char* const roomjid)
 ProfWin*
 win_create_config(const char* const roomjid, DataForm* form, ProfConfWinCallback submit, ProfConfWinCallback cancel, const void* userdata)
 {
-    assert(roomjid != NULL);
-    assert(form != NULL);
     ProfConfWin* new_win = malloc(sizeof(ProfConfWin));
     new_win->window.type = WIN_CONFIG;
     new_win->window.scroll_state = WIN_SCROLL_INNER;
@@ -268,7 +251,6 @@ win_create_config(const char* const roomjid, DataForm* form, ProfConfWinCallback
 ProfWin*
 win_create_private(const char* const fulljid)
 {
-    assert(fulljid != NULL);
     ProfPrivateWin* new_win = malloc(sizeof(ProfPrivateWin));
     new_win->window.type = WIN_PRIVATE;
     new_win->window.scroll_state = WIN_SCROLL_INNER;
@@ -299,8 +281,6 @@ win_create_xmlconsole(void)
 ProfWin*
 win_create_plugin(const char* const plugin_name, const char* const tag)
 {
-    assert(plugin_name != NULL);
-    assert(tag != NULL);
     ProfPluginWin* new_win = malloc(sizeof(ProfPluginWin));
     new_win->window.type = WIN_PLUGIN;
     new_win->window.scroll_state = WIN_SCROLL_INNER;
@@ -317,7 +297,6 @@ win_create_plugin(const char* const plugin_name, const char* const tag)
 ProfWin*
 win_create_vcard(vCard* vcard)
 {
-    assert(vcard != NULL);
     ProfVcardWin* new_win = malloc(sizeof(ProfVcardWin));
     new_win->window.type = WIN_VCARD;
     new_win->window.scroll_state = WIN_SCROLL_INNER;
@@ -369,7 +348,7 @@ win_get_title(ProfWin* window)
         const ProfConfWin* confwin = (ProfConfWin*)window;
         assert(confwin->memcheck == PROFCONFWIN_MEMCHECK);
         auto_gchar gchar* mucwin_title = mucwin_generate_title(confwin->roomjid, PREF_TITLEBAR_MUC_TITLE);
-        if (confwin->form && confwin->form->modified) {
+        if (confwin->form->modified) {
             return g_strconcat(mucwin_title, " config *", NULL);
         }
         return g_strconcat(mucwin_title, " config", NULL);
@@ -577,25 +556,7 @@ win_show_subwin(ProfWin* window)
     }
 
     ProfLayoutSplit* layout = (ProfLayoutSplit*)window->layout;
-    // If a subwindow already exists (e.g. repeated call), destroy it to avoid leaks
-    if (layout->subwin) {
-        delwin(layout->subwin);
-        layout->subwin = NULL;
-    }
-
-    // Ensure minimum width to avoid creating a zero-width pad
-    if (subwin_cols <= 0) {
-        subwin_cols = 1;
-    }
-
     layout->subwin = newpad(PAD_SIZE, subwin_cols);
-    if (layout->subwin == NULL) {
-        // Failed to allocate subwindow; keep base window resized to full width
-        log_error("Failed to create subwindow pad (cols=%d)", subwin_cols);
-        wresize(layout->base.win, PAD_SIZE, cols);
-        win_redraw(window);
-        return;
-    }
     wbkgd(layout->subwin, theme_attrs(THEME_TEXT));
     wresize(layout->base.win, PAD_SIZE, cols - subwin_cols);
     win_redraw(window);
@@ -949,11 +910,6 @@ win_refresh_with_subwin(ProfWin* window)
     int row_end = screen_mainwin_row_end();
     ProfLayoutSplit* layout = (ProfLayoutSplit*)window->layout;
 
-    // Safety: if subwindow is not active, nothing to refresh
-    if (layout == NULL || layout->subwin == NULL) {
-        return;
-    }
-
     if (window->type == WIN_MUC) {
         subwin_cols = win_occpuants_cols();
     } else if (window->type == WIN_CONSOLE) {
@@ -2082,14 +2038,7 @@ win_print_loading_history(ProfWin* window)
     gboolean is_buffer_empty = buffer_size(window->layout->buffer) == 0;
 
     if (!is_buffer_empty) {
-        ProfBuffEntry* first = buffer_get_entry(window->layout->buffer, 0);
-        if (first && first->time) {
-            timestamp = first->time;
-        } else {
-            // Fallback to current time if entry/time is unavailable
-            timestamp = g_date_time_new_now_local();
-            is_buffer_empty = TRUE; // ensure we unref fallback timestamp below
-        }
+        timestamp = buffer_get_entry(window->layout->buffer, 0)->time;
     } else {
         timestamp = g_date_time_new_now_local();
     }
@@ -2289,7 +2238,7 @@ void
 win_handle_command_exec_result_note(ProfWin* window, const char* const type, const char* const value)
 {
     assert(window != NULL);
-    win_println(window, THEME_DEFAULT, "!", "%s", value);
+    win_println(window, THEME_DEFAULT, "!", value);
 }
 
 void

src/ui/window_list.c

@@ -407,10 +407,8 @@ wins_get_by_string(const char* str)
         if (barejid) {
             ProfChatWin* chatwin = wins_get_chat(barejid);
             if (chatwin) {
-                free(barejid);
                 return (ProfWin*)chatwin;
             }
-            free(barejid);
         }
     }
 
@@ -605,9 +603,6 @@ wins_new_xmlconsole(void)
 {
     int result = _wins_get_next_available_num(keys);
     ProfWin* newwin = win_create_xmlconsole();
-    if (!newwin) {
-        return NULL;
-    }
     _wins_htable_insert(windows, GINT_TO_POINTER(result), newwin);
     autocomplete_add(wins_ac, "xmlconsole");
     autocomplete_add(wins_close_ac, "xmlconsole");
@@ -619,9 +614,6 @@ wins_new_chat(const char* const barejid)
 {
     int result = _wins_get_next_available_num(keys);
     ProfWin* newwin = win_create_chat(barejid);
-    if (!newwin) {
-        return NULL;
-    }
     _wins_htable_insert(windows, GINT_TO_POINTER(result), newwin);
 
     autocomplete_add(wins_ac, barejid);
@@ -645,9 +637,6 @@ wins_new_muc(const char* const roomjid)
 {
     int result = _wins_get_next_available_num(keys);
     ProfWin* newwin = win_create_muc(roomjid);
-    if (!newwin) {
-        return NULL;
-    }
     _wins_htable_insert(windows, GINT_TO_POINTER(result), newwin);
     autocomplete_add(wins_ac, roomjid);
     autocomplete_add(wins_close_ac, roomjid);
@@ -662,9 +651,6 @@ wins_new_config(const char* const roomjid, DataForm* form, ProfConfWinCallback s
 {
     int result = _wins_get_next_available_num(keys);
     ProfWin* newwin = win_create_config(roomjid, form, submit, cancel, userdata);
-    if (!newwin) {
-        return NULL;
-    }
     _wins_htable_insert(windows, GINT_TO_POINTER(result), newwin);
 
     return newwin;
@@ -675,9 +661,6 @@ wins_new_private(const char* const fulljid)
 {
     int result = _wins_get_next_available_num(keys);
     ProfWin* newwin = win_create_private(fulljid);
-    if (!newwin) {
-        return NULL;
-    }
     _wins_htable_insert(windows, GINT_TO_POINTER(result), newwin);
     autocomplete_add(wins_ac, fulljid);
     autocomplete_add(wins_close_ac, fulljid);
@@ -692,9 +675,6 @@ wins_new_plugin(const char* const plugin_name, const char* const tag)
 {
     int result = _wins_get_next_available_num(keys);
     ProfWin* newwin = win_create_plugin(plugin_name, tag);
-    if (!newwin) {
-        return NULL;
-    }
     _wins_htable_insert(windows, GINT_TO_POINTER(result), newwin);
     autocomplete_add(wins_ac, tag);
     autocomplete_add(wins_close_ac, tag);
@@ -706,9 +686,6 @@ wins_new_vcard(vCard* vcard)
 {
     int result = _wins_get_next_available_num(keys);
     ProfWin* newwin = win_create_vcard(vcard);
-    if (!newwin) {
-        return NULL;
-    }
     _wins_htable_insert(windows, GINT_TO_POINTER(result), newwin);
 
     return newwin;

src/xmpp/capabilities.c

@@ -171,15 +171,16 @@ caps_get_features(void)
 {
     GList* result = NULL;
 
-    GHashTableIter iter;
-    gpointer key, value;
-    g_hash_table_iter_init(&iter, prof_features);
-    while (g_hash_table_iter_next(&iter, &key, &value)) {
-        result = g_list_append(result, strdup((char*)key));
+    GList* features_as_list = g_hash_table_get_keys(prof_features);
+    GList* curr = features_as_list;
+    while (curr) {
+        result = g_list_append(result, strdup(curr->data));
+        curr = g_list_next(curr);
     }
+    g_list_free(features_as_list);
 
     GList* plugin_features = plugins_get_disco_features();
-    GList* curr = plugin_features;
+    curr = plugin_features;
     while (curr) {
         result = g_list_append(result, strdup(curr->data));
         curr = g_list_next(curr);

src/xmpp/connection.c

@@ -148,7 +148,7 @@ connection_init(void)
     if (string_to_verbosity(v, &verbosity, &err_msg)) {
         xmpp_ctx_set_verbosity(conn.xmpp_ctx, verbosity);
     } else {
-        cons_show("%s", err_msg);
+        cons_show(err_msg);
     }
     conn.xmpp_conn = xmpp_conn_new(conn.xmpp_ctx);
 
@@ -638,18 +638,22 @@ gboolean
 connection_supports(const char* const feature)
 {
     gboolean ret = FALSE;
-    GHashTableIter iter;
-    gpointer key, value;
+    GList* jids = g_hash_table_get_keys(conn.features_by_jid);
 
-    g_hash_table_iter_init(&iter, conn.features_by_jid);
-    while (g_hash_table_iter_next(&iter, &key, &value)) {
-        GHashTable* features = (GHashTable*)value;
+    GList* curr = jids;
+    while (curr) {
+        char* jid = curr->data;
+        GHashTable* features = g_hash_table_lookup(conn.features_by_jid, jid);
         if (features && g_hash_table_lookup(features, feature)) {
             ret = TRUE;
             break;
         }
+
+        curr = g_list_next(curr);
     }
 
+    g_list_free(jids);
+
     return ret;
 }
 
@@ -660,17 +664,22 @@ connection_jid_for_feature(const char* const feature)
         return NULL;
     }
 
-    GHashTableIter iter;
-    gpointer key, value;
+    GList* jids = g_hash_table_get_keys(conn.features_by_jid);
 
-    g_hash_table_iter_init(&iter, conn.features_by_jid);
-    while (g_hash_table_iter_next(&iter, &key, &value)) {
-        GHashTable* features = (GHashTable*)value;
+    GList* curr = jids;
+    while (curr) {
+        char* jid = curr->data;
+        GHashTable* features = g_hash_table_lookup(conn.features_by_jid, jid);
         if (features && g_hash_table_lookup(features, feature)) {
-            return (const char*)key;
+            g_list_free(jids);
+            return jid;
         }
+
+        curr = g_list_next(curr);
     }
 
+    g_list_free(jids);
+
     return NULL;
 }
 
@@ -1025,7 +1034,7 @@ _connection_handler(xmpp_conn_t* const xmpp_conn, const xmpp_conn_event_t status
                 conn.sm_state = xmpp_conn_get_sm_state(conn.xmpp_conn);
                 if (send_queue_len > 0 && prefs_get_boolean(PREF_STROPHE_SM_RESEND)) {
                     conn.queued_messages = calloc(send_queue_len + 1, sizeof(*conn.queued_messages));
-                    for (int n = 0; n < send_queue_len; ++n) {
+                    for (int n = 0; n < send_queue_len && conn.queued_messages[n]; ++n) {
                         conn.queued_messages[n] = xmpp_conn_send_queue_drop_element(conn.xmpp_conn, XMPP_QUEUE_OLDEST);
                     }
                 } else if (send_queue_len > 0) {
@@ -1180,13 +1189,12 @@ connection_debug_print_features()
             continue;
         }
 
-        GHashTableIter feature_iter;
-        gpointer feature_key, feature_value;
-        g_hash_table_iter_init(&feature_iter, features);
-        while (g_hash_table_iter_next(&feature_iter, &feature_key, &feature_value)) {
-            const char* feature = (const char*)feature_key;
+        GList* feature_keys = g_hash_table_get_keys(features);
+        for (GList* l = feature_keys; l != NULL; l = l->next) {
+            const char* feature = (const char*)l->data;
             log_debug("%s:\t%s", jid, feature);
         }
+        g_list_free(feature_keys);
     }
 
     log_debug("=== End of Features ===");

src/xmpp/form.c

@@ -437,7 +437,18 @@ form_get_form_type_field(DataForm* form)
 gboolean
 form_tag_exists(DataForm* form, const char* const tag)
 {
-    return g_hash_table_contains(form->tag_to_var, tag);
+    GList* tags = g_hash_table_get_keys(form->tag_to_var);
+    GList* curr = tags;
+    while (curr) {
+        if (g_strcmp0(curr->data, tag) == 0) {
+            g_list_free(tags);
+            return TRUE;
+        }
+        curr = g_list_next(curr);
+    }
+
+    g_list_free(tags);
+    return FALSE;
 }
 
 form_field_type_t

src/xmpp/iq.c

@@ -2532,6 +2532,9 @@ _disco_items_result_handler(xmpp_stanza_t* const stanza)
     }
 
     xmpp_stanza_t* child = xmpp_stanza_get_children(query);
+    if (child == NULL) {
+        return;
+    }
 
     while (child) {
         const char* stanza_name = xmpp_stanza_get_name(child);

src/xmpp/message.c

@@ -868,7 +868,7 @@ _handle_error(xmpp_stanza_t* const stanza)
     g_string_append(log_msg, " error=");
     g_string_append(log_msg, err_msg);
 
-    log_info("%s", log_msg->str);
+    log_info(log_msg->str);
 
     g_string_free(log_msg, TRUE);
 

src/xmpp/ox.c

@@ -326,7 +326,7 @@ _ox_metadata_result(xmpp_stanza_t* const stanza, void* const userdata)
 
         if (fingerprint) {
             if (strlen(fingerprint) == KEYID_LENGTH) {
-                cons_show("%s", fingerprint);
+                cons_show(fingerprint);
             } else {
                 cons_show("OX: Wrong char size of public key");
                 log_error("[OX] Wrong chat size of public key %s", fingerprint);

src/xmpp/presence.c

@@ -455,7 +455,7 @@ _presence_error_handler(xmpp_stanza_t* const stanza)
     g_string_append(log_msg, " error=");
     g_string_append(log_msg, err_msg);
 
-    log_info("%s", log_msg->str);
+    log_info(log_msg->str);
 
     g_string_free(log_msg, TRUE);
 

tests/functionaltests/functionaltests.c

@@ -15,14 +15,17 @@
  * functional tests run less frequently than unit tests.
  *
  * Tests are organized into groups for better maintainability and parallel execution:
- *   Group 1: Connect, Ping, Rooms, Software
- *   Group 2: Message, Receipts, Roster, Chat Session
- *   Group 3: Presence, Disconnect
- *   Group 4: MUC, Carbons
+ *   Group 1: Connect, Ping, Rooms, Software (17 tests)
+ *   Group 2: Message, Receipts, Roster, Chat Session (17 tests)
+ *   Group 3: Presence (16 tests)
+ *   Group 4: MUC, Carbons (19 tests)
  *
  * Parallel execution:
  *   ./functionaltests        - run all tests sequentially
- *   ./functionaltests N      - run group N only (N = 1..num_groups)
+ *   ./functionaltests 1      - run group 1 only
+ *   ./functionaltests 2      - run group 2 only
+ *   ./functionaltests 3      - run group 3 only
+ *   ./functionaltests 4      - run group 4 only
  *
  * For parallel execution, run multiple groups simultaneously:
  *   ./functionaltests 1 & ./functionaltests 2 & ./functionaltests 3 & ./functionaltests 4 & wait
@@ -38,7 +41,6 @@
 
 #include "config.h"
 
-#include "common.h"
 #include "proftest.h"
 #include "test_connect.h"
 #include "test_ping.h"
@@ -52,7 +54,6 @@
 #include "test_software.h"
 #include "test_muc.h"
 #include "test_disconnect.h"
-#include "test_lastactivity.h"
 
 /* Macro to wrap each test with setup/teardown functions */
 #define PROF_FUNC_TEST(test) cmocka_unit_test_setup_teardown(test, init_prof_test, close_prof_test)
@@ -70,18 +71,11 @@ main(int argc, char* argv[])
         }
     }
 
-    char group_env[16];
-    snprintf(group_env, sizeof(group_env), "%d", group);
-    setenv("PROF_TEST_GROUP", group_env, 1);
-    
-    fprintf(stderr, "[PROF_TEST] Starting functional tests, group=%d\n", group);
+    /* GROUP 1: Connect, Ping, Rooms, Software (17 tests)
+     * Basic XMPP session establishment and server queries */
 
-    /* ============================================================
-     * GROUP 1: Connect, Ping, Rooms, Software
-     * Basic XMPP session establishment and server queries
-     * ============================================================ */
+    /* Connection tests - verify login, roster, bookmarks */
     const struct CMUnitTest group1_tests[] = {
-        /* Connection tests - verify login, roster, bookmarks */
         PROF_FUNC_TEST(connect_jid_requests_roster),
         PROF_FUNC_TEST(connect_jid_sends_presence_after_receiving_roster),
         PROF_FUNC_TEST(connect_jid_requests_bookmarks),
@@ -105,17 +99,12 @@ main(int argc, char* argv[])
         PROF_FUNC_TEST(display_software_version_result_when_from_domainpart),
         PROF_FUNC_TEST(show_message_in_chat_window_when_no_resource),
         PROF_FUNC_TEST(display_software_version_result_in_chat),
-
-        /* Last Activity - XEP-0012 */
-        PROF_FUNC_TEST(responds_to_last_activity_request),
-        PROF_FUNC_TEST(last_activity_request_to_contact),
     };
 
-    /* ============================================================
-     * GROUP 2: Message, Receipts, Roster, Chat Session
-     * Core messaging and contact management
-     * ============================================================ */
+    /* GROUP 2: Message, Receipts, Roster, Chat Session (17 tests)
+     * Core messaging and contact management */
     const struct CMUnitTest group2_tests[] = {
+
         /* Basic message send/receive */
         PROF_FUNC_TEST(message_send),
         PROF_FUNC_TEST(message_receive_console),
@@ -142,10 +131,8 @@ main(int argc, char* argv[])
         PROF_FUNC_TEST(new_session_when_message_received_from_different_fulljid),
     };
 
-    /* ============================================================
-     * GROUP 3: Presence, Disconnect
-     * Online/away/xa/dnd/chat status management
-     * ============================================================ */
+    /* GROUP 3: Presence (16 tests)
+     * Online/away/xa/dnd/chat status management */
     const struct CMUnitTest group3_tests[] = {
         PROF_FUNC_TEST(presence_online),
         PROF_FUNC_TEST(presence_online_with_message),
@@ -167,11 +154,10 @@ main(int argc, char* argv[])
         PROF_FUNC_TEST(disconnect_ends_session),
     };
 
-    /* ============================================================
-     * GROUP 4: MUC, Carbons
-     * Multi-user chat and message synchronization
-     * ============================================================ */
+    /* GROUP 4: MUC, Carbons (19 tests)
+     * Multi-user chat and message synchronization */
     const struct CMUnitTest group4_tests[] = {
+
         /* MUC room join with various options - XEP-0045 */
         PROF_FUNC_TEST(sends_room_join),
         PROF_FUNC_TEST(sends_room_join_with_nick),
@@ -193,10 +179,6 @@ main(int argc, char* argv[])
         PROF_FUNC_TEST(shows_first_message_in_console_when_window_not_focussed),
         PROF_FUNC_TEST(shows_no_message_in_console_when_window_not_focussed),
 
-        /* MUC moderation - XEP-0045 room admin */
-        PROF_FUNC_TEST(sends_affiliation_list_request),
-        PROF_FUNC_TEST(sends_kick_request),
-
         /* Message Carbons - XEP-0280 (message sync across devices) */
         PROF_FUNC_TEST(send_enable_carbons),
         PROF_FUNC_TEST(connect_with_carbons_enabled),
@@ -206,31 +188,28 @@ main(int argc, char* argv[])
         PROF_FUNC_TEST(receive_private_carbon),
     };
 
-    /* Test group registry for easy extension */
-    struct {
-        const char* name;
-        const struct CMUnitTest* tests;
-        size_t count;
-    } groups[] = {
-        { "Group 1: Connect/Ping/Rooms/Software", group1_tests, ARRAY_SIZE(group1_tests) },
-        { "Group 2: Message/Receipts/Roster/Session", group2_tests, ARRAY_SIZE(group2_tests) },
-        { "Group 3: Presence/Disconnect", group3_tests, ARRAY_SIZE(group3_tests) },
-        { "Group 4: MUC/Carbons", group4_tests, ARRAY_SIZE(group4_tests) },
-    };
-    const int num_groups = ARRAY_SIZE(groups);
-
     int result = 0;
 
-    if (group > 0 && group <= num_groups) {
-        /* Run specific group */
-        result = _cmocka_run_group_tests(groups[group - 1].name, groups[group - 1].tests,
-                                         groups[group - 1].count, NULL, NULL);
-    } else {
-        /* Run all groups sequentially */
-        for (int i = 0; i < num_groups; i++) {
-            result |= _cmocka_run_group_tests(groups[i].name, groups[i].tests,
-                                              groups[i].count, NULL, NULL);
-        }
+    switch (group) {
+        case 1:
+            result = cmocka_run_group_tests_name("Group 1: Connect/Ping/Rooms/Software", group1_tests, NULL, NULL);
+            break;
+        case 2:
+            result = cmocka_run_group_tests_name("Group 2: Message/Receipts/Roster/Session", group2_tests, NULL, NULL);
+            break;
+        case 3:
+            result = cmocka_run_group_tests_name("Group 3: Presence", group3_tests, NULL, NULL);
+            break;
+        case 4:
+            result = cmocka_run_group_tests_name("Group 4: MUC/Carbons", group4_tests, NULL, NULL);
+            break;
+        default:
+            /* Run all groups sequentially */
+            result |= cmocka_run_group_tests_name("Group 1: Connect/Ping/Rooms/Software", group1_tests, NULL, NULL);
+            result |= cmocka_run_group_tests_name("Group 2: Message/Receipts/Roster/Session", group2_tests, NULL, NULL);
+            result |= cmocka_run_group_tests_name("Group 3: Presence", group3_tests, NULL, NULL);
+            result |= cmocka_run_group_tests_name("Group 4: MUC/Carbons", group4_tests, NULL, NULL);
+            break;
     }
 
     return result;

tests/functionaltests/proftest.c

@@ -17,9 +17,6 @@
 
 #include "proftest.h"
 
-/* Number of parallel test groups for CI builds */
-#define TEST_GROUPS 4
-
 char *config_orig;
 char *data_orig;
 
@@ -139,14 +136,8 @@ _create_logs_dir(void)
 void
 _cleanup_dirs(void)
 {
-    const char *group_env = getenv("PROF_TEST_GROUP");
-    int group = group_env ? atoi(group_env) : 0;
-    int dir_id = (group >= 1 && group <= TEST_GROUPS) ? group : stub_port;
-    
-    printf("[PROF_TEST] Cleaning up directories for group %d (dir_id %d)\n", group, dir_id);
-    
     char cmd[512];
-    snprintf(cmd, sizeof(cmd), "rm -rf ./test-files/%d", dir_id);
+    snprintf(cmd, sizeof(cmd), "rm -rf ./tests/functionaltests/files/%d", stub_port);
     int res = system(cmd);
     if (res == -1) {
         assert_true(FALSE);
@@ -230,74 +221,30 @@ prof_start(void)
     /* Set non-blocking mode for reading */
     int flags = fcntl(fd, F_GETFL, 0);
     fcntl(fd, F_SETFL, flags | O_NONBLOCK);
-    
-    /* Brief wait for process to initialize */
-    usleep(50000);  /* 50ms */
 }
 
 int
 init_prof_test(void **state)
 {
-    /* Get test group from environment for static resource allocation */
-    const char *group_env = getenv("PROF_TEST_GROUP");
-    int group = group_env ? atoi(group_env) : 0;
-    
-    /* Get build index for port offset (for parallel CI builds) */
-    const char *build_env = getenv("PROF_BUILD_INDEX");
-    int build_idx = build_env ? atoi(build_env) : 0;
-    
-    /* Calculate port base: each build uses a different range of TEST_GROUPS ports.
-     * Build 0 (local/default): 5230-5233, Full: 5230-5233, Minimal: 5234-5237, etc.
-     * Build 0 and Full share the same range because build 0 is for local runs or sequential run (no parallel builds),
-     * while Full/Minimal/NoEncrypt/Default are used in CI where they run in parallel. */
-    int port_base = 5230 + ((build_idx > 0 ? build_idx - 1 : 0) * TEST_GROUPS);
-    
-    /* Static resource allocation to avoid conflicts in parallel execution.
-     * Group 1-4: use static port assignment.
-     * Group 0 (all groups): use dynamic allocation as fallback. */
     gboolean started = FALSE;
-    
-    if (group >= 1 && group <= TEST_GROUPS) {
-        /* Static allocation: each group gets a dedicated port */
-        stub_port = port_base + group - 1;
-        printf("[PROF_TEST] Build %d, Group %d: trying port %d\n", build_idx, group, stub_port);
-        
-        if (stbbr_start(STBBR_LOGDEBUG, stub_port, 0) == 0) {
+    for (int p = 5230; p < 5250; ++p) {
+        int ret = stbbr_start(STBBR_LOGDEBUG, p, 0);
+        if (ret == 0) {
+            stub_port = p;
             started = TRUE;
-            printf("[PROF_TEST] Started stabber on port %d\n", stub_port);
-        } else {
-            printf("[PROF_TEST] Failed to start stabber on port %d\n", stub_port);
+            break;
         }
     }
-    
-    /* Fallback to dynamic allocation if static failed or group=0 */
     if (!started) {
-        printf("[PROF_TEST] Using dynamic port allocation\n");
-        for (int p = port_base; p < port_base + 20; ++p) {
-            if (stbbr_start(STBBR_LOGDEBUG, p, 0) == 0) {
-                stub_port = p;
-                started = TRUE;
-                printf("[PROF_TEST] Started stabber on port %d\n", stub_port);
-                break;
-            }
-        }
-    }
-    
-    if (!started) {
-        fprintf(stderr, "[PROF_TEST] ERROR: could not start stabber on any port\n");
+        assert_true(FALSE); // could not start stabber on any port in range
         return -1;
     }
 
-    /* Generate unique XDG paths based on group for parallel execution.
-     * Use ./test-files/ in current (build) directory for out-of-tree builds compatibility. */
-    int dir_id = (group >= 1 && group <= TEST_GROUPS) ? group : stub_port;
+    // Generate unique XDG paths based on stub_port for parallel execution
     snprintf(xdg_config_home, sizeof(xdg_config_home),
-             "./test-files/%d/xdg_config_home", dir_id);
+             "./tests/functionaltests/files/%d/xdg_config_home", stub_port);
     snprintf(xdg_data_home, sizeof(xdg_data_home),
-             "./test-files/%d/xdg_data_home", dir_id);
-    
-    printf("[PROF_TEST] Group %d using directories: config=%s, data=%s\n", 
-           group, xdg_config_home, xdg_data_home);
+             "./tests/functionaltests/files/%d/xdg_data_home", stub_port);
 
     // Give stabber server thread time to start listening
     usleep(100000); // 100ms
@@ -315,20 +262,6 @@ init_prof_test(void **state)
     _create_chatlogs_dir();
     _create_logs_dir();
 
-    /* If PROF_FLATFILE=1 is set, write a profrc that selects the flat-file backend */
-    const char *flatfile_env = getenv("PROF_FLATFILE");
-    if (flatfile_env && strcmp(flatfile_env, "1") == 0) {
-        char profrc_path[512];
-        snprintf(profrc_path, sizeof(profrc_path),
-                 "%s/profanity/profrc", xdg_config_home);
-        FILE *prc = fopen(profrc_path, "w");
-        if (prc) {
-            fprintf(prc, "[logging]\ndblog=flatfile\n");
-            fclose(prc);
-            printf("[PROF_TEST] Wrote profrc with dblog=flatfile: %s\n", profrc_path);
-        }
-    }
-
     prof_start();
     int prof_started = prof_output_regex("CProof\\. Type /help for help information\\.");
     assert_true(prof_started);
@@ -468,16 +401,6 @@ prof_output_regex(const char *pattern)
         usleep(50000);  /* 50ms */
     }
     
-    /* Timeout reached - log diagnostic info */
-    fprintf(stderr, "Timeout waiting for regex '%s' after %d seconds. Last output:\n", pattern, expect_timeout);
-    size_t len = strlen(output_buffer);
-    if (len > 500) {
-        fprintf(stderr, "...%s", output_buffer + len - 500);
-    } else {
-        fprintf(stderr, "%s", output_buffer);
-    }
-    fprintf(stderr, "\n");
-    
     regfree(&regex);
     return 0;
 }

tests/functionaltests/proftest.h

@@ -2,9 +2,9 @@
 #define __H_PROFTEST
 
 /*
- * XDG paths are dynamic and generated per-test based on stub_port.
- * Each test instance uses unique directories (./tests/functionaltests/files/{port}/xdg_*)
- * to allow parallel test execution without file conflicts.
+ * XDG paths are now dynamic, generated per-test based on stub_port.
+ * This allows parallel test execution without file conflicts.
+ * Use xdg_config_home and xdg_data_home variables instead of macros.
  */
 extern char xdg_config_home[256];
 extern char xdg_data_home[256];

tests/functionaltests/test_lastactivity.c

@@ -1,63 +0,0 @@
-/*
- * test_lastactivity.c
- * Functional tests for Last Activity (XEP-0012)
- */
-#include <glib.h>
-#include "prof_cmocka.h"
-#include <stdlib.h>
-#include <string.h>
-
-#include <stabber.h>
-
-#include "proftest.h"
-
-void
-responds_to_last_activity_request(void **state)
-{
-    prof_connect();
-
-    // Send incoming last activity request
-    stbbr_send(
-        "<iq id='last1' type='get' to='stabber@localhost/profanity' from='buddy1@localhost/mobile'>"
-            "<query xmlns='jabber:iq:last'/>"
-        "</iq>"
-    );
-
-    // Verify that CProof responds with last activity info
-    // The 'seconds' attribute indicates idle time
-    assert_true(stbbr_received(
-        "<iq id='last1' type='result' to='buddy1@localhost/mobile'>"
-            "<query xmlns='jabber:iq:last' seconds='*'/>"
-        "</iq>"
-    ));
-}
-
-void
-last_activity_request_to_contact(void **state)
-{
-    prof_connect();
-
-    stbbr_send(
-        "<presence to='stabber@localhost' from='buddy1@localhost/mobile'>"
-            "<priority>10</priority>"
-            "<status>I'm here</status>"
-        "</presence>"
-    );
-    assert_true(prof_output_exact("Buddy1 (mobile) is online, \"I'm here\""));
-
-    // Register response for last activity query
-    stbbr_for_query("jabber:iq:last",
-        "<iq id='*' type='result' from='buddy1@localhost/mobile' to='stabber@localhost/profanity'>"
-            "<query xmlns='jabber:iq:last' seconds='120'/>"
-        "</iq>"
-    );
-
-    prof_input("/lastactivity get buddy1@localhost/mobile");
-
-    // Verify the request was sent
-    assert_true(stbbr_received(
-        "<iq id='*' to='buddy1@localhost/mobile' type='get'>"
-            "<query xmlns='jabber:iq:last'/>"
-        "</iq>"
-    ));
-}

tests/functionaltests/test_lastactivity.h

@@ -1,7 +0,0 @@
-/*
- * test_lastactivity.h
- * Header for Last Activity tests (XEP-0012)
- */
-
-void responds_to_last_activity_request(void **state);
-void last_activity_request_to_contact(void **state);

tests/functionaltests/test_muc.c

@@ -393,83 +393,3 @@ shows_no_message_in_console_when_window_not_focussed(void **state)
     assert_false(prof_output_regex("testroom@conference\\.localhost \\(win 2\\)"));
     prof_timeout_reset();
 }
-
-void
-sends_affiliation_list_request(void **state)
-{
-    prof_connect();
-
-    stbbr_for_presence_to("testroom@conference.localhost/stabber",
-        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
-            "<x xmlns='http://jabber.org/protocol/muc#user'>"
-                "<item role='moderator' jid='stabber@localhost/profanity' affiliation='owner'/>"
-            "</x>"
-            "<status code='110'/>"
-        "</presence>"
-    );
-
-    prof_input("/join testroom@conference.localhost");
-    assert_true(prof_output_regex("-> You have joined the room as stabber, role: moderator, affiliation: owner"));
-
-    prof_input("/affiliation owner list");
-
-    assert_true(stbbr_received(
-        "<iq id='*' to='testroom@conference.localhost' type='get'>"
-            "<query xmlns='http://jabber.org/protocol/muc#admin'>"
-                "<item affiliation='owner'/>"
-            "</query>"
-        "</iq>"
-    ));
-}
-
-void
-sends_kick_request(void **state)
-{
-    prof_connect();
-
-    // Enable MUC presence messages to see occupant join/leave
-    prof_input("/presence room all");
-    assert_true(prof_output_regex("All presence updates will appear"));
-
-    stbbr_for_presence_to("testroom@conference.localhost/stabber",
-        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
-            "<x xmlns='http://jabber.org/protocol/muc#user'>"
-                "<item role='moderator' jid='stabber@localhost/profanity' affiliation='admin'/>"
-            "</x>"
-            "<status code='110'/>"
-        "</presence>"
-    );
-
-    prof_input("/join testroom@conference.localhost");
-    assert_true(prof_output_regex("-> You have joined the room as stabber, role: moderator, affiliation: admin"));
-
-    // Simulate another user in the room
-    stbbr_send(
-        "<presence to='stabber@localhost/profanity' from='testroom@conference.localhost/baduser'>"
-            "<x xmlns='http://jabber.org/protocol/muc#user'>"
-                "<item role='participant' jid='baduser@localhost/phone' affiliation='none'/>"
-            "</x>"
-        "</presence>"
-    );
-    sleep(1);
-    assert_true(prof_output_regex("baduser has joined"));
-
-    // Register success response for kick
-    stbbr_for_query("http://jabber.org/protocol/muc#admin",
-        "<iq id='*' type='result' from='testroom@conference.localhost'/>"
-    );
-
-    prof_input("/kick baduser \"spamming\"");
-
-    assert_true(stbbr_received(
-        "<iq id='*' to='testroom@conference.localhost' type='set'>"
-            "<query xmlns='http://jabber.org/protocol/muc#admin'>"
-                "<item nick='baduser' role='none'>"
-                    "<reason>spamming</reason>"
-                "</item>"
-            "</query>"
-        "</iq>"
-    ));
-}

tests/functionaltests/test_muc.h

@@ -12,5 +12,3 @@ void shows_me_message_from_self(void **state);
 void shows_all_messages_in_console_when_window_not_focussed(void **state);
 void shows_first_message_in_console_when_window_not_focussed(void **state);
 void shows_no_message_in_console_when_window_not_focussed(void **state);
-void sends_affiliation_list_request(void **state);
-void sends_kick_request(void **state);

tests/unittests/database/stub_database.c

@@ -23,11 +23,8 @@
 #include <glib.h>
 #include "prof_cmocka.h"
 
-#include "config.h"
 #include "database.h"
 
-db_backend_t* active_db_backend = NULL;
-
 gboolean
 log_database_init(ProfAccount* account)
 {
@@ -53,44 +50,3 @@ void
 log_database_close(void)
 {
 }
-GSList*
-log_database_verify_integrity(const gchar* const contact_barejid)
-{
-    return NULL;
-}
-void
-integrity_issue_free(integrity_issue_t* issue)
-{
-    if (issue) {
-        g_free(issue->file);
-        g_free(issue->message);
-        g_free(issue);
-    }
-}
-#ifdef HAVE_SQLITE
-db_backend_t*
-db_backend_sqlite(void)
-{
-    return NULL;
-}
-GSList*
-db_sqlite_list_contacts(void)
-{
-    return NULL;
-}
-int
-log_database_export_to_flatfile(const gchar* const contact_jid)
-{
-    return 0;
-}
-int
-log_database_import_from_flatfile(const gchar* const contact_jid)
-{
-    return 0;
-}
-#endif
-db_backend_t*
-db_backend_flatfile(void)
-{
-    return NULL;
-}