From: Alan Cox <alan@linux.intel.com>
Date: Wed, 20 May 2015 22:30:47 +0000 (+0100)
Subject: rm: downsize, fix buffers
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=b49a4a8ee6dc8a32039f3044f252bad89885b674;p=FUZIX.git

rm: downsize, fix buffers
---

diff --git a/Applications/util/rm.c b/Applications/util/rm.c
index 6fc45566..9280c487 100644
--- a/Applications/util/rm.c
+++ b/Applications/util/rm.c
@@ -3,6 +3,12 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+/* FIXME: need -r -v -i etc */
+static void writes(int fd, const char *p)
+{
+    write(fd, p, strlen(p));
+}
+
 char *basename(char *name)
 {
     char *base = rindex(name, '/');
@@ -14,12 +20,16 @@ int main(int argc, const char *argv[])
 {
     int i /*, recurse = 0, interact =0 */ ;
     struct stat sbuf;
+    int err = 1;
 
     for (i = 1; i < argc; i++) {
 	if (argv[i][0] != '-') {
 	    if (!lstat(argv[i], &sbuf)) {
 		if (unlink(argv[i])) {
-		    fprintf(stderr, "rm: could not remove %s\n", argv[i]);
+		    writes(2, argv[0]);
+		    writes(2, ": cannot remove '");
+		    writes(2, argv[i]);
+		    perror("': ");
 		}
 	    }
 	}