Ticket #24525: patch-use_coreutils.diff

src/apply.c

@@ -72 +72 @@
     if (force_command != NULL)
         command = force_command;
     else if (strcmp(program, "qmv") == 0)
-        command = "mv";
+        command = "gmv";
     else
-        command = "cp";
+        command = "gcp";
 
     child = fork();
     if (child < 0) {

src/icmd.c

@@ -45 +45 @@
 #include "common/string-utils.h"
 #include "common/common.h"
 
-#define MV_COMMAND "mv"
-#define CP_COMMAND "cp"
+#define MV_COMMAND "gmv"
+#define CP_COMMAND "gcp"
 /* This list should be up to date with mv and cp!
  * It was last updated on 2007-11-30 for
  * Debian coreutils 5.97-5.4 in unstable.

src/list.c

@@ -311 +311 @@
     ls_args_list = llist_clone(ls_options);     /* llist_add_all! */
     llist_add_last(ls_args_list, "--");
     llist_add_first(ls_args_list, "--quoting-style=c");
-    llist_add_first(ls_args_list, "ls");
+    llist_add_first(ls_args_list, "gls");
 
     if (llist_contains(ls_options, "--directory")) {
         firstdir = ".";
@@ -411 +411 @@
             die(_("cannot close file: %s"), errstr);
         if (dup2(child_pipe[1], STDOUT_FILENO) == -1)
             die(_("cannot duplicate file descriptor: %s"), errstr);
-        execvp("ls", args);
+        execvp("gls", args);
         die(_("cannot execute `ls': %s"), errstr);
     }
     *ls_pid = child_pid;