diff options
Diffstat (limited to 'src/cmd/awk/lib.c')
-rw-r--r-- | src/cmd/awk/lib.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/cmd/awk/lib.c b/src/cmd/awk/lib.c index 6a6849c5..30c3ddd4 100644 --- a/src/cmd/awk/lib.c +++ b/src/cmd/awk/lib.c @@ -29,6 +29,7 @@ THIS SOFTWARE. #include <errno.h> #include <stdlib.h> #include <stdarg.h> +#include <utf.h> #include "awk.h" #include "y.tab.h" @@ -293,15 +294,19 @@ void fldbld(void) /* create fields from current record */ } *fr = 0; } else if ((sep = *inputFS) == 0) { /* new: FS="" => 1 char/field */ - for (i = 0; *r != 0; r++) { - char buf[2]; + int nb; + for (i = 0; *r != 0; r += nb) { + Rune rr; + char buf[UTFmax+1]; + i++; if (i > nfields) growfldtab(i); if (freeable(fldtab[i])) xfree(fldtab[i]->sval); - buf[0] = *r; - buf[1] = 0; + nb = chartorune(&rr, r); + memmove(buf, r, nb); + buf[nb] = '\0'; fldtab[i]->sval = tostring(buf); fldtab[i]->tval = FLD | STR; } @@ -430,7 +435,7 @@ int refldbld(char *rec, char *fs) /* build fields from reg expr in FS */ break; } } - return i; + return i; } void recbld(void) /* create $0 from $1..$NF if necessary */ @@ -710,4 +715,3 @@ int is_number(char *s) else return 0; } - |