Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2026-06-03 21:30:06 +01:00
3 changed files with 2 additions and 12 deletions

View File

@@ -5616,7 +5616,7 @@ format_expand1(struct format_expand_state *es, const char *fmt)
const char *ptr, *s, *style_end = NULL;
size_t off, len, n, outlen;
int ch, brackets;
char expanded[8192], number[2] = { 0 };
char expanded[8192];
if (fmt == NULL || *fmt == '\0' || !format_check_time(es))
return (xstrdup(""));
@@ -5746,13 +5746,6 @@ format_expand1(struct format_expand_state *es, const char *fmt)
continue;
default:
s = NULL;
if (ch >= '1' && ch <= '9') {
number[0] = ch;
if (format_replace(es, number, 1, &buf, &len,
&off) != 0)
break;
continue;
}
if (fmt > style_end) { /* skip inside #[] */
if (ch >= 'A' && ch <= 'Z')
s = format_upper[ch - 'A'];