Rewrite cp and mv to be SUSv2 compliant.
diff --git a/include/applets.h b/include/applets.h
index c303797..d3399b9 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -80,8 +80,8 @@
#ifdef BB_CMP
APPLET(cmp, cmp_main, _BB_DIR_USR_BIN)
#endif
-#ifdef BB_CP_MV
- APPLET(cp, cp_mv_main, _BB_DIR_BIN)
+#ifdef BB_CP
+ APPLET(cp, cp_main, _BB_DIR_BIN)
#endif
#ifdef BB_CUT
APPLET(cut, cut_main, _BB_DIR_USR_BIN)
@@ -269,8 +269,8 @@
#ifdef BB_MT
APPLET(mt, mt_main, _BB_DIR_BIN)
#endif
-#ifdef BB_CP_MV
- APPLET(mv, cp_mv_main, _BB_DIR_BIN)
+#ifdef BB_MV
+ APPLET(mv, mv_main, _BB_DIR_BIN)
#endif
#ifdef BB_NC
APPLET(nc, nc_main, _BB_DIR_USR_BIN)
diff --git a/include/libbb.h b/include/libbb.h
index 19de73c..c47a668 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -93,8 +93,7 @@
void add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name);
void reset_ino_dev_hashtable(void);
-int copy_file(const char *src_name, const char *dst_name,
- int set_modes, int follow_links, int force_flag, int quiet_flag);
+int copy_file(const char *source, const char *dest, int flags);
int copy_file_chunk(FILE *src_file, FILE *dst_file, unsigned long long chunksize);
char *buildName(const char *dirName, const char *fileName);
int makeString(int argc, const char **argv, char *buf, int bufLen);
@@ -255,4 +254,12 @@
#define CT_DOS2UNIX 2
/* extern int convert(char *fn, int ConvType); */
+enum {
+ CP_PRESERVE_STATUS = 1,
+ CP_PRESERVE_SYMLINKS = 2,
+ CP_RECUR = 4,
+ CP_FORCE = 8,
+ CP_INTERACTIVE = 16
+};
+
#endif /* __LIBBB_H__ */