From: Dirk Gouders Date: Thu, 19 Nov 2026 22:59:12 GMT Subject: Re: [PATCH v2 1/4] utf8: add display_mode_esc_sequence_len_counted() Message-ID: In-Reply-To: On Thu, Nov 19 2026, Dirk Gouders wrote: > On Thu, Nov 19 2026, Andy Koppe wrote: > >> Dirk Gouders wrote: >>> +/* Same as above, but for a NUL-terminated string "s". */ >>> +size_t display_mode_esc_sequence_len(const char *s) >>> +{ >>> + return display_mode_esc_sequence_len_counted(s, strlen(s)); >>> +} >> >> This is a performance regression compared to the original function. >> Calls that previously returned immediately because *s != '\033', or >> after a few bytes of scanning, now scan the entire string with strlen. >> It turns scanning a whole string for SGRs with repeated calls to the >> function from linear to quadratic. > > How about creating a v3 for display_mode_esc_sequence_len() similar to > utf8_width() to accept an optional remainder argument? > > If NULL is given, display_mode_esc_sequence_len() assumes a > null-terminated string, otherwise the length is given in *remainder. > The function can then update the remainder and return the length. > > Just an idea. Something like this untested example (please ignore the _counted): diff --git a/utf8.c b/utf8.c index 8d4b159e1d..fe6f288179 100644 --- a/utf8.c +++ b/utf8.c @@ -22,18 +22,24 @@ struct interval { * of string "s", or 0 if the bytes do not begin with a complete * such sequence. Never looks at s[len] or beyond. */ -size_t display_mode_esc_sequence_len_counted(const char *s, size_t len) +size_t display_mode_esc_sequence_len_counted(const char *s, size_t *len) { - const char *p = s, *end = s + len; + const char *p = s, *end = NULL; - if (end <= p || *p++ != '\033') + if (len) + end = s + *len; + + if ((end && end <= p) || *p++ != '\033') return 0; - if (end <= p || *p++ != '[') + if ((end && end <= p) || *p++ != '[') return 0; - while (p < end && (isdigit(*p) || *p == ';')) + while (((end && p < end) || (!end && *p)) && (isdigit(*p) || *p == ';')) p++; - if (end <= p || *p++ != 'm') + if ((end && end <= p) || (!end && !*p) || *p++ != 'm') return 0; + + if (len) + *len -= p - s; return p - s; }