Changeset 368ee04 in mainline for uspace/app/websrv/websrv.c

Timestamp:

2017-04-05T18:10:39Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

93ad8166

Parents:

39f892a9 (diff), 2166728 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/vfs-2.5-cherrypick

This merge cherry-picks some of the changesets from Jiri Zarevucky's:

lp:~zarevucky-jiri/helenos/vfs-2.5

and then continues independently, yet sometime in a similar vein.

Roughly speaking, Jiri's branch is merged entirely up to its revision
1926 and then cherry-picked on and off until its revision 1965. Among
these changes are:

• relativization of the API,
• client-side roots,
• server-side mounts,
• inbox for passing arbitrary files from parent to child,
• some streamlining and cleanup.

Additional changes include:

• addressing issues introduced by the above changes,
• client-side I/O cursors (file positions),
• all HelenOS file system APIs begin with the vfs_ prefix and can be used after including vfs/vfs.h,
• removal of some POSIX-ish headers and definitions,
• additional cleanup.

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;