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

Timestamp:

2017-12-21T20:24:54Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Parents:

f04b5b3

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-21 18:24:59)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-21 20:24:54)

Message:

The "not-so-obvious" error handling tweaks.

File:

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

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

@@ -266 +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) {
@@ -434 +436 @@
         if (rc != EOK) {
                 printf("\nError copying %s: %s\n", src, str_error(rc));
-                return rc;
+                return -1;
         }
 
@@ -442 +444 @@
         if (buff)
                 free(buff);
-        return rc;
+        if (rc != EOK) {
+                return -1;
+        } else {
+                return 0;
+        }
 }
 
@@ -473 +479 @@
         int force = 0, interactive = 0;
         int c, opt_ind;
-        int64_t ret;
+        int ret;
 
         con = console_init(stdin, stdout);