itRemove strsep() usage to get item type - phroxy - Gopher to HTTP proxy Err z3bra.org 70 hgit clone git://git.z3bra.org/phroxy.git URL:git://git.z3bra.org/phroxy.git z3bra.org 70 1Log /scm/phroxy/log.gph z3bra.org 70 1Files /scm/phroxy/files.gph z3bra.org 70 1Refs /scm/phroxy/refs.gph z3bra.org 70 1LICENSE /scm/phroxy/file/LICENSE.gph z3bra.org 70 i--- Err z3bra.org 70 1commit 6080677947fba31e72da83dd8a881de1e37daf15 /scm/phroxy/commit/6080677947fba31e72da83dd8a881de1e37daf15.gph z3bra.org 70 1parent b8839df0fea0cf644b2be9a9d9620e525ba39bd3 /scm/phroxy/commit/b8839df0fea0cf644b2be9a9d9620e525ba39bd3.gph z3bra.org 70 hAuthor: Willy Goiffon URL:mailto:dev@z3bra.org z3bra.org 70 iDate: Mon, 14 Sep 2020 16:17:08 +0200 Err z3bra.org 70 i Err z3bra.org 70 iRemove strsep() usage to get item type Err z3bra.org 70 i Err z3bra.org 70 iUsing strsep() will overwrite the '/' between item type and path if it Err z3bra.org 70 iis present. However, we must request a file in gopher from the root Err z3bra.org 70 idirectory, so we must keep this leading '/'. Err z3bra.org 70 i Err z3bra.org 70 iDiffstat: Err z3bra.org 70 i M phroxy.c | 11 ++++++----- Err z3bra.org 70 i Err z3bra.org 70 i1 file changed, 6 insertions(+), 5 deletions(-) Err z3bra.org 70 i--- Err z3bra.org 70 1diff --git a/phroxy.c b/phroxy.c /scm/phroxy/file/phroxy.c.gph z3bra.org 70 it@@ -343,7 +343,8 @@ phroxy(char *url) Err z3bra.org 70 i { Err z3bra.org 70 i int sock; Err z3bra.org 70 i size_t len; Err z3bra.org 70 i- char *hole, *item, *path, *host, *port; Err z3bra.org 70 i+ char item; Err z3bra.org 70 i+ char *hole, *path, *host, *port; Err z3bra.org 70 i char *data = NULL, *srch = NULL; Err z3bra.org 70 i Err z3bra.org 70 i url++; Err z3bra.org 70 it@@ -358,9 +359,9 @@ phroxy(char *url) Err z3bra.org 70 i if (!port) Err z3bra.org 70 i port = "70"; Err z3bra.org 70 i Err z3bra.org 70 i- item = strsep(&url, "/"); Err z3bra.org 70 i- if (!item || !item[0] ) Err z3bra.org 70 i- item = "1"; Err z3bra.org 70 i+ item = *url++; Err z3bra.org 70 i+ if (!item) Err z3bra.org 70 i+ item = '1'; Err z3bra.org 70 i Err z3bra.org 70 i path = strsep(&url, "\0"); Err z3bra.org 70 i if (!path) Err z3bra.org 70 it@@ -378,7 +379,7 @@ phroxy(char *url) Err z3bra.org 70 i if (!data) Err z3bra.org 70 i return 1; Err z3bra.org 70 i Err z3bra.org 70 i- serveitem(*item, data, len); Err z3bra.org 70 i+ serveitem(item, data, len); Err z3bra.org 70 i Err z3bra.org 70 i return 0; Err z3bra.org 70 i } Err z3bra.org 70 .