implement cp and mv and improve rm

util/cp.c

@@ -0,0 +1,59 @@
+/* See LICENSE file for copyright and license details. */
+#include <dirent.h>
+#include <errno.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include "../fs.h"
+#include "../text.h"
+#include "../util.h"
+
+bool cp_rflag = false;
+
+int
+cp(const char *s1, const char *s2)
+{
+	FILE *f1, *f2;
+	char *ns1, *ns2;
+	long size1, size2;
+	struct dirent *d;
+	struct stat st;
+	DIR *dp;
+
+	if (stat(s1, &st) == 0 && S_ISDIR(st.st_mode)) {
+		if (!cp_rflag) {
+			eprintf("%s: is a directory\n", s1);
+		}
+		else {
+			if(!(dp = opendir(s1)))
+				eprintf("opendir %s:", s1);
+			if (mkdir(s2, st.st_mode) == -1 && errno != EEXIST)
+				eprintf("mkdir %s:", s2);
+			apathmax(&ns1, &size1);
+			apathmax(&ns2, &size2);
+			while((d = readdir(dp)))
+				if(strcmp(d->d_name, ".") && strcmp(d->d_name, "..")) {
+					if(snprintf(ns1, size1, "%s/%s", s1, d->d_name) > size1)
+						eprintf("%s/%s: filename too long\n", s1, d->d_name);
+					if(snprintf(ns2, size2, "%s/%s", s2, d->d_name) > size2)
+						eprintf("%s/%s: filename too long\n", s2, d->d_name);
+					fnck(ns1, ns2, cp);
+				}
+			closedir(dp);
+			free(ns1);
+			free(ns2);
+		}
+		return 0;
+	}
+	if(!(f1 = fopen(s1, "r")))
+		eprintf("fopen %s:", s1);
+	if(!(f2 = fopen(s2, "w")))
+		eprintf("fopen %s:", s2);
+	concat(f1, s1, f2, s2);
+	fclose(f2);
+	fclose(f1);
+	return 0;
+}

util/enmasse.c

@@ -7,8 +7,6 @@
 #include <sys/stat.h>
 #include "../util.h"
 
-static void fnck(const char *, const char *, int (*)(const char *, const char *));
-
 void
 enmasse(int argc, char **argv, int (*fn)(const char *, const char *))
 {
@@ -32,15 +30,3 @@ enmasse(int argc, char **argv, int (*fn)(const char *, const char *))
 	}
 	free(buf);
 }
-
-void
-fnck(const char *a, const char *b, int (*fn)(const char *, const char *))
-{
-	struct stat sta, stb;
-
-	if(stat(a, &sta) == 0 && stat(b, &stb) == 0
-	&& sta.st_dev == stb.st_dev && sta.st_ino == stb.st_ino)
-		eprintf("%s -> %s: same file\n", a, b);
-	if(fn(a, b) == -1)
-		eprintf("%s -> %s:", a, b);
-}

util/fnck.c

@@ -0,0 +1,15 @@
+/* See LICENSE file for copyright and license details. */
+#include <sys/stat.h>
+#include "../util.h"
+
+void
+fnck(const char *a, const char *b, int (*fn)(const char *, const char *))
+{
+	struct stat sta, stb;
+
+	if(stat(a, &sta) == 0 && stat(b, &stb) == 0
+	&& sta.st_dev == stb.st_dev && sta.st_ino == stb.st_ino)
+		eprintf("%s -> %s: same file\n", a, b);
+	if(fn(a, b) == -1)
+		eprintf("%s -> %s:", a, b);
+}

util/rm.c

@@ -0,0 +1,17 @@
+/* See LICENSE file for copyright and license details. */
+#include <stdbool.h>
+#include <stdio.h>
+#include "../fs.h"
+#include "../util.h"
+
+bool rm_fflag = false;
+bool rm_rflag = false;
+
+void
+rm(const char *path)
+{
+	if(rm_rflag)
+		recurse(path, rm);
+	if(remove(path) == -1 && !rm_fflag)
+		eprintf("remove %s:", path);
+}