Add the -n option, which automatically answers "no" to the overwrite question.

PR:		7828
Suggested by:	Daniel O'Connor <doconnor@gsoft.com.au>
Approved by:	sheldonh (mentor)
MFC after:	2 weeks

1 files changed, 9 insertions, 5 deletions

diff --git a/bin/cp/cp.c b/bin/cp/cp.c
index 2e17f75..5a7834e 100644
--- a/bin/cp/cp.c
+++ b/bin/cp/cp.c
@@ -86,8 +86,8 @@ static char emptystring[] = "";
 
 PATH_T to = { to.p_path, emptystring, "" };
 
-int iflag, pflag, fflag;
-static int Rflag, rflag, vflag;
+int fflag, iflag, nflag, pflag, vflag;
+static int Rflag, rflag;
 
 enum op { FILE_TO_FILE, FILE_TO_DIR, DIR_TO_DNE };
 
@@ -103,7 +103,7 @@ main(int argc, char *argv[])
 	char *target;
 
 	Hflag = Lflag = Pflag = 0;
-	while ((ch = getopt(argc, argv, "HLPRfiprv")) != -1)
+	while ((ch = getopt(argc, argv, "HLPRfinprv")) != -1)
 		switch (ch) {
 		case 'H':
 			Hflag = 1;
@@ -122,11 +122,15 @@ main(int argc, char *argv[])
 			break;
 		case 'f':
 			fflag = 1;
-			iflag = 0;
+			iflag = nflag = 0;
 			break;
 		case 'i':
 			iflag = 1;
-			fflag = 0;
+			fflag = nflag = 0;
+			break;
+		case 'n':
+			nflag = 1;
+			fflag = iflag = 0;
 			break;
 		case 'p':
 			pflag = 1;