Merge branch 'main' into internal-textsinternal-texts

1 files changed, 5 insertions, 3 deletions

diff --git a/stdlib/paths.c b/stdlib/paths.c
index 8acc34ff..e8a1e1f6 100644
--- a/stdlib/paths.c
+++ b/stdlib/paths.c
@@ -439,9 +439,11 @@ public Text_t Path$write_unique_bytes(Path_t path, Array_t bytes)
     char buf[PATH_MAX] = {};
     strcpy(buf, path_str);
 
-    int64_t suffixlen = 0;
-    (void)Text$find(path, Pattern("{0+!X}{end}"), I(1), &suffixlen);
-    if (suffixlen < 0) suffixlen = 0;
+    // Count the number of trailing characters leading up to the last "X"
+    // (e.g. "foo_XXXXXX.tmp" would yield suffixlen = 4)
+    size_t suffixlen = 0;
+    while (suffixlen < len && buf[len - 1 - suffixlen] != 'X')
+        ++suffixlen;
 
     int fd = mkstemps(buf, suffixlen);
     if (fd == -1)