Wifi (macOS): adds comments

IO (Windows): fixes blocking forever on incomplete terminal responses
Same issue as on Unix: ffGetTerminalResponse() waits for input only before the first ReadFile(). If the terminal answers only part of the request (e.g. one of the two OSC 10/11 replies), the next ReadFile() blocks forever. Wait with the same timeout before every subsequent ReadFile() as well, and restore the console mode on that error path. While waiting, also skip key-up records: ReadFile() returns no data for them, so one left alone in the buffer would end the wait and the following ReadFile() would block.
2026-10-29 11:10:59 +01:00 · 2026-10-29 14:05:41 +08:00 · 2026-10-28 09:17:24 +08:00 · 2026-10-28 09:17:24 +08:00 · 2026-10-26 00:34:50 -05:00
24 changed files with 110 additions and 73 deletions
@@ -157,7 +157,7 @@ jobs:
          ls -l fastfetch

      - name: upload artifacts
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: fastfetch-android-${{ inputs.abi }}
          path: ./fastfetch-*.*
@@ -17,7 +17,7 @@ jobs:
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

      - name: download benchmark data
-        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
        with:
          pattern: benchmark-*
          path: benchmarks
@@ -60,7 +60,7 @@ jobs:
        run: ctest --output-on-failure

      - name: upload artifacts
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: fastfetch-dragonfly-amd64
          path: ./fastfetch-*.*
@@ -61,7 +61,7 @@ jobs:
        run: ctest --output-on-failure

      - name: upload artifacts
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: fastfetch-freebsd-amd64
          path: ./fastfetch-*.*
@@ -53,7 +53,7 @@ jobs:
        run: ctest --output-on-failure

      - name: upload artifacts
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: fastfetch-haiku-amd64
          path: ./fastfetch-*.*
@@ -41,7 +41,7 @@ jobs:
            ctest --output-on-failure

      - name: upload artifacts
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: fastfetch-linux-armv7l
          path: ./fastfetch-*.*
@@ -52,7 +52,7 @@ jobs:

      - name: Initialize CodeQL
        if: inputs.arch == 'amd64'
-        uses: github/codeql-action/init@6f2ac81f5cd81fe351a197ba0b00d91d03cd2aee # v4.39.0
+        uses: github/codeql-action/init@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
        with:
          languages: c

@@ -64,7 +64,7 @@ jobs:

      - name: perform CodeQL analysis
        if: inputs.arch == 'amd64'
-        uses: github/codeql-action/analyze@6f2ac81f5cd81fe351a197ba0b00d91d03cd2aee # v4.39.0
+        uses: github/codeql-action/analyze@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2

      - name: list features
        run: ./fastfetch --list-features
@@ -123,13 +123,13 @@ jobs:
          cpack -V

      - name: upload artifacts
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: fastfetch-linux-${{ inputs.arch }}
          path: ./fastfetch-*.*

      - name: upload benchmark data
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: benchmark-linux-${{ inputs.arch }}
          path: benchmark.json
@@ -67,7 +67,7 @@ jobs:
        run: ctest --output-on-failure

      - name: upload artifacts
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: fastfetch-linux-i686
          path: ./fastfetch-*.*
@@ -54,7 +54,7 @@ jobs:
            '

      - name: upload artifacts
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: fastfetch-linux-loong64
          path: ./fastfetch-*.*
@@ -42,7 +42,7 @@ jobs:
            ctest --output-on-failure

      - name: upload artifacts
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: fastfetch-linux-${{ inputs.arch }}
          path: ./fastfetch-*.*
@@ -74,13 +74,13 @@ jobs:
        run: ctest --output-on-failure

      - name: upload artifacts
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: fastfetch-macos-universal
          path: ./fastfetch-*.*

      - name: upload benchmark data
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: benchmark-macos-universal
          path: benchmark.json
@@ -44,7 +44,7 @@ jobs:
        shell: alpine.sh {0}

      - name: upload artifacts
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: fastfetch-musl-amd64
          path: ./fastfetch-*.*
@@ -59,7 +59,7 @@ jobs:
        run: ctest --output-on-failure

      - name: upload artifacts
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: fastfetch-netbsd-amd64
          path: ./fastfetch-*.*
@@ -64,7 +64,7 @@ jobs:
          cpack -V

      - name: upload artifacts
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: fastfetch-omnios-amd64
          path: ./fastfetch-*.*
@@ -59,7 +59,7 @@ jobs:
        run: ctest --output-on-failure

      - name: upload artifacts
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: fastfetch-openbsd-amd64
          path: ./fastfetch-*.*
