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

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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 mainline changes.

File:

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

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

@@ -27 +27 @@
  */
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -84 +85 @@
         int r = stat(path, &s);
 
-        if (r)
+        if (r != 0)
                 return TYPE_NONE;
         else if (s.is_directory)
@@ -234 +235 @@
                          */
                         if (force && !interactive) {
-                                if (unlink(dest_path)) {
+                                if (unlink(dest_path) != 0) {
                                         printf("Unable to remove %s\n",
                                             dest_path);
@@ -245 +246 @@
                                 if (overwrite) {
                                         printf("Overwriting file: %s\n", dest_path);
-                                        if (unlink(dest_path)) {
+                                        if (unlink(dest_path) != 0) {
                                                 printf("Unable to remove %s\n", dest_path);
                                                 goto exit;
@@ -294 +295 @@
                                 merge_paths(dest_path, PATH_MAX, src_dirname);
 
-                                if (mkdir(dest_path, 0) == -1) {
+                                if (mkdir(dest_path, 0) != 0) {
                                         printf("Unable to create "
                                             "dest directory %s\n", dest_path);
@@ -308 +309 @@
                          * e.g. cp -r /src /data/new_dir_src
                          */
-                        if (mkdir(dest_path, 0)) {
+                        if (mkdir(dest_path, 0) != 0) {
                                 printf("Unable to create "
                                     "dest directory %s\n", dest_path);
@@ -405 +406 @@
         }
 
-        while ((bytes = read_all(fd1, buff, blen)) > 0) {
-                if ((bytes = write_all(fd2, buff, bytes)) < 0)
+        while ((bytes = read(fd1, buff, blen)) > 0) {
+                if ((bytes = write(fd2, buff, bytes)) < 0)
                         break;
                 copied += bytes;
@@ -412 +413 @@
 
         if (bytes < 0) {
-                printf("\nError copying %s, (%d)\n", src, bytes);
+                printf("\nError copying %s, (%d)\n", src, errno);
                 copied = bytes;
         }