From: Jim Meyering <jim@meyering.net>
Date: Mon, 11 May 1998 04:07:16 +0000 (+0000)
Subject: reflect additional parameter to copy
X-Git-Tag: FILEUTILS-3_16o~68
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=859bfc78b10accd87729925e3cb3d9f45aae951b;p=platform%2Fupstream%2Fcoreutils.git

reflect additional parameter to copy
initialize new member: move_mode.
---

diff --git a/src/cp.c b/src/cp.c
index be7c91a..f3c2390 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -485,7 +485,7 @@ do_copy (int argc, char **argv, const struct cp_options *x)
 	  else
 	    {
 	      int unused;
-	      ret |= copy (arg, dst_path, new_dst, x, &unused);
+	      ret |= copy (arg, dst_path, new_dst, x, &unused, NULL);
 	      forget_all ();
 
 	      if (flag_path)
@@ -573,7 +573,7 @@ do_copy (int argc, char **argv, const struct cp_options *x)
 	  new_dest = dest;
 	}
 
-      return copy (source, new_dest, new_dst, x, &unused);
+      return copy (source, new_dest, new_dst, x, &unused, NULL);
     }
   else
     {
@@ -598,6 +598,7 @@ cp_option_init (struct cp_options *x)
   x->hard_link = 0;
   x->interactive = 0;
   x->myeuid = geteuid ();
+  x->move_mode = 0;
   x->one_file_system = 0;
 
   x->preserve_owner_and_group = 0;
diff --git a/src/install.c b/src/install.c
index 8d85881..f5a3ddb 100644
--- a/src/install.c
+++ b/src/install.c
@@ -208,6 +208,7 @@ cp_option_init (struct cp_options *x)
 
   x->hard_link = 0;
   x->interactive = 0;
+  x->move_mode = 0;
   x->myeuid = geteuid ();
   x->one_file_system = 0;
   x->preserve_owner_and_group = 0;
@@ -476,7 +477,7 @@ copy_file (const char *from, const char *to, const struct cp_options *x)
       return 1;
     }
 
-  fail = copy (from, to, nonexistent_dst, x, &copy_into_self);
+  fail = copy (from, to, nonexistent_dst, x, &copy_into_self, NULL);
 
   return fail;
 }