Changeset 8b655705 in mainline for uspace/app/bdsh/cmds/modules/rm/rm.c

Timestamp:

2011-04-15T19:38:07Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9dd730d1

Parents:

6b9e85b (diff), b2fb47f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

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

@@ -101 +101 @@
 }
 
+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 +146 @@
 
         /* 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;
 }
 
@@ -227 +269 @@
                 }
                 memset(buff, 0, sizeof(buff));
-                snprintf(buff, len, argv[i]);
+                snprintf(buff, len, "%s", argv[i]);
 
                 scope = rm_scope(buff);