diff options
Diffstat (limited to 'WWW')
-rw-r--r-- | WWW/Library/Implementation/HTFTP.c | 10 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTFormat.c | 10 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTNews.c | 2 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTRules.c | 2 |
4 files changed, 18 insertions, 6 deletions
diff --git a/WWW/Library/Implementation/HTFTP.c b/WWW/Library/Implementation/HTFTP.c index 5d0712d2..978d67c1 100644 --- a/WWW/Library/Implementation/HTFTP.c +++ b/WWW/Library/Implementation/HTFTP.c @@ -3436,15 +3436,17 @@ int HTFTPLoad(const char *name, strchr(cp, ']') == NULL) { cp1++; if (*cp1 != '\0') { + int cplen = (int) (cp1 - cp); + strcpy(filename, cp1); CTRACE((tfp, "HTFTP: Filename '%s'\n", filename)); - HTSprintf0(&vmsname, "%.*s[%s]", cp1 - cp, cp, filename); + HTSprintf0(&vmsname, "%.*s[%s]", cplen, cp, filename); status = send_cwd(vmsname); if (status != 2) { - HTSprintf(&vmsname, "%.*s[000000]", cp1 - cp, cp); + HTSprintf(&vmsname, "%.*s[000000]", cplen, cp); status = send_cwd(vmsname); if (status != 2) { - HTSprintf(&vmsname, "%.*s", cp1 - cp, cp); + HTSprintf(&vmsname, "%.*s", cplen, cp); status = send_cwd(vmsname); if (status != 2) { FREE(fname); @@ -3549,7 +3551,7 @@ int HTFTPLoad(const char *name, (cp1 - cp) > 1) { char *tmp = 0; - HTSprintf0(&tmp, "[.%.*s]", cp1 - cp - 1, cp + 1); + HTSprintf0(&tmp, "[.%.*s]", (int) (cp1 - cp - 1), cp + 1); CTRACE((tfp, "change path '%s'\n", tmp)); while ((cp2 = strrchr(tmp, '/')) != NULL) diff --git a/WWW/Library/Implementation/HTFormat.c b/WWW/Library/Implementation/HTFormat.c index 7f52a81e..968f051f 100644 --- a/WWW/Library/Implementation/HTFormat.c +++ b/WWW/Library/Implementation/HTFormat.c @@ -1077,6 +1077,16 @@ static int HTGzFileCopy(gzFile gzfp, HTStream *sink) return rv; } +#ifndef HAVE_ZERROR +#define zError(s) LynxZError(s) +static const char *zError(int status) +{ + static char result[80]; + sprintf(result, "zlib error %d", status); + return result; +} +#endif + /* Push data from a deflate file pointer down a stream * ------------------------------------- * diff --git a/WWW/Library/Implementation/HTNews.c b/WWW/Library/Implementation/HTNews.c index bea534fa..611d7f1e 100644 --- a/WWW/Library/Implementation/HTNews.c +++ b/WWW/Library/Implementation/HTNews.c @@ -772,7 +772,7 @@ static void write_anchor(const char *text, const char *addr) strncat(q, addr, p - addr); /* Make complete hypertext reference */ } else { q = NULL; - HTSprintf0(&q, "%s%.*s", NewsHREF, p - addr, addr); + HTSprintf0(&q, "%s%.*s", NewsHREF, (int) (p - addr), addr); } start_anchor(q); diff --git a/WWW/Library/Implementation/HTRules.c b/WWW/Library/Implementation/HTRules.c index 7e621b3f..b6510970 100644 --- a/WWW/Library/Implementation/HTRules.c +++ b/WWW/Library/Implementation/HTRules.c @@ -345,7 +345,7 @@ char *HTTranslate(const char *required) char *temp = NULL; HTSprintf0(&temp, "%.*s%.*s%s", - ins - r->equiv, + (int) (ins - r->equiv), r->equiv, m, q, |