sbase

commit b257f7a05f24d218ab37aa43d22e0d19a88bd33b
parent 02918a46e88a521847664bfa91dc09cb91bc6f19
Author: sin <sin@2f30.org>
Date:   Mon,  5 May 2014 15:02:16 +0100

cp: Don't try to open the file twice in case we did not provide -f

Diffstat:
M
util/cp.c
 | 
7
+++++--

1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/util/cp.c b/util/cp.c
@@ -64,10 +64,13 @@ cp(const char *s1, const char *s2)
 		eprintf("fopen %s:", s1);
 
 	if(!(f2 = fopen(s2, "w"))) {
-		if (cp_fflag == true)
+		if (cp_fflag == true) {
 			unlink(s2);
-		if (!(f2 = fopen(s2, "w")))
+			if (!(f2 = fopen(s2, "w")))
+				eprintf("fopen %s:", s2);
+		} else {
 			eprintf("fopen %s:", s2);
+		}
 	}
 
 	concat(f1, s1, f2, s2);