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

Timestamp:

2017-04-05T18:10:39Z (7 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/cp/cp.c (modified) (10 diffs)

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

@@ -35 +35 @@
 #include <getopt.h>
 #include <str.h>
-#include <fcntl.h>
-#include <sys/stat.h>
+#include <vfs/vfs.h>
 #include <dirent.h>
 #include "config.h"
@@ -83 +82 @@
         struct stat s;
 
-        int r = stat(path, &s);
-
-        if (r != 0)
+        int r = vfs_stat_path(path, &s);
+
+        if (r != EOK)
                 return TYPE_NONE;
         else if (s.is_directory)
@@ -235 +234 @@
                          */
                         if (force && !interactive) {
-                                if (unlink(dest_path) != 0) {
+                                if (vfs_unlink_path(dest_path) != EOK) {
                                         printf("Unable to remove %s\n",
                                             dest_path);
@@ -246 +245 @@
                                 if (overwrite) {
                                         printf("Overwriting file: %s\n", dest_path);
-                                        if (unlink(dest_path) != 0) {
+                                        if (vfs_unlink_path(dest_path) != EOK) {
                                                 printf("Unable to remove %s\n", dest_path);
                                                 goto exit;
@@ -295 +294 @@
                                 merge_paths(dest_path, PATH_MAX, src_dirname);
 
-                                if (mkdir(dest_path, 0) != 0) {
+                                if (vfs_link_path(dest_path, KIND_DIRECTORY,
+                                    NULL) != EOK) {
                                         printf("Unable to create "
                                             "dest directory %s\n", dest_path);
@@ -309 +309 @@
                          * e.g. cp -r /src /data/new_dir_src
                          */
-                        if (mkdir(dest_path, 0) != 0) {
+                        if (vfs_link_path(dest_path, KIND_DIRECTORY,
+                            NULL) != EOK) {
                                 printf("Unable to create "
                                     "dest directory %s\n", dest_path);
@@ -341 +342 @@
 
                         /* Check if we are copying a directory into itself */
-                        stat(src_dent, &src_s);
-                        stat(dest_path, &dest_s);
+                        vfs_stat_path(src_dent, &src_s);
+                        vfs_stat_path(dest_path, &dest_s);
 
                         if (dest_s.index == src_s.index &&
@@ -377 +378 @@
         int64_t copied = 0;
         char *buff = NULL;
+        aoff64_t posr = 0, posw = 0;
+        struct stat st;
 
         if (vb)
                 printf("Copying %s to %s\n", src, dest);
 
-        if (-1 == (fd1 = open(src, O_RDONLY))) {
+        fd1 = vfs_lookup_open(src, WALK_REGULAR, MODE_READ);
+        if (fd1 < 0) {
                 printf("Unable to open source file %s\n", src);
                 return -1;
         }
 
-        if (-1 == (fd2 = open(dest, O_CREAT))) {
+        fd2 = vfs_lookup_open(dest, WALK_REGULAR | WALK_MAY_CREATE, MODE_WRITE);
+        if (fd2 < 0) {
                 printf("Unable to open destination file %s\n", dest);
-                close(fd1);
+                vfs_put(fd1);
                 return -1;
         }
 
-        total = lseek(fd1, 0, SEEK_END);
-
+        if (vfs_stat(fd1, &st) != EOK) {
+                printf("Unable to fstat %d\n", fd1);
+                vfs_put(fd1);
+                vfs_put(fd2);
+                return -1;      
+        }
+
+        total = st.size;
         if (vb)
                 printf("%" PRIu64 " bytes to copy\n", total);
-
-        lseek(fd1, 0, SEEK_SET);
 
         if (NULL == (buff = (char *) malloc(blen))) {
@@ -406 +415 @@
         }
 
-        while ((bytes = read(fd1, buff, blen)) > 0) {
-                if ((bytes = write(fd2, buff, bytes)) < 0)
+        while ((bytes = vfs_read(fd1, &posr, buff, blen)) > 0) {
+                if ((bytes = vfs_write(fd2, &posw, buff, bytes)) < 0)
                         break;
                 copied += bytes;
@@ -413 +422 @@
 
         if (bytes < 0) {
-                printf("\nError copying %s, (%d)\n", src, errno);
+                printf("\nError copying %s, (%d)\n", src, bytes);
                 copied = bytes;
         }
 
 out:
-        close(fd1);
-        close(fd2);
+        vfs_put(fd1);
+        vfs_put(fd2);
         if (buff)
                 free(buff);