From 050e36a10ebf91bfe8307eea7fc5156d5daf8fc9 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Fri, 21 Aug 2020 02:11:25 +0100 Subject: Fix cp -P to not follow symlinks. Also fix help text to say that it is not the default. --- toys/posix/cp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'toys/posix/cp.c') diff --git a/toys/posix/cp.c b/toys/posix/cp.c index 06f1ff92..fd893ef4 100644 --- a/toys/posix/cp.c +++ b/toys/posix/cp.c @@ -38,7 +38,7 @@ config CP -L Follow all symlinks -l Hard link instead of copy -n No clobber (don't overwrite DEST) - -P Do not follow symlinks [default] + -P Do not follow symlinks -p Preserve timestamps, ownership, and mode -R Recurse into subdirectories (DEST must be a directory) -r Synonym for -R @@ -238,7 +238,7 @@ static int cp_node(struct dirtree *try) // Do something _other_ than copy contents of a file? } else if (!S_ISREG(try->st.st_mode) - && (try->parent || (flags & (FLAG_a|FLAG_r)))) + && (try->parent || (flags & (FLAG_a|FLAG_P|FLAG_r)))) { int i; -- cgit v1.2.3