Changes in uspace/app/bdsh/cmds/modules/rm/rm.c [afe1d1e:36ab7c7] in mainline

File:

• uspace/app/bdsh/cmds/modules/rm/rm.c (modified) (3 diffs)

uspace/app/bdsh/cmds/modules/rm/rm.c

@@ -1 @@
-/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
+/*
+ * Copyright (c) 2008 Tim Post
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
  *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * Neither the name of the original program's authors nor the names of its
- * contributors may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
@@ -101 +99 @@
 }
 
+static unsigned int rm_recursive_not_empty_dirs(const char *path)
+{
+        DIR *dirp;
+        struct dirent *dp;
+        char buff[PATH_MAX];
+        unsigned int scope;
+        unsigned int ret = 0;
+
+        dirp = opendir(path);
+        if (!dirp) {
+                /* May have been deleted between scoping it and opening it */
+                cli_error(CL_EFAIL, "Could not open %s", path);
+                return ret;
+        }
+
+        memset(buff, 0, sizeof(buff));
+        while ((dp = readdir(dirp))) {
+                snprintf(buff, PATH_MAX - 1, "%s/%s", path, dp->d_name);
+                scope = rm_scope(buff);
+                switch (scope) {
+                case RM_BOGUS:
+                        break;
+                case RM_FILE:
+                        ret += rm_single(buff);
+                        break;
+                case RM_DIR:
+                        ret += rm_recursive(buff);
+                        break;
+                }
+        }
+        
+        return ret;
+}
+
 static unsigned int rm_recursive(const char *path)
 {
         int rc;
+        unsigned int ret = 0;
 
         /* First see if it will just go away */
@@ -111 +144 @@
 
         /* Its not empty, recursively scan it */
-        cli_error(CL_ENOTSUP,
-                "Can not remove %s, directory not empty", path);
-        return 1;
+        ret = rm_recursive_not_empty_dirs(path);
+
+        /* Delete directory */
+        rc = rmdir(path);
+        if (rc == 0)
+                return ret;
+
+        cli_error(CL_ENOTSUP, "Can not remove %s", path);
+
+        return ret + 1;
 }