diff options
| author | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-02-11 13:40:11 +0100 |
|---|---|---|
| committer | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-02-11 13:40:11 +0100 |
| commit | 9c79e48c93c0c4d14aabcb490fab048d68934cb2 (patch) | |
| tree | 1d57d3fd193621a2357473bb65b92190914c5736 /src/cmd/acme/rows.c | |
| parent | 02d7aa8915f9c3a3288dab01f321eb94ba219e3b (diff) | |
| parent | 0237dec768a4ee36ae9e18ce8566d2c999d78410 (diff) | |
| download | plan9port-9c79e48c93c0c4d14aabcb490fab048d68934cb2.tar.gz plan9port-9c79e48c93c0c4d14aabcb490fab048d68934cb2.tar.bz2 plan9port-9c79e48c93c0c4d14aabcb490fab048d68934cb2.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/cmd/acme/rows.c')
| -rw-r--r-- | src/cmd/acme/rows.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/cmd/acme/rows.c b/src/cmd/acme/rows.c index 83c64594..7a64fabf 100644 --- a/src/cmd/acme/rows.c +++ b/src/cmd/acme/rows.c @@ -316,7 +316,7 @@ rowclean(Row *row) void rowdump(Row *row, char *file) { - int i, j, fd, m, n, dumped; + int i, j, fd, m, n, start, dumped; uint q0, q1; Biobuf *b; char *buf, *a, *fontname; @@ -434,9 +434,17 @@ rowdump(Row *row, char *file) m = min(RBUFSIZE, w->tag.file->b.nc); bufread(&w->tag.file->b, 0, r, m); n = 0; - while(n<m && r[n]!='\n') - n++; - Bprint(b, "%.*S\n", n, r); + while(n<m) { + start = n; + while(n<m && r[n]!='\n') + n++; + Bprint(b, "%.*S", n-start, r+start); + if(n<m) { + Bputc(b, 0xff); // \n in tag becomes 0xff byte (invalid UTF) + n++; + } + } + Bprint(b, "\n"); if(dumped){ q0 = 0; q1 = t->file->b.nc; @@ -719,6 +727,10 @@ rowload(Row *row, char *file, int initing) if(l == nil) goto Rescue2; l[Blinelen(b)-1] = 0; + /* convert 0xff in multiline tag back to \n */ + for(i = 0; l[i] != 0; i++) + if((uchar)l[i] == 0xff) + l[i] = '\n'; r = bytetorune(l+5*12, &nr); ns = -1; for(n=0; n<nr; n++){ |