Changes in uspace/app/bdsh/cmds/modules/cp/cp.c [6afc9d7:07b7c48] in mainline

File:

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

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

@@ -27 +27 @@
  */
 
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -85 +84 @@
         int r = stat(path, &s);
 
-        if (r != 0)
+        if (r)
                 return TYPE_NONE;
         else if (s.is_directory)
@@ -235 +234 @@
                          */
                         if (force && !interactive) {
-                                if (unlink(dest_path) != 0) {
+                                if (unlink(dest_path)) {
                                         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 (unlink(dest_path)) {
                                                 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 (mkdir(dest_path, 0) == -1) {
                                         printf("Unable to create "
                                             "dest directory %s\n", dest_path);
@@ -309 +308 @@
                          * e.g. cp -r /src /data/new_dir_src
                          */
-                        if (mkdir(dest_path, 0) != 0) {
+                        if (mkdir(dest_path, 0)) {
                                 printf("Unable to create "
                                     "dest directory %s\n", dest_path);
@@ -406 +405 @@
         }
 
-        while ((bytes = read(fd1, buff, blen)) > 0) {
-                if ((bytes = write(fd2, buff, bytes)) < 0)
+        while ((bytes = read_all(fd1, buff, blen)) > 0) {
+                if ((bytes = write_all(fd2, buff, bytes)) < 0)
                         break;
                 copied += bytes;
@@ -413 +412 @@
 
         if (bytes < 0) {
-                printf("\nError copying %s, (%d)\n", src, errno);
+                printf("\nError copying %s, (%d)\n", src, bytes);
                 copied = bytes;
         }
@@ -458 +457 @@
         argc = cli_count_args(argv);
 
-        for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
+        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
                 c = getopt_long(argc, argv, "hvVfirb:", long_options, &opt_ind);
                 switch (c) {