ifix escape regression in gphtextnl() and simplify the code - stagit-gemini - Stagit for gemini protocol Openbsd Err thinkerwim.openbsd.amsterdam 70 hgit clone git://thinkerwim.org/stagit-gemini.git URL:git://thinkerwim.org/stagit-gemini.git thinkerwim.org 70 1Log /git/stagit-gemini/log.gph thinkerwim.org 70 1Files /git/stagit-gemini/files.gph thinkerwim.org 70 1Refs /git/stagit-gemini/refs.gph thinkerwim.org 70 1README /git/stagit-gemini/file/README.gph thinkerwim.org 70 1LICENSE /git/stagit-gemini/file/LICENSE.gph thinkerwim.org 70 i--- Err thinkerwim.openbsd.amsterdam 70 1commit f3d448a743143b22dcb9ab7e20dc16149d55907b /git/stagit-gemini/commit/f3d448a743143b22dcb9ab7e20dc16149d55907b.gph thinkerwim.org 70 1parent b5cdcadb391b8f27bced0273013ae5ba2189cde9 /git/stagit-gemini/commit/b5cdcadb391b8f27bced0273013ae5ba2189cde9.gph thinkerwim.org 70 hAuthor: Hiltjo Posthuma URL:mailto:hiltjo@codemadness.org thinkerwim.org 70 iDate: Sat, 27 Jan 2018 16:24:38 +0100 Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 ifix escape regression in gphtextnl() and simplify the code Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 iThanks Christoph for the report! Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 iDiffstat: Err thinkerwim.openbsd.amsterdam 70 i M stagit-gopher.c | 11 +++-------- Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i1 file changed, 3 insertions(+), 8 deletions(-) Err thinkerwim.openbsd.amsterdam 70 i--- Err thinkerwim.openbsd.amsterdam 70 1diff --git a/stagit-gopher.c b/stagit-gopher.c /git/stagit-gemini/file/stagit-gopher.c.gph thinkerwim.org 70 i@@ -299,21 +299,16 @@ gphtextnl(FILE *fp, const char *s, size_t len) Err thinkerwim.openbsd.amsterdam 70 i size_t i, n = 0; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i for (i = 0; s[i] && i < len; i++) { Err thinkerwim.openbsd.amsterdam 70 i- if (s[i] == '\n') Err thinkerwim.openbsd.amsterdam 70 i- n = 0; Err thinkerwim.openbsd.amsterdam 70 i- Err thinkerwim.openbsd.amsterdam 70 i /* escape with 't' at the start of a line */ Err thinkerwim.openbsd.amsterdam 70 i- if (!n && (s[i] == 't' || s[i] == '[')) { Err thinkerwim.openbsd.amsterdam 70 i+ if (!n && (s[i] == 't' || s[i] == '[')) Err thinkerwim.openbsd.amsterdam 70 i fputc('t', fp); Err thinkerwim.openbsd.amsterdam 70 i- n = 1; Err thinkerwim.openbsd.amsterdam 70 i- } Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i switch (s[i]) { Err thinkerwim.openbsd.amsterdam 70 i+ case '\t': fputs(" ", fp); Err thinkerwim.openbsd.amsterdam 70 i case '\r': break; Err thinkerwim.openbsd.amsterdam 70 i- case '\t': fputs(" ", fp); break; Err thinkerwim.openbsd.amsterdam 70 i default: fputc(s[i], fp); Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i- n++; Err thinkerwim.openbsd.amsterdam 70 i+ n = (s[i] != '\n'); Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 .