Changeset 368ee04 in mainline for uspace/app/bdsh/cmds/modules/touch/touch.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/bdsh/cmds/modules/touch/touch.c (modified) (3 diffs)

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

@@ -35 +35 @@
 #include <stdlib.h>
 #include <unistd.h>
-#include <fcntl.h>
 #include <dirent.h>
 #include <sys/types.h>
 #include <str.h>
 #include <getopt.h>
-#include <sys/stat.h>
 #include <errno.h>
+#include <vfs/vfs.h>
 
 #include "config.h"
@@ -123 +122 @@
                 
                 /* Check whether file exists if -c (--no-create) option is given */
-                if ((!no_create) || ((no_create) && (stat(buff, &file_stat) == 0)))
-                        fd = open(buff, O_RDWR | O_CREAT);
+                if ((!no_create) ||
+                    ((no_create) && (vfs_stat_path(buff, &file_stat) == EOK))) {
+                        fd = vfs_lookup(buff, WALK_REGULAR | WALK_MAY_CREATE);
+                }
                 
                 if (fd < 0) {
@@ -132 +133 @@
                         continue;
                 } else {
-                        close(fd);
+                        vfs_put(fd);
                         fd = -1;
                 }