commit b3bf4a8eaec3fd5e36b526973df3dd87ddd41f1d
author Shawn Ledbetter <sledbetter@google.com> Sat Feb 25 11:31:23 2012 -0800
committer Shawn Ledbetter <sledbetter@google.com> Mon Feb 27 18:58:09 2012 -0800
tree c966d262db08fb4c53eaf16154b048d2346d0e90
parent de9773cb73173e4ca2818fe4731994ed2442a44f

Add -f option, use getopt for args parsing.

We need rm -rf.

Change-Id: I838413df70924c687cd7046033aad7d5ddc547bc

rm.c

diff --git a/rm.c b/rm.c
index bd66311..63878b8 100644
--- a/rm.c
+++ b/rm.c
@@ -9,7 +9,7 @@
 
 static int usage()
 {
-    fprintf(stderr,"rm [-rR] <target>\n");
+    fprintf(stderr,"rm [-rRf] <target>\n");
     return -1;
 }
 
@@ -65,23 +65,34 @@
 
 int rm_main(int argc, char *argv[])
 {
-    int ret;
+    int opt;
     int i = 1;
     int recursive = 0;
+    int force = 0;
 
     if (argc < 2)
         return usage();
 
-    /* check if recursive */
-    if (argc >=2 && (!strcmp(argv[1], "-r") || !strcmp(argv[1], "-R"))) {
-        recursive = 1;
-        i = 2;
+    while ((opt = getopt(argc, argv, "rRf")) != -1) {
+      switch (opt) {
+        case 'r':
+        case 'R':
+          recursive = 1;
+          break;
+        case 'f':
+          force = 1;
+          break;
+        default:
+          return usage();
+      }
     }
-    
+
+    i = optind;
+
     /* loop over the file/directory args */
     for (; i < argc; i++) {
         int ret = recursive ? unlink_recursive(argv[i]) : unlink(argv[i]);
-        if (ret < 0) {
+        if (ret < 0 && !force) {
             fprintf(stderr, "rm failed for %s, %s\n", argv[i], strerror(errno));
             return -1;
         }
@@ -89,4 +100,3 @@
 
     return 0;
 }
-