@@ -22,7 +22,7 @@ jobs:

      - name: download artifacts
        if: inputs.ffversion != steps.get_version_release.outputs.release
-        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1

      - name: create release
        if: inputs.ffversion != steps.get_version_release.outputs.release
@@ -40,7 +40,7 @@ jobs:
            cpack -V

      - name: upload artifacts
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: fastfetch-solaris-amd64
          path: ./fastfetch-*.*
@@ -106,7 +106,7 @@ jobs:
      - if: github.event_name == 'push' && github.repository == 'fastfetch-cli/fastfetch'
        id: upload-unsigned-artifact
        name: upload artifacts for signing
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: fastfetch-windows-${{ inputs.arch }}
          path: |
@@ -134,14 +134,14 @@ jobs:
        run: 7z a -t7z -mx9 -bd -y fastfetch-windows-${{ inputs.arch }}.7z LICENSE *.dll fastfetch.exe flashfetch.exe presets

      - name: upload true artifacts
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: fastfetch-windows-${{ inputs.arch }}
          path: ./fastfetch-windows-${{ inputs.arch }}.*
          overwrite: true

      - name: upload benchmark data
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: benchmark-windows-${{ inputs.arch }}
          path: benchmark.json
@@ -2,6 +2,7 @@

 Bugfixes:
 * Improved uptime detection on SunOS via kstat. (#2674, Uptime, SunOS)
+* Fixed substring formatting returning the remaining string when a negative end index is before the start of the string. (General)

 # 2.70.0

@@ -552,7 +552,7 @@ static bool parseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint3
                        if (end < 0) {
                            end = (int32_t) tempString.length + end;
                        }
-                        if ((uint32_t) end > tempString.length) {
+                        if (end >= 0 && (uint32_t) end > tempString.length) {
                            end = (int32_t) tempString.length;
                        }
                        if (end > start) {
@@ -149,6 +149,32 @@ void restoreTerm(void) {
    tcsetattr(ftty, TCSAFLUSH, &oldTerm);
 }

+static const char* waitForTerminalResponse(void) {
+#ifndef __APPLE__
+    const int pollResult = poll(&(struct pollfd) { .fd = ftty, .events = POLLIN }, 1, FF_IO_TERM_RESP_WAIT_MS);
+    if (pollResult <= 0) {
+        FF_DEBUG("poll(/dev/tty) returned %d after %d ms: %s",
+            pollResult, FF_IO_TERM_RESP_WAIT_MS, pollResult == 0 ? "timed out" : strerror(errno));
+        return "poll(/dev/tty) timeout or failed";
+    }
+#else
+    {
+        // On macOS, poll(/dev/tty) always returns immediately
+        // See also https://nathancraddock.com/blog/macos-dev-tty-polling/
+        fd_set rd;
+        FD_ZERO(&rd);
+        FD_SET(ftty, &rd);
+        const int selectResult = select(ftty + 1, &rd, nullptr, nullptr, &(struct timeval) { .tv_sec = FF_IO_TERM_RESP_WAIT_MS / 1000, .tv_usec = (FF_IO_TERM_RESP_WAIT_MS % 1000) * 1000 });
+        if (selectResult <= 0) {
+            FF_DEBUG("select(/dev/tty) returned %d after %d ms: %s",
+                selectResult, FF_IO_TERM_RESP_WAIT_MS, selectResult == 0 ? "timed out" : strerror(errno));
+            return "select(/dev/tty) timeout or failed";
+        }
+    }
+#endif
+    return nullptr;
+}
+
 const char* ffGetTerminalResponse(const char* request, int nParams, const char* format, ...) {
    if (ftty < 0) {
        ftty = open("/dev/tty", O_RDWR | O_NOCTTY | O_CLOEXEC);
@@ -174,28 +200,10 @@ const char* ffGetTerminalResponse(const char* request, int nParams, const char*
    ffWriteFDData(ftty, strlen(request), request);

 // Give the terminal some time to respond
-#ifndef __APPLE__
-    const int pollResult = poll(&(struct pollfd) { .fd = ftty, .events = POLLIN }, 1, FF_IO_TERM_RESP_WAIT_MS);
-    if (pollResult <= 0) {
-        FF_DEBUG("poll(/dev/tty) returned %d after %d ms: %s",
-            pollResult, FF_IO_TERM_RESP_WAIT_MS, pollResult == 0 ? "timed out" : strerror(errno));
-        return "poll(/dev/tty) timeout or failed";
+    const char* error = waitForTerminalResponse();
+    if (error) {
+        return error;
    }
-#else
-    {
-        // On macOS, poll(/dev/tty) always returns immediately
-        // See also https://nathancraddock.com/blog/macos-dev-tty-polling/
-        fd_set rd;
-        FD_ZERO(&rd);
-        FD_SET(ftty, &rd);
-        const int selectResult = select(ftty + 1, &rd, nullptr, nullptr, &(struct timeval) { .tv_sec = FF_IO_TERM_RESP_WAIT_MS / 1000, .tv_usec = (FF_IO_TERM_RESP_WAIT_MS % 1000) * 1000 });
-        if (selectResult <= 0) {
-            FF_DEBUG("select(/dev/tty) returned %d after %d ms: %s",
-                selectResult, FF_IO_TERM_RESP_WAIT_MS, selectResult == 0 ? "timed out" : strerror(errno));
-            return "select(/dev/tty) timeout or failed";
-        }
-    }
-#endif

    char buffer[1024];
    size_t bytesRead = 0;
@@ -204,6 +212,13 @@ const char* ffGetTerminalResponse(const char* request, int nParams, const char*
    va_start(args, format);

    while (true) {
+        // The response may arrive in several chunks; a terminal that sends an incomplete
+        // response would otherwise block `read` forever
+        if (bytesRead > 0 && (error = waitForTerminalResponse())) {
+            va_end(args);
+            return error;
+        }
+
        ssize_t nRead = read(ftty, buffer + bytesRead, sizeof(buffer) - bytesRead - 1);

        if (nRead <= 0) {
@@ -414,6 +414,35 @@ void ffListFilesRecursively(const char* path, bool pretty) {
    listFilesRecursively(folder.length, &folder, 0, nullptr, pretty);
 }

+static const char* waitForTerminalResponse(HANDLE hInput) {
+    while (true) {
+        NTSTATUS status = NtWaitForSingleObject(hInput, FALSE, &(LARGE_INTEGER) { .QuadPart = (int64_t) FF_IO_TERM_RESP_WAIT_MS * -10000 });
+        if (status != STATUS_WAIT_0) {
+            FF_DEBUG("NtWaitForSingleObject() failed or timeout: %s", ffDebugNtStatus(status));
+            return "NtWaitForSingleObject() failed or timeout";
+        }
+
+        // Ignore all unexpected input events
+        INPUT_RECORD record;
+        DWORD len = 0;
+        if (!PeekConsoleInputW(hInput, &record, 1, &len)) {
+            return nullptr;
+        }
+
+        // Key-up events carry no input for `ReadFile`; leaving one in the buffer would make the
+        // wait return while the next `ReadFile` still blocks
+        if (
+            record.EventType == KEY_EVENT &&
+            record.Event.KeyEvent.bKeyDown &&
+            record.Event.KeyEvent.uChar.UnicodeChar != L'\r' &&
+            record.Event.KeyEvent.uChar.UnicodeChar != L'\n') {
+            return nullptr;
+        }
+
+        ReadConsoleInputW(hInput, &record, 1, &len);
+    }
+}
+
 const char* ffGetTerminalResponse(const char* request, int nParams, const char* format, ...) {
    HANDLE hInput = GetStdHandle(STD_INPUT_HANDLE);
    FF_AUTO_CLOSE_FD HANDLE hConin = INVALID_HANDLE_VALUE;
@@ -440,29 +469,10 @@ const char* ffGetTerminalResponse(const char* request, int nParams, const char*
        WriteFile(hOutput, request, (DWORD) strlen(request), &bytes, nullptr);
    }

-    while (true) {
-        NTSTATUS status = NtWaitForSingleObject(hInput, FALSE, &(LARGE_INTEGER) { .QuadPart = (int64_t) FF_IO_TERM_RESP_WAIT_MS * -10000 });
-        if (status != STATUS_WAIT_0) {
-            FF_DEBUG("NtWaitForSingleObject() failed or timeout: %s", ffDebugNtStatus(status));
-            SetConsoleMode(hInput, inputMode);
-            return "NtWaitForSingleObject() failed or timeout";
-        }
-
-        // Ignore all unexpected input events
-        INPUT_RECORD record;
-        DWORD len = 0;
-        if (!PeekConsoleInputW(hInput, &record, 1, &len)) {
-            break;
-        }
-
-        if (
-            record.EventType == KEY_EVENT &&
-            record.Event.KeyEvent.uChar.UnicodeChar != L'\r' &&
-            record.Event.KeyEvent.uChar.UnicodeChar != L'\n') {
-            break;
-        } else {
-            ReadConsoleInputW(hInput, &record, 1, &len);
-        }
+    const char* error = waitForTerminalResponse(hInput);
+    if (error) {
+        SetConsoleMode(hInput, inputMode);
+        return error;
    }

    va_list args;
@@ -472,6 +482,16 @@ const char* ffGetTerminalResponse(const char* request, int nParams, const char*
    uint32_t bytesRead = 0;

    while (true) {
+        // The response may arrive in several chunks; a terminal that sends an incomplete
+        // response would otherwise block `ReadFile` forever
+        if (bytesRead > 0 && (error = waitForTerminalResponse(hInput))) {
+            va_end(args);
+            if (hasInputMode) {
+                SetConsoleMode(hInput, inputMode);
+            }
+            return error;
+        }
+
        DWORD bytes = 0;
        BOOL readOk = ReadFile(hInput, buffer + bytesRead, (DWORD) (sizeof(buffer) - 1 - bytesRead), &bytes, nullptr);
        if (!readOk || bytes == 0) {
@@ -52,15 +52,15 @@ const char* ffDetectWifi(FFlist* result) {

        if (inf.ssid) { // https://developer.apple.com/forums/thread/732431
            ffStrbufAppendS(&item->conn.ssid, inf.ssid.UTF8String);
-        } else if (networkProfile.ssid) {
-            ffStrbufSetStatic(&item->conn.ssid, inf.configuration.networkProfiles.firstObject.ssid.UTF8String);
+        } else if (networkProfile.ssid) { // Dead in macOS 27.2
+            ffStrbufSetStatic(&item->conn.ssid, networkProfile.ssid.UTF8String);
        } else {
-            ffStrbufSetStatic(&item->conn.ssid, "<redacted>"); // https://developer.apple.com/forums/thread/732431
+            ffStrbufSetStatic(&item->conn.ssid, "<redacted>");
        }

        if (inf.bssid) {
            ffStrbufAppendS(&item->conn.bssid, inf.bssid.UTF8String);
-        } else if (networkProfile.bssidList) {
+        } else if (networkProfile.bssidList) { // Dead in macOS 27.2
            ffStrbufSetStatic(&item->conn.bssid, [networkProfile.bssidList.firstObject[@"BSSID"] UTF8String]);
        } else {
            ffStrbufSetStatic(&item->conn.bssid, "<redacted>");
@@ -96,6 +96,7 @@ int main(void) {
        VERIFY("output({1~10,10})", "12345 67890", "output()");
        VERIFY("output({1~10,5})", "12345 67890", "output()");
        VERIFY("output({1~3,-3})", "12345 67890", "output(45 67)");
+        VERIFY("output({1~0,-12})", "12345 67890", "output()");
        VERIFY("output({1~-5,-3})", "12345 67890", "output(67)");
        VERIFY("output({1~-0,10})", "12345 67890", "output(12345 6789)");
        VERIFY("output({1~-3,-5})", "12345 67890", "output()");
Author	SHA1	Message	Date
Carter Li	06957877a8	Wifi (macOS): adds comments	2026-10-29 14:05:41 +08:00
ihsandeniz	2f68ce7f74	IO (Windows): fixes blocking forever on incomplete terminal responses Same issue as on Unix: ffGetTerminalResponse() waits for input only before the first ReadFile(). If the terminal answers only part of the request (e.g. one of the two OSC 10/11 replies), the next ReadFile() blocks forever. Wait with the same timeout before every subsequent ReadFile() as well, and restore the console mode on that error path. While waiting, also skip key-up records: ReadFile() returns no data for them, so one left alone in the buffer would end the wait and the following ReadFile() would block.	2026-10-28 09:17:24 +08:00
ihsandeniz	408646df1c	IO (Unix): fixes blocking forever on incomplete terminal responses ffGetTerminalResponse() polls only before the first read(). If the terminal sends a response that is cut short (e.g. `\e[4;800` without the rest), the following read() in the loop blocks forever because the tty is in non-canonical mode with VMIN=1. Wait with the same timeout before every subsequent read() as well.	2026-10-28 09:17:24 +08:00
Don Yin	ad62e3d1f5	Format: fixes substring ends before the start of the string (#2669 ) * Format: fix substring ends before the start of the string Closes #2668 Signed-off-by: Don Yin <Don_Yin@outlook.com> * Doc: moves changelog entry to Unreleased [ci skip] I moved the unreleased fix out of the 2.70.0 section. Signed-off-by: Don Yin <Don_Yin@outlook.com> --------- Signed-off-by: Don Yin <Don_Yin@outlook.com>	2026-10-26 00:34:50 -05:00