Changes in uspace/app/bdsh/cmds/modules/cp/cp.c [8e3498b:39330200] in mainline

File:

• uspace/app/bdsh/cmds/modules/cp/cp.c (modified) (9 diffs)

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

@@ -28 +28 @@
 
 #include <errno.h>
+#include <str_error.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -79 +80 @@
 static dentry_type_t get_type(const char *path)
 {
-        struct stat s;
-
-        int r = vfs_stat_path(path, &s);
+        vfs_stat_t s;
+
+        errno_t r = vfs_stat_path(path, &s);
 
         if (r != EOK)
@@ -175 +176 @@
 }
 
-static int do_copy(const char *src, const char *dest,
+static errno_t do_copy(const char *src, const char *dest,
     size_t blen, int vb, int recursive, int force, int interactive)
 {
-        int rc = EOK;
+        errno_t rc = EOK;
         char dest_path[PATH_MAX];
         char src_path[PATH_MAX];
@@ -265 +266 @@
 
                 /* call copy_file and exit */
-                rc = (copy_file(src, dest_path, blen, vb) < 0);
+                if (copy_file(src, dest_path, blen, vb) < 0) {
+                        rc = EIO;
+                }
 
         } else if (src_type == TYPE_DIR) {
@@ -337 +340 @@
                  */
                 while ((dp = readdir(dir))) {
-                        struct stat src_s;
-                        struct stat dest_s;
+                        vfs_stat_t src_s;
+                        vfs_stat_t dest_s;
 
                         char src_dent[PATH_MAX];
@@ -385 +388 @@
         int fd1, fd2;
         size_t rbytes, wbytes;
-        int rc;
+        errno_t rc;
         off64_t total;
         char *buff = NULL;
         aoff64_t posr = 0, posw = 0;
-        struct stat st;
+        vfs_stat_t st;
 
         if (vb)
                 printf("Copying %s to %s\n", src, dest);
 
-        fd1 = vfs_lookup_open(src, WALK_REGULAR, MODE_READ);
-        if (fd1 < 0) {
+        rc = vfs_lookup_open(src, WALK_REGULAR, MODE_READ, &fd1);
+        if (rc != EOK) {
                 printf("Unable to open source file %s\n", src);
                 return -1;
         }
 
-        fd2 = vfs_lookup_open(dest, WALK_REGULAR | WALK_MAY_CREATE, MODE_WRITE);
-        if (fd2 < 0) {
+        rc = vfs_lookup_open(dest, WALK_REGULAR | WALK_MAY_CREATE, MODE_WRITE, &fd2);
+        if (rc != EOK) {
                 printf("Unable to open destination file %s\n", dest);
                 vfs_put(fd1);
@@ -432 +435 @@
 
         if (rc != EOK) {
-                printf("\nError copying %s, (%d)\n", src, rc);
-                return rc;
+                printf("\nError copying %s: %s\n", src, str_error(rc));
+                return -1;
         }
 
@@ -441 +444 @@
         if (buff)
                 free(buff);
-        return rc;
+        if (rc != EOK) {
+                return -1;
+        } else {
+                return 0;
+        }
 }
 
@@ -472 +479 @@
         int force = 0, interactive = 0;
         int c, opt_ind;
-        int64_t ret;
+        errno_t ret;
 
         con = console_init(stdin, stdout);