Mikael: 27647: _cp update

2 files changed, 16 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index e756f56e7..83da8f9a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-02  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* Mikael: 27647: Completion/Unix/Command/_cp: update
+
 2010-02-02  Peter Stephenson  <pws@csr.com>
 
 	* unposted: Doc/Zsh/contrib.yo: minor doc upgrade for
@@ -12665,5 +12669,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4879 $
+* $Revision: 1.4880 $
 *****************************************************
diff --git a/Completion/Unix/Command/_cp b/Completion/Unix/Command/_cp
index 9838b1702..958214a18 100644
--- a/Completion/Unix/Command/_cp
+++ b/Completion/Unix/Command/_cp
@@ -3,27 +3,29 @@
 _arguments -s \
   '(-a --archive)'{-a,--archive}'[same as -dpR]' \
   '(-b --backup)-b[backup]' \
-  '(-b --backup)--backup=:method:(none off numbered t existing nil simple never)' \
+  '(-b --backup)--backup=[backup]:method:(none off numbered t existing nil simple never)' \
   '--copy-contents[copy contents of special files when recursive]' \
-  '-d[same as --no-dereference --preserve=link]' \
+  '-d[same as --no-dereference --preserve=links]' \
   '(-f --force)'{-f,--force}'[remove and retry for destinations that cannot be opened]' \
   '(-i --interactive)'{-i,--interactive}'[prompt before overwrite]' \
   '-H[follow command-line symbolic links]' \
   '(-l --link)'{-l,--link}'[link files instead of copying]' \
   '(-L --dereference)'{-L,--dereference}'[always follow symbolic links]' \
+  '(-n --no-clobber)'{-n,--no-clobber}'[do not overwrite an existing file]' \
+  '(-P --no-dereference)'{-P,--no-dereference}'[never follow symbolic links]' \
   '-p[same as --preserve=mode,ownership,timestamps]' \
-  '--preserve=:attributes to preserve:_values -s , attribute mode ownership timestamps links all' \
-  '--no-preserve=:attributes not to preserve:_values -s , attribute mode ownership timestamps links all' \
+  '--preserve=[preserve specified attributes]:attributes to preserve:_values -s , mode timestamps ownership links context xattr all' \
+  '--no-preserve=[don'\''t preserve specified attributes]:attributes not to preserve:_values -s , mode timestamps ownership links context xattr all' \
   '--parents[append source path to target directory]' \
-  '-P[same as --no-dereference]' \
   '(-R -r --recursive)'{-R,-r,--recursive}'[copy directories recursively]' \
+  '--reflink=[control clone/CoW copies]:when to perform a lightweight copy:(always auto)' \
   '--remove-destination[remove each existing destination file before attempting to open it]' \
-  '--reply=:how to handle the prompt about an existing destination file:(yes no query)' \
-  '--sparse=:when to create sparse files:(auto always never)' \
+  '--sparse=[control creation of sparse files]:when to create sparse files:(auto always never)' \
   '--strip-trailing-slashes[remove any trailing slashes from each source argument]' \
   '(-s --symbolic-link)'{-s,--symbolic-link}'[make symbolic links instead of copies of non-directories]' \
-  '(-S --suffix)'{-S,--suffix=}':backup suffix:' \
-  '--target-directory=:target directory:_files -/' \
+  '(-S --suffix)'{-S,--suffix=}'[override the usual backup suffix]:backup suffix:' \
+  '(-t --target-directory)'{-t,--target-directory=}'[copy all source arguments into target directory]:target directory:_files -/' \
+  '(-T --no-target-directory)'{-T,--no-target-directory}'[treat DEST as a normal file]' \
   '(-u --update)'{-u,--update}'[copy only when source is newer than destination or destination is missing]' \
   '(-v --verbose)'{-v,--verbose}'[explain what is being done]' \
   '(-x --one-file-system)'{-x,--one-file-system}'[stay on this file system]' \