sync code with last improvements from OpenBSD

This commit is contained in:
purplerain 2023-09-19 03:12:30 +00:00
parent d8235ebda5
commit 0726fd4247
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
8 changed files with 50 additions and 41 deletions

View file

@ -1,4 +1,4 @@
/* $OpenBSD: b.c,v 1.38 2023/09/17 14:49:44 millert Exp $ */
/* $OpenBSD: b.c,v 1.41 2023/09/19 01:14:05 millert Exp $ */
/****************************************************************
Copyright (C) Lucent Technologies 1997
All Rights Reserved
@ -533,7 +533,7 @@ int first(Node *p) /* collects initially active leaves of p into setvec */
setvec[lp] = 1;
setcnt++;
}
if (type(p) == CCL && (*(char *) right(p)) == '\0')
if (type(p) == CCL && (*(int *) right(p)) == 0)
return(0); /* empty CCL */
return(1);
case PLUS:
@ -834,7 +834,7 @@ bool fnematch(fa *pfa, FILE *f, char **pbuf, int *pbufsize, int quantum)
buf[k++] = (c = getc(f)) != EOF ? c : 0;
}
c = (uschar)buf[j];
if (c < 128)
if (c < 128 || awk_mb_cur_max == 1)
rune = c;
else {
j--;