From c11e80d46df7cec80de52383db6cb7d8dc7d3ce0 Mon Sep 17 00:00:00 2001 From: Nick White Date: Sat, 16 Jul 2011 15:05:01 +0100 Subject: Simplify get() further --- util.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'util.c') diff --git a/util.c b/util.c index ab84663..5d4e004 100644 --- a/util.c +++ b/util.c @@ -34,10 +34,9 @@ static int dial(char *host, char *port) { return srv; } -int get(char *host, char *path, char **gotbuf) { +int get(char *host, char *path, char **buf) { size_t l, res; int fd, i; - char *buf; char h[1024] = "\0"; FILE *srv; @@ -48,18 +47,15 @@ int get(char *host, char *path, char **gotbuf) { " (not mozilla)\r\nHost: %s\r\n\r\n", path, host); fflush(srv); - /* process headers */ while(h[0] != '\r') { fgets(h, 1024, srv); if(sscanf(h, "HTTP/%d.%d %d", &i, &i, &l) == 3 && l != 200) return 1; } - buf = malloc(sizeof(char *) * 4096); - for(i=0, l=0; (res = fread(buf+l, 1, 4096, srv)) > 0; l+=res, i++) - buf = realloc(buf, sizeof(char *) * (l+4096)); - - *gotbuf = buf; + *buf = malloc(sizeof(char *) * 4096); + for(i=0, l=0; (res = fread(*buf+l, 1, 4096, srv)) > 0; l+=res, i++) + *buf = realloc(*buf, sizeof(char *) * (l+4096)); return l; } -- cgit v1.2.3