Changes in uspace/app/websrv/websrv.c [b99f6e2:ce04ea44] in mainline

File:

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

uspace/app/websrv/websrv.c

@@ -39 +39 @@
 #include <stdio.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <stdlib.h>
-#include <fcntl.h>
 #include <task.h>
+
+#include <vfs/vfs.h>
 
 #include <inet/addr.h>
@@ -225 +225 @@
                 return ENOMEM;
         
-        int fd = open(fname, O_RDONLY);
+        int fd = vfs_lookup_open(fname, WALK_REGULAR, MODE_READ);
         if (fd < 0) {
                 rc = send_response(conn, msg_not_found);
@@ -238 +238 @@
                 return rc;
         
+        aoff64_t pos = 0;
         while (true) {
-                ssize_t nr = read(fd, fbuf, BUFFER_SIZE);
+                ssize_t nr = vfs_read(fd, &pos, fbuf, BUFFER_SIZE);
                 if (nr == 0)
                         break;
                 
                 if (nr < 0) {
-                        close(fd);
+                        vfs_put(fd);
                         return EIO;
                 }
@@ -251 +252 @@
                 if (rc != EOK) {
                         fprintf(stderr, "tcp_conn_send() failed\n");
-                        close(fd);
+                        vfs_put(fd);
                         return rc;
                 }
         }
         
-        close(fd);
+        vfs_put(fd);
         
         return EOK;