Changes in uspace/app/websrv/websrv.c [d5c1051:d076f16] in mainline

File:

• uspace/app/websrv/websrv.c (modified) (4 diffs)

uspace/app/websrv/websrv.c

@@ -168 +168 @@
                 rc = tcp_conn_recv_wait(recv->conn, recv->rbuf, BUFFER_SIZE, &nrecv);
                 if (rc != EOK) {
-                        fprintf(stderr, "tcp_conn_recv() failed: %s\n", str_error(rc));
+                        fprintf(stderr, "tcp_conn_recv() failed (%d)\n", rc);
                         return rc;
                 }
@@ -247 +247 @@
         char *fname = NULL;
         int rc;
-        size_t nr;
         int fd = -1;
         
@@ -259 +258 @@
                 uri = "/index.html";
         
-        if (asprintf(&fname, "%s%s", WEB_ROOT, uri) < 0) {
+        rc = asprintf(&fname, "%s%s", WEB_ROOT, uri);
+        if (rc < 0) {
                 rc = ENOMEM;
                 goto out;
         }
         
-        rc = vfs_lookup_open(fname, WALK_REGULAR, MODE_READ, &fd);
-        if (rc != EOK) {
+        fd = vfs_lookup_open(fname, WALK_REGULAR, MODE_READ);
+        if (fd < 0) {
                 rc = send_response(conn, msg_not_found);
                 goto out;
@@ -279 +279 @@
         aoff64_t pos = 0;
         while (true) {
-                rc = vfs_read(fd, &pos, fbuf, BUFFER_SIZE, &nr);
-                if (rc != EOK)
-                        goto out;
-                
+                ssize_t nr = vfs_read(fd, &pos, fbuf, BUFFER_SIZE);
                 if (nr == 0)
                         break;
+                
+                if (nr < 0) {
+                        rc = EIO;
+                        goto out;
+                }
                 
                 rc = tcp_conn_send(conn, fbuf, nr);