fix content read bug

Author: seckcoder

proxylab-handout/dstring.c

@@ -36,17 +36,30 @@ inline static size_t ceil_divide(size_t a, size_t b)
 void string_append(string *pstr, const char *cstr)
 {
     size_t cstr_len = strlen(cstr);
+    string_appendn(pstr, cstr, cstr_len);
+}
+
+void string_appendn(string *pstr, const char *cstr, size_t cstr_len)
+{
     if (pstr->len + cstr_len + 1 <= pstr->size) {
-        strcpy(&pstr->cstr[pstr->len], cstr);
+        for (int i = 0; i < cstr_len; i++) {
+            pstr->cstr[pstr->len+i] = cstr[i];
+        }
         pstr->len += cstr_len;
     } else {
-        size_t multiplier = ceil_divide((cstr_len + pstr->len + 1) , pstr->size);
-        size_t new_size = multiplier * pstr->size;
+        size_t multipler = ceil_divide((cstr_len + pstr->len + 1),
+                pstr->size);
+        size_t new_size = multipler * pstr->size;
         char *new_str = (char *)malloc(new_size*sizeof(char));
-        strcpy(new_str, pstr->cstr);
-        strcpy(&new_str[pstr->len], cstr);
-        pstr->cstr = new_str;
+        for (int i = 0; i < pstr->len; i++) {
+            new_str[i] = pstr->cstr[i];
+        }
+        for (int i = 0; i < cstr_len; i++) {
+            new_str[pstr->len+i] = cstr[i];
+        }
         pstr->len += cstr_len;
         pstr->size = new_size;
+        pstr->cstr = new_str;
     }
+    pstr->cstr[pstr->len] ='\0';
 }

proxylab-handout/dstring.h

@@ -19,5 +19,6 @@ void string_malloc(string *pstr);
 void string_free(string *pstr);
 
 void string_append(string *pstr, const char *cstr);
+void string_appendn(string *pstr, const char *cstr, size_t cstr_len);
 
 #endif

proxylab-handout/proxy.c

@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <assert.h>
 #include "csapp.h"
 #include "dstring.h"
 #include "util.h"
@@ -48,12 +49,48 @@ void forward_response(int infd, int outfd)
     struct string response;
     string_malloc(&response);
 
-    while (Rio_readlineb(&rio, buf, MAXLINE)) {
-        // printf("%s\n", buf);
+    if (!Rio_readlineb(&rio, buf, MAXLINE)) {
+        //TODO: error report
+        return;
+    }
+
+    string_append(&response, buf);
+
+    Rio_readlineb(&rio, buf, MAXLINE);
+    char header_name[MAXLINE], header_value[MAXLINE];
+    int content_length = 0;
+    while (strcmp(buf, "\r\n")) {
+        parse_header(buf, header_name, header_value);
+        if (strcasecmp(header_name, "Content-length") == 0) {
+            content_length = atoi(header_value);
+        }
         string_append(&response, buf);
+        Rio_readlineb(&rio, buf, MAXLINE);
     }
+    string_append(&response, buf);
+
+    if (content_length == 0) {
+        // TODO: error handling
+        return;
+    } else {
+#ifdef DEBUG
+        fprintf(stderr, "Content-length: %d\n", content_length);
+#endif
+        // read content
+        char *content_buf = (char *)malloc((content_length+1)*sizeof(char));
+        Rio_readnb(&rio, content_buf, content_length);
+        string_appendn(&response, content_buf, (size_t)content_length);
+        free(content_buf);
+    }
+    if (Rio_readlineb(&rio, buf, MAXLINE) != 0) {
+        // TODO: error handling
+        return;
+    }
+    
+
 #ifdef DEBUG
-    fprintf(stderr, "response:\n%s", string_cstr(response));
+    fprintf(stderr, "response length: %zu\n", string_length(response));
+    // fprintf(stderr, "response:\n%s", string_cstr(response));
 #endif
 
     Rio_writen(outfd,