Rewrite cp and mv to be SUSv2 compliant.

git-svn-id: svn://busybox.net/trunk/busybox@2407 69ca8d6d-28ef-0310-b511-8ec308f3f277

2 files changed, 13 insertions, 6 deletions

diff --git a/include/applets.h b/include/applets.h
index c3037973d..d3399b9af 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 19de73ca9..c47a6689e 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -93,8 +93,7 @@ int is_in_ino_dev_hashtable(const struct stat *statbuf, char **name);
 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 @@ extern int gz_open(FILE *compressed_file, int *pid);
 #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__ */