From 773e3ea497a38b3cfd8d92d5abcfa320368f37e1 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Mon, 13 Jul 2026 10:03:15 +0800 Subject: [PATCH] TerminalFont: small code cleanups --- src/detection/terminalfont/terminalfont.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/detection/terminalfont/terminalfont.c b/src/detection/terminalfont/terminalfont.c index a5a9c801f..db0f61b4d 100644 --- a/src/detection/terminalfont/terminalfont.c +++ b/src/detection/terminalfont/terminalfont.c @@ -66,10 +66,10 @@ static void detectAlacritty(FFTerminalFontResult* terminalFont) { ffFontInitMoveValues(&terminalFont->font, &fontFamily, &fontSize, &fontStyle); } -// Maximum number of `config-file` directives to follow, guarding against runaway includes -#define FF_GHOSTTY_MAX_CONFIG_FILES 16 - static void parseGhosttyConfig(const FFstrbuf* path, FFstrbuf* fontName, FFstrbuf* fontNameFallback, FFstrbuf* fontSize, FFlist* configFiles /* list of FFstrbuf */) { + // Maximum number of `config-file` directives to follow, guarding against runaway includes + enum { FF_GHOSTTY_MAX_CONFIG_FILES = 16 }; + FF_DEBUG("parsing config: %s", path->chars); FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate(); @@ -100,8 +100,7 @@ static void parseGhosttyConfig(const FFstrbuf* path, FFstrbuf* fontName, FFstrbu // Doc: https://ghostty.org/docs/config/reference#config-file // A leading `?` suppresses errors if the file doesn't exist; missing files are skipped here either way ffStrbufTrimLeft(&temp, '?'); - ffStrbufTrimLeft(&temp, '"'); - ffStrbufTrimRight(&temp, '"'); + ffStrbufTrim(&temp, '"'); if (temp.length == 0) { continue; }