aboutsummaryrefslogtreecommitdiff
path: root/toys
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2021-02-22 15:47:17 -0600
committerRob Landley <rob@landley.net>2021-02-22 15:47:17 -0600
commit4e9837a7ca0f1ee570245bf6df505ef84a5a5ed5 (patch)
treeb56792bd00801dcc01e007a76014e4f53f098432 /toys
parent6817e114bb320f197727740d7905a5cb2849bdfa (diff)
downloadtoybox-4e9837a7ca0f1ee570245bf6df505ef84a5a5ed5.tar.gz
Nope, marshalling install -D to cp caused regressions.
Diffstat (limited to 'toys')
-rw-r--r--toys/posix/cp.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/toys/posix/cp.c b/toys/posix/cp.c
index d7f2d934..56fbadf9 100644
--- a/toys/posix/cp.c
+++ b/toys/posix/cp.c
@@ -478,7 +478,6 @@ void mv_main(void)
static inline int cp_flag_F(void) { return FLAG_F; };
static inline int cp_flag_p(void) { return FLAG_p; };
static inline int cp_flag_v(void) { return FLAG_v; };
-static inline int cp_flag_D(void) { return FLAG_D; };
// Switch to install's flag context
#define CLEANUP_cp
@@ -529,7 +528,7 @@ void install_main(void)
// Translate flags from install to cp
toys.optflags = cp_flag_F() + cp_flag_v()*!!FLAG(v)
- + cp_flag_p()*!!(FLAG(p)|FLAG(o)|FLAG(g)) + cp_flag_D()*!!FLAG(D);
+ + cp_flag_p()*!!(FLAG(p)|FLAG(o)|FLAG(g));
TT.callback = install_node;
cp_main();