2 files changed, 21 insertions, 13 deletions

diff --git a/include/bb_archive.h b/include/bb_archive.h
index 03f174839..9bbf59bb8 100644
--- a/include/bb_archive.h
+++ b/include/bb_archive.h
@@ -221,7 +221,7 @@ void dealloc_bunzip(bunzip_data *bd) FAST_FUNC;
 
 /* Meaning and direction (input/output) of the fields are transformer-specific */
 typedef struct transformer_state_t {
-        smallint check_signature; /* most often referenced member */
+        smallint signature_skipped; /* most often referenced member */
 
         IF_DESKTOP(long long) int FAST_FUNC (*xformer)(struct transformer_state_t *xstate);
         USE_FOR_NOMMU(const char *xformer_prog;)
@@ -262,11 +262,11 @@ int bbunpack(char **argv,
 void check_errors_in_children(int signo);
 #if BB_MMU
 void fork_transformer(int fd,
-        int check_signature,
+        int signature_skipped,
         IF_DESKTOP(long long) int FAST_FUNC (*transformer)(transformer_state_t *xstate)
 ) FAST_FUNC;
-#define fork_transformer_with_sig(fd, transformer, transform_prog) fork_transformer((fd), 1, (transformer))
-#define fork_transformer_with_no_sig(fd, transformer)              fork_transformer((fd), 0, (transformer))
+#define fork_transformer_with_sig(fd, transformer, transform_prog) fork_transformer((fd), 0, (transformer))
+#define fork_transformer_with_no_sig(fd, transformer)              fork_transformer((fd), 1, (transformer))
 #else
 void fork_transformer(int fd, const char *transform_prog) FAST_FUNC;
 #define fork_transformer_with_sig(fd, transformer, transform_prog) fork_transformer((fd), (transform_prog))
diff --git a/include/libbb.h b/include/libbb.h
index 9402bb04b..6db03d2df 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -362,7 +362,7 @@ extern char *strrstr(const char *haystack, const char *needle) FAST_FUNC;
 //TODO: supply a pointer to char[11] buffer (avoid statics)?
 extern const char *bb_mode_string(mode_t mode) FAST_FUNC;
 extern int is_directory(const char *name, int followLinks) FAST_FUNC;
-enum {  /* DO NOT CHANGE THESE VALUES!  cp.c, mv.c, install.c depend on them. */
+enum {  /* cp.c, mv.c, install.c depend on these values. CAREFUL when changing them! */
         FILEUTILS_PRESERVE_STATUS = 1 << 0, /* -p */
         FILEUTILS_DEREFERENCE     = 1 << 1, /* !-d */
         FILEUTILS_RECUR           = 1 << 2, /* -R */
@@ -372,15 +372,25 @@ enum {	/* DO NOT CHANGE THESE VALUES!  cp.c, mv.c, install.c depend on them. */
         FILEUTILS_MAKE_SOFTLINK   = 1 << 6, /* -s */
         FILEUTILS_DEREF_SOFTLINK  = 1 << 7, /* -L */
         FILEUTILS_DEREFERENCE_L0  = 1 << 8, /* -H */
+        /* -a = -pdR (mapped in cp.c) */
+        /* -r = -dR  (mapped in cp.c) */
+        /* -P = -d   (mapped in cp.c) */
+        FILEUTILS_VERBOSE         = (1 << 12) * ENABLE_FEATURE_VERBOSE, /* -v */
+        FILEUTILS_UPDATE          = 1 << 13, /* -u */
 #if ENABLE_SELINUX
-        FILEUTILS_PRESERVE_SECURITY_CONTEXT = 1 << 9, /* -c */
-        FILEUTILS_SET_SECURITY_CONTEXT = 1 << 10,
+        FILEUTILS_PRESERVE_SECURITY_CONTEXT = 1 << 14, /* -c */
 #endif
-        FILEUTILS_IGNORE_CHMOD_ERR = 1 << 11,
-        /* -v */
-        FILEUTILS_VERBOSE         = (1 << 12) * ENABLE_FEATURE_VERBOSE,
+        FILEUTILS_RMDEST          = 1 << (15 - !ENABLE_SELINUX), /* --remove-destination */
+        /*
+         * Hole. cp may have some bits set here,
+         * they should not affect remove_file()/copy_file()
+         */
+#if ENABLE_SELINUX
+        FILEUTILS_SET_SECURITY_CONTEXT = 1 << 30,
+#endif
+        FILEUTILS_IGNORE_CHMOD_ERR = 1 << 31,
 };
-#define FILEUTILS_CP_OPTSTR "pdRfilsLH" IF_SELINUX("c")
+#define FILEUTILS_CP_OPTSTR "pdRfilsLHarPvu" IF_SELINUX("c")
 extern int remove_file(const char *path, int flags) FAST_FUNC;
 /* NB: without FILEUTILS_RECUR in flags, it will basically "cat"
  * the source, not copy (unless "source" is a directory).
@@ -1248,8 +1258,6 @@ const struct hwtype *get_hwntype(int type) FAST_FUNC;
 
 #ifndef BUILD_INDIVIDUAL
 extern int find_applet_by_name(const char *name) FAST_FUNC;
-/* Returns only if applet is not found. */
-extern void run_applet_and_exit(const char *name, char **argv) FAST_FUNC;
 extern void run_applet_no_and_exit(int a, char **argv) NORETURN FAST_FUNC;
 #endif