Changeset 368ee04 in mainline for uspace/app/bdsh/cmds/modules/mkfile/mkfile.c

Timestamp:

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

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, 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/bdsh/cmds/modules/mkfile/mkfile.c (modified) (7 diffs)

uspace/app/bdsh/cmds/modules/mkfile/mkfile.c

@@ -31 +31 @@
 #include <stdlib.h>
 #include <dirent.h>
-#include <fcntl.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <macros.h>
 #include <getopt.h>
@@ -39 +37 @@
 #include <str.h>
 #include <ctype.h>
+#include <vfs/vfs.h>
 
 #include "config.h"
@@ -121 +120 @@
         void *buffer;
         bool create_sparse = false;
+        aoff64_t pos = 0;
 
         file_size = 0;
@@ -156 +156 @@
         file_name = argv[optind];
 
-        fd = open(file_name, O_CREAT | O_EXCL | O_WRONLY, 0666);
+        fd = vfs_lookup_open(file_name, WALK_REGULAR | WALK_MUST_CREATE, MODE_WRITE);
         if (fd < 0) {
                 printf("%s: failed to create file %s.\n", cmdname, file_name);
@@ -164 +164 @@
         if (create_sparse && file_size > 0) {
                 const char byte = 0x00;
-
-                if ((rc2 = lseek(fd, file_size - 1, SEEK_SET)) < 0) {
-                        close(fd);
-                        goto error;
-                }
-
-                rc2 = write(fd, &byte, sizeof(char));
+                
+                pos = file_size - 1;
+                rc2 = vfs_write(fd, &pos, &byte, sizeof(char));
                 if (rc2 < 0) {
-                        close(fd);
+                        vfs_put(fd);
                         goto error;
                 }
@@ -187 +183 @@
         while (total_written < file_size) {
                 to_write = min(file_size - total_written, BUFFER_SIZE);
-                rc = write(fd, buffer, to_write);
+                rc = vfs_write(fd, &pos, buffer, to_write);
                 if (rc <= 0) {
                         printf("%s: Error writing file (%d).\n", cmdname, errno);
-                        close(fd);
+                        vfs_put(fd);
                         free(buffer);
                         return CMD_FAILURE;
@@ -199 +195 @@
         free(buffer);
 
-        if (close(fd) < 0)
+        if (vfs_put(fd) < 0)
                 goto error;