Changeset 132ab5d1 in mainline for uspace/app/bdsh/cmds/modules/cp/cp.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

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

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

@@ -28 +28 @@
 
 #include <errno.h>
+#include <str_error.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -66 +67 @@
 } dentry_type_t;
 
-static int64_t copy_file(const char *src, const char *dest,
+static int copy_file(const char *src, const char *dest,
     size_t blen, int vb);
 
@@ -175 +176 @@
 }
 
-static int64_t do_copy(const char *src, const char *dest,
+static int do_copy(const char *src, const char *dest,
     size_t blen, int vb, int recursive, int force, int interactive)
 {
-        int r = -1;
+        int rc = EOK;
         char dest_path[PATH_MAX];
         char src_path[PATH_MAX];
@@ -217 +218 @@
                                 printf("The dest directory %s does not exists",
                                     dest_path);
+                                rc = ENOENT;
                                 goto exit;
                         }
@@ -224 +226 @@
                         printf("Cannot overwrite existing directory %s\n",
                             dest_path);
+                        rc = EEXIST;
                         goto exit;
                 } else if (dest_type == TYPE_FILE) {
@@ -233 +236 @@
                          */
                         if (force && !interactive) {
-                                if (vfs_unlink_path(dest_path) != EOK) {
+                                rc = vfs_unlink_path(dest_path);
+                                if (rc != EOK) {
                                         printf("Unable to remove %s\n",
                                             dest_path);
@@ -244 +248 @@
                                 if (overwrite) {
                                         printf("Overwriting file: %s\n", dest_path);
-                                        if (vfs_unlink_path(dest_path) != EOK) {
+                                        rc = vfs_unlink_path(dest_path);
+                                        if (rc != EOK) {
                                                 printf("Unable to remove %s\n", dest_path);
                                                 goto exit;
@@ -250 +255 @@
                                 } else {
                                         printf("Not overwriting file: %s\n", dest_path);
-                                        r = 0;
+                                        rc = EOK;
                                         goto exit;
                                 }
                         } else {
                                 printf("File already exists: %s\n", dest_path);
+                                rc = EEXIST;
                                 goto exit;
                         }
@@ -260 +266 @@
 
                 /* call copy_file and exit */
-                r = (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) {
@@ -268 +276 @@
                         printf("Cannot copy the %s directory without the "
                             "-r option\n", src);
+                        rc = EINVAL;
                         goto exit;
                 } else if (dest_type == TYPE_FILE) {
                         printf("Cannot overwrite a file with a directory\n");
+                        rc = EEXIST;
                         goto exit;
                 }
@@ -293 +303 @@
                                 merge_paths(dest_path, PATH_MAX, src_dirname);
 
-                                if (vfs_link_path(dest_path, KIND_DIRECTORY,
-                                    NULL) != EOK) {
+                                rc = vfs_link_path(dest_path, KIND_DIRECTORY,
+                                    NULL);
+                                if (rc != EOK) {
                                         printf("Unable to create "
                                             "dest directory %s\n", dest_path);
@@ -308 +319 @@
                          * e.g. cp -r /src /data/new_dir_src
                          */
-                        if (vfs_link_path(dest_path, KIND_DIRECTORY,
-                            NULL) != EOK) {
+                        rc = vfs_link_path(dest_path, KIND_DIRECTORY, NULL);
+                        if (rc != EOK) {
                                 printf("Unable to create "
                                     "dest directory %s\n", dest_path);
@@ -321 +332 @@
                         /* Something strange is happening... */
                         printf("Unable to open src %s directory\n", src);
+                        rc = ENOENT;
                         goto exit;
                 }
@@ -348 +360 @@
                                 printf("Cannot copy a directory "
                                     "into itself\n");
+                                rc = EEXIST;
                                 goto exit;
                         }
@@ -355 +368 @@
 
                         /* Recursively call do_copy() */
-                        r = do_copy(src_dent, dest_dent, blen, vb, recursive,
+                        rc = do_copy(src_dent, dest_dent, blen, vb, recursive,
                             force, interactive);
-                        if (r)
+                        if (rc != EOK)
                                 goto exit;
 
@@ -367 +380 @@
         if (dir)
                 closedir(dir);
-        return r;
-}
-
-static int64_t copy_file(const char *src, const char *dest,
+        return rc;
+}
+
+static int copy_file(const char *src, const char *dest,
         size_t blen, int vb)
 {
-        int fd1, fd2, bytes;
+        int fd1, fd2;
+        size_t rbytes, wbytes;
+        int rc;
         off64_t total;
-        int64_t copied = 0;
         char *buff = NULL;
         aoff64_t posr = 0, posw = 0;
@@ -383 +397 @@
                 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);
@@ -410 +424 @@
                 printf("Unable to allocate enough memory to read %s\n",
                     src);
-                copied = -1;
+                rc = ENOMEM;
                 goto out;
         }
 
-        while ((bytes = vfs_read(fd1, &posr, buff, blen)) > 0) {
-                if ((bytes = vfs_write(fd2, &posw, buff, bytes)) < 0)
-                        break;
-                copied += bytes;
-        }
-
-        if (bytes < 0) {
-                printf("\nError copying %s, (%d)\n", src, bytes);
-                copied = bytes;
+        while ((rc = vfs_read(fd1, &posr, buff, blen, &rbytes)) == EOK &&
+            rbytes > 0) {
+                if ((rc = vfs_write(fd2, &posw, buff, rbytes, &wbytes)) != EOK)
+                        break;
+        }
+
+        if (rc != EOK) {
+                printf("\nError copying %s: %s\n", src, str_error(rc));
+                return -1;
         }
 
@@ -430 +444 @@
         if (buff)
                 free(buff);
-        return copied;
+        if (rc != EOK) {
+                return -1;
+        } else {
+                return 0;
+        }
 }
 
@@ -461 +479 @@
         int force = 0, interactive = 0;
         int c, opt_ind;
-        int64_t ret;
+        int ret;
 
         con = console_init(stdin, stdout);