cp: fix option handling in non-longopt config

the patch getopt32: remove opt_complementary 22542eca18e5807b72ddc78999f5101e33f17a53

introduced a regressed in the cp command since it removed all aliases of arguments
if long_opts is not configured.

Patch by Sebastian Gottschall <s.gottschall@dd-wrt.com>

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/coreutils/cp.c b/coreutils/cp.c
index 8d93c6fe4b3014628857e7457b7941640a8bf8f2..455bffbba1299f03aca7fc63e1337be2a6310626 100644 (file)
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -101,7 +101,11 @@ int cp_main(int argc, char **argv)
                "parents\0"        No_argument "\xfe"
        );
 #else
-       flags = getopt32(argv, FILEUTILS_CP_OPTSTR);
+       flags = getopt32(argv, "^"
+               FILEUTILS_CP_OPTSTR
+               "\0"
+               "-2:l--s:s--l:Pd:rRd:Rd:apdR"
+       );
 #endif
        /* Options of cp from GNU coreutils 6.10:
         * -a, --archive