Basic implementation of rm

7 files changed, 81 insertions, 6 deletions

diff --git a/src/cmd/jsh/builtin.c b/src/cmd/jsh/builtin.c
index dbcc415..dbcc415 100644..100755
--- a/src/cmd/jsh/builtin.c
+++ b/src/cmd/jsh/builtin.c
diff --git a/src/cmd/jsh/builtin.h b/src/cmd/jsh/builtin.h
index fdc9af4..fdc9af4 100644..100755
--- a/src/cmd/jsh/builtin.h
+++ b/src/cmd/jsh/builtin.h
diff --git a/src/cmd/ls/ls b/src/cmd/ls/ls
new file mode 100755
index 0000000..836d3d8
--- /dev/null
+++ b/src/cmd/ls/ls
diff --git a/src/cmd/ls/ls.c b/src/cmd/ls/ls.c
index a937457..d253772 100755
--- a/src/cmd/ls/ls.c
+++ b/src/cmd/ls/ls.c
@@ -25,12 +25,6 @@ int main(int argc, char **argv)
 			return -1;
 		}
 		dirwalk(dp);
-	} else if (argc == 2) {
-		if ((dp = opendir(argv[1])) == NULL) {
-			perror("ls");
-			return -1;
-		}
-		dirwalk(dp);
 	} else {
 		while (--argc > 0 && !ferror(stdout)) {
 			errno = 0;
diff --git a/src/cmd/rm/makefile b/src/cmd/rm/makefile
new file mode 100755
index 0000000..8b9afda
--- /dev/null
+++ b/src/cmd/rm/makefile
@@ -0,0 +1,12 @@
+CFLAGS=-Wall -Werror
+
+build: rm
+	@cp rm $(PROROOT)/build/bin/rm
+
+rm: rm.c
+	$(CC) $(CFLAGS) -o rm rm.c
+
+clean:
+	@rm -r rm
+
+.PHONY: build clean
diff --git a/src/cmd/rm/rm b/src/cmd/rm/rm
new file mode 100755
index 0000000..886e88d
--- /dev/null
+++ b/src/cmd/rm/rm
diff --git a/src/cmd/rm/rm.c b/src/cmd/rm/rm.c
new file mode 100755
index 0000000..b034b36
--- /dev/null
+++ b/src/cmd/rm/rm.c
@@ -0,0 +1,69 @@
+#include <unistd.h>
+#include <stdio.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <errno.h>
+
+bool dflag = false,
+	 iflag = false,
+	 fflag = false;
+
+int main(int argc, char *argv[]) {
+	char arg = 0;
+	while ((arg = getopt(argc, argv, "dfi")) != -1) {
+		switch (arg) {
+			case 'd':
+				dflag = true;
+				break;
+			case 'f':
+				fflag = true;
+				iflag = false;
+				break;
+			case 'i':
+				iflag = true;
+				fflag = false;
+				break;
+			default:
+				printf("usage: rm [-f | -i] [-d] file ...\n");
+				break;
+		}
+	}
+	while (--argc > 0) {
+		if ((*++argv)[0] == '-') {
+			continue;
+		}
+		if (iflag) {
+			printf("remove %s? [y/N] ", *argv);
+			char c = getchar();
+			if (c != 'Y' && c != 'y') {
+				continue;
+			}
+		}
+		struct stat sbuf;
+		if (stat(*argv, &sbuf) != 0) {
+			perror("rm");
+			continue;
+		}
+		if (S_ISDIR(sbuf.st_mode) && dflag) {
+			if (rmdir(*argv) != 0) {
+				perror("rm");
+			}
+		} else if (S_ISDIR(sbuf.st_mode)) {
+				errno = EISDIR;
+				char s[] = "rm: ";
+				char *sp = (char *)malloc(sizeof(s) + sizeof(*argv) + 1);
+				strncat(sp, s, strlen(sp) - 1);
+				strncat(sp, *argv, strlen(sp));
+				perror(sp);
+				free((void *)sp);
+				sp = NULL;
+		} else {
+			if (unlink(*argv) != 0) {
+				perror("rm");
+			}
+		}
+	}
+	return 0;
+}