From e3c6a0973c8a4fe17d2510093738ef5ae052523e Mon Sep 17 00:00:00 2001 From: Xabier Oneca Date: Sat, 10 Apr 2021 00:11:46 +0200 Subject: [PATCH] touch: prevent usage of -r and -t at once coreutils forbids this combination. Signed-off-by: Xabier Oneca Signed-off-by: Denys Vlasenko --- coreutils/touch.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/coreutils/touch.c b/coreutils/touch.c index 8d3f8dbbe..189428a79 100644 --- a/coreutils/touch.c +++ b/coreutils/touch.c @@ -120,14 +120,18 @@ int touch_main(int argc UNUSED_PARAM, char **argv) * accepted data format differs a bit between -d and -t. * We accept the same formats for both */ - opts = getopt32long(argv, "c" IF_FEATURE_TOUCH_NODEREF("h") - IF_FEATURE_TOUCH_SUSV3("r:d:t:am") - /*ignored:*/ "f" IF_NOT_FEATURE_TOUCH_SUSV3("am"), - touch_longopts + opts = getopt32long(argv, "^" + "c" IF_FEATURE_TOUCH_NODEREF("h") + IF_FEATURE_TOUCH_SUSV3("r:d:t:am") + /*ignored:*/ "f" IF_NOT_FEATURE_TOUCH_SUSV3("am") + "\0" /* opt_complementary: */ + /* coreutils forbids -r and -t at once: */ IF_FEATURE_TOUCH_SUSV3("r--t:t--r") + /* but allows these combinations: "r--d:d--r:t--d:d--t" */, + touch_longopts #if ENABLE_FEATURE_TOUCH_SUSV3 - , &reference_file - , &date_str - , &date_str + , &reference_file + , &date_str + , &date_str #endif );