From 3d2a9217a7d06d167d722cb4eabf7a29232d7bcd Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Fri, 28 Sep 2007 22:35:29 +0000 Subject: [PATCH] httpd: trivial simplification --- networking/httpd.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/networking/httpd.c b/networking/httpd.c index 92a07107d..c8fbefd5a 100644 --- a/networking/httpd.c +++ b/networking/httpd.c @@ -609,10 +609,12 @@ static void parse_conf(const char *path, int flag) if (*p == '/') { if (*cf == '/') { /* skip duplicate (or initial) slash */ continue; - } else if (*cf == '.') { + } + if (*cf == '.') { if (cf[1] == '/' || cf[1] == '\0') { /* remove extra '.' */ continue; - } else if ((cf[1] == '.') && (cf[2] == '/' || cf[2] == '\0')) { + } + if ((cf[1] == '.') && (cf[2] == '/' || cf[2] == '\0')) { ++cf; if (p > p0) { while (*--p != '/') /* omit previous dir */; @@ -627,8 +629,8 @@ static void parse_conf(const char *path, int flag) if ((p == p0) || (*p != '/')) { /* not a trailing slash */ ++p; /* so keep last character */ } - *p = '\0'; - sprintf(p0 + strlen(p0), ":%s", c); + *p = ':'; + strcpy(p + 1, c); } #endif -- 2.11.0