* cp -fa now works as expected for symlinks (it didn't before)

* zcat works again (wasn't working since option parsing was broken)
* more doc updates/more support for BB_FEATURE_SIMPLE_HELP
 -Erik

1 files changed, 4 insertions, 3 deletions

diff --git a/cp_mv.c b/cp_mv.c
index ae35bca19..ac1e71b82 100644
--- a/cp_mv.c
+++ b/cp_mv.c
@@ -70,6 +70,7 @@ static const char *cp_mv_usage[] =	/* .rodata */
 static int recursiveFlag;
 static int followLinks;
 static int preserveFlag;
+static int forceFlag;
 
 static const char *baseSrcName;
 static int		   srcDirFlag;
@@ -167,7 +168,7 @@ cp_mv_Action(const char *fileName, struct stat *statbuf, void* junk)
 			add_to_ino_dev_hashtable(statbuf, destName);
 		}
 	}
-	return copyFile(fileName, destName, preserveFlag, followLinks);
+	return copyFile(fileName, destName, preserveFlag, followLinks, forceFlag);
 }
 
 static int
@@ -200,7 +201,7 @@ extern int cp_mv_main(int argc, char **argv)
 	argv++;
 
 	if (dz_i == is_cp) {
-		recursiveFlag = preserveFlag = FALSE;
+		recursiveFlag = preserveFlag = forceFlag = FALSE;
 		followLinks = TRUE;
 		while (**argv == '-') {
 			while (*++(*argv)) {
@@ -220,7 +221,7 @@ extern int cp_mv_main(int argc, char **argv)
 					recursiveFlag = TRUE;
 					break;
 				case 'f':
-				   /* for compatibility; busybox cp/mv always does force */
+					forceFlag = TRUE;
 					break;
 				default:
 					usage(cp_mv_usage[is_cp]);