[git commit] cp: fix build failure with long options disabled

Denys Vlasenko vda.linux at googlemail.com
Sun Aug 15 16:26:56 UTC 2021


commit: https://git.busybox.net/busybox/commit/?id=98cb561b5fd61fe37126fce7d557d5280c762b59
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

When long options were disabled cp failed to compile with:

coreutils/cp.c:130:9: error: empty enum is invalid
  130 |         };
      |         ^

Rearrange the conditional compilation to suit.

Signed-off-by: Ron Yorston <rmy at pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 coreutils/cp.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/coreutils/cp.c b/coreutils/cp.c
index 50ca1ccea..ee40af50b 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -121,14 +121,12 @@ int cp_main(int argc, char **argv)
 	int d_flags;
 	int flags;
 	int status;
-	enum {
 #if ENABLE_FEATURE_CP_LONG_OPTIONS
+	enum {
 		/*OPT_rmdest  = FILEUTILS_RMDEST = 1 << FILEUTILS_CP_OPTBITS */
 		OPT_parents = 1 << (FILEUTILS_CP_OPTBITS+1),
 		OPT_reflink = 1 << (FILEUTILS_CP_OPTBITS+2),
-#endif
 	};
-#if ENABLE_FEATURE_CP_LONG_OPTIONS
 # if ENABLE_FEATURE_CP_REFLINK
 	char *reflink = NULL;
 # endif


More information about the busybox-cvs mailing list