sbase

commit 02918a46e88a521847664bfa91dc09cb91bc6f19
parent c323f6f2331512003bd53a7da18e1250c2cb5c9c
Author: sin <sin@2f30.org>
Date:   Mon,  5 May 2014 14:58:14 +0100

Implement cp -f

Diffstat:
M
cp.1
 | 
3
+++
M
cp.c
 | 
5
++++-
M
fs.h
 | 
1
+
M
util/cp.c
 | 
9
+++++++--
M
util/fnck.c
 | 
1
-

5 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/cp.1 b/cp.1
@@ -17,6 +17,9 @@ copies a given file, naming it the given name.  If multiple files are listed
 they will be copied into the given directory.
 .SH OPTIONS
 .TP
+.B \-f
+if an existing destination file cannot be opened, remove it and try again.
+.TP
 .B \-R
 equivalent to -r.
 .TP
diff --git a/cp.c b/cp.c
@@ -8,7 +8,7 @@
 static void
 usage(void)
 {
-	eprintf("usage: %s [-Rr] source... dest\n", argv0);
+	eprintf("usage: %s [-fRr] source... dest\n", argv0);
 }
 
 int
@@ -17,6 +17,9 @@ main(int argc, char *argv[])
 	struct stat st;
 
 	ARGBEGIN {
+	case 'f':
+		cp_fflag = true;
+		break;
 	case 'R':
 	case 'r':
 		cp_rflag = true;
diff --git a/fs.h b/fs.h
@@ -1,6 +1,7 @@
 /* See LICENSE file for copyright and license details. */
 #include <stdbool.h>
 
+extern bool cp_fflag;
 extern bool cp_rflag;
 extern bool rm_fflag;
 extern bool rm_rflag;
diff --git a/util/cp.c b/util/cp.c
@@ -12,6 +12,7 @@
 #include "../text.h"
 #include "../util.h"
 
+bool cp_fflag = false;
 bool cp_rflag = false;
 
 int
@@ -62,8 +63,12 @@ cp(const char *s1, const char *s2)
 	if(!(f1 = fopen(s1, "r")))
 		eprintf("fopen %s:", s1);
 
-	if(!(f2 = fopen(s2, "w")))
-		eprintf("fopen %s:", s2);
+	if(!(f2 = fopen(s2, "w"))) {
+		if (cp_fflag == true)
+			unlink(s2);
+		if (!(f2 = fopen(s2, "w")))
+			eprintf("fopen %s:", s2);
+	}
 
 	concat(f1, s1, f2, s2);
 	fchmod(fileno(f2), st.st_mode);
diff --git a/util/fnck.c b/util/fnck.c
@@ -18,4 +18,3 @@ fnck(const char *a, const char *b, int (*fn)(const char *, const char *))
 	if(fn(a, b) == -1)
 		eprintf("%s -> %s:", a, b);
 }
-