i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

googlefs: error handling

Browse Source 
Damn this code is ugly!

Also dump the header we get to /tmp
This commit is contained in:
François Revol
2015-11-08 04:48:31 +01:00
parent 25472bc40a
commit 49d3cc2a78
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/googlefs/http_cnx.c
+17 -2
View File
@@ -128,9 +128,10 @@ status_t http_get(struct http_cnx *cnx, const char *url)
long contentlen = 0; long contentlen = 0;
if (strlen(url) > 4096 - 128) if (strlen(url) > 4096 - 128)
return EINVAL; return EINVAL;
req = malloc(4096); req = malloc(4096+1);
if (!req) if (!req)
return B_NO_MEMORY; return B_NO_MEMORY;
req[4096] = '\0';
/* no snprintf in kernel :( */ /* no snprintf in kernel :( */
sprintf(req, "GET %s HTTP/"HTTPVER"\r\nUser-Agent: " GOOGLEFS_UA "\r\nAccept: */*\r\n\r\n", url); sprintf(req, "GET %s HTTP/"HTTPVER"\r\nUser-Agent: " GOOGLEFS_UA "\r\nAccept: */*\r\n\r\n", url);
reqlen = strlen(req); reqlen = strlen(req);
@@ -140,10 +141,24 @@ status_t http_get(struct http_cnx *cnx, const char *url)
reqlen = 4096; reqlen = 4096;
err = len = read(cnx->sock, req, reqlen); err = len = read(cnx->sock, req, reqlen);
printf("read(sock) = %d\n", len); printf("read(sock) = %d\n", len);
if (err < 0)
goto err0;
//write(1, req, len); //write(1, req, len);
err = B_NO_MEMORY; {
int fd;
// debug output
fd = open("/tmp/google.html_", O_CREAT|O_TRUNC|O_RDWR, 0644);
write(fd, req, len);
close(fd);
}
err = EINVAL;
if (len < 10) if (len < 10)
goto err0; goto err0;
if (!strstr(req, "HTTP/1.0 200"))
goto err0;
err = B_NO_MEMORY;
if (!strstr(req, "\r\n\r\n")) { if (!strstr(req, "\r\n\r\n")) {
if (!strstr(req, "\n\n")) /* shouldn't happen */ if (!strstr(req, "\n\n")) /* shouldn't happen */
goto err0; goto err0;