Skip to content

X
xv6-public
提交 acbc6c42 创建 作者: Silas Boyd-Wickizer's avatar Silas Boyd-Wickizer
浏览文件
操作

Some httpd clean up

上级 506b7066
显示空白字符变更
内嵌 并排
正在显示 包含 30 行增加 和 22 行删除
httpd.c
浏览文件 @ acbc6c42
...@@ -9,6 +9,23 @@ ...@@ -9,6 +9,23 @@
#define HTTP_VERSION "1.0" #define HTTP_VERSION "1.0"
#define BUFSIZE 512 #define BUFSIZE 512
static int xwrite(int fd, const void *buf, u64 n)
{
long r;
while (n) {
r = write(fd, buf, n);
if (r < 0 || r == 0) {
printf(1, "xwrite: failed %d\n", r);
return -1;
}
buf += r;
n -= r;
}
return 0;
}
static void static void
error(int s, int code) error(int s, int code)
{ {
...@@ -41,8 +58,8 @@ error(int s, int code) ...@@ -41,8 +58,8 @@ error(int s, int code)
errors[i].code, errors[i].msg); errors[i].code, errors[i].msg);
r = strlen(buf); r = strlen(buf);
if (write(s, buf, r) != r) if (xwrite(s, buf, r))
die("httpd error: incomplete write %d", r); printf(2, "httpd error: incomplete write");
} }
static int static int
...@@ -52,12 +69,10 @@ header(int s) ...@@ -52,12 +69,10 @@ header(int s)
"Server: xv6-httpd/" VERSION "\r\n"; "Server: xv6-httpd/" VERSION "\r\n";
int len; int len;
int r;
len = strlen(h); len = strlen(h);
r = write(s, h, len); if (xwrite(s, h, len))
if (r != len) die("httpd header: incomplete write");
die("httpd header: incomplete write %d", r);
return 0; return 0;
} }
...@@ -68,12 +83,10 @@ header_fin(int s) ...@@ -68,12 +83,10 @@ header_fin(int s)
static const char *f = "\r\n"; static const char *f = "\r\n";
int len; int len;
int r;
len = strlen(f); len = strlen(f);
r = write(s, f, len); if (xwrite(s, f, len))
if (r != len) die("httpd fin: incomplete write");
die("httpd fin: incomplete write %d", r);
return 0; return 0;
} }
...@@ -83,14 +96,13 @@ content_length(int s, u64 size) ...@@ -83,14 +96,13 @@ content_length(int s, u64 size)
{ {
char buf[128]; char buf[128];
int len; int len;
int r;
snprintf(buf, 128, "Content-Length: %lu\r\n", size); snprintf(buf, 128, "Content-Length: %lu\r\n", size);
len = strlen(buf); len = strlen(buf);
r = write(s, buf, len); if (xwrite(s, buf, len))
if (r != len) die("httpd size: incomplete write");
die("httpd size: incomplete write %d", r);
return 0; return 0;
} }
...@@ -100,12 +112,10 @@ content_type(int s) ...@@ -100,12 +112,10 @@ content_type(int s)
static const char *t = "Content-Type: text/plain\r\n"; static const char *t = "Content-Type: text/plain\r\n";
int len; int len;
int r;
len = strlen(t); len = strlen(t);
r = write(s, t, len); if (xwrite(s, t, len))
if (r != len) die("httpd content_type: incomplete write");
die("httpd content_type: incomplete write %d", r);
return 0; return 0;
} }
...@@ -114,7 +124,6 @@ content(int s, int fd) ...@@ -114,7 +124,6 @@ content(int s, int fd)
{ {
char buf[256]; char buf[256];
int n; int n;
int r;
for (;;) { for (;;) {
n = read(fd, buf, sizeof(buf)); n = read(fd, buf, sizeof(buf));
...@@ -125,9 +134,8 @@ content(int s, int fd) ...@@ -125,9 +134,8 @@ content(int s, int fd)
return 0; return 0;
} }
r = write(s, buf, n); if (xwrite(s, buf, n))
if (r != n) die("httpd content: write failed");
die("httpd content: read failed %d", r);
} }
} }
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论