Changeset 4b16422 in mainline for uspace/app/bdsh/cmds/modules/rm/rm.c

Timestamp:

2012-05-30T20:36:37Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

5c5c346a

Parents:

ce683ed3 (diff), 692be1ae (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) (4 diffs)

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

@@ -46 +46 @@
 #define RM_VERSION "0.0.1"
 
-static rm_job_t rm;
-
 static struct option const long_options[] = {
         { "help", no_argument, 0, 'h' },
@@ -57 +55 @@
 };
 
+/* Return values for rm_scope() */
+#define RM_BOGUS 0
+#define RM_FILE  1
+#define RM_DIR   2
+
+/* Flags for rm_update() */
+#define _RM_ENTRY   0
+#define _RM_ADVANCE 1
+#define _RM_REWIND  2
+#define _RM_EXIT    3
+
+/* A simple job structure */
+typedef struct {
+        /* Options set at run time */
+        unsigned int force;      /* -f option */
+        unsigned int recursive;  /* -r option */
+        unsigned int safe;       /* -s option */
+
+        /* Keeps track of the job in progress */
+        int advance; /* How far deep we've gone since entering */
+        DIR *entry;  /* Entry point to the tree being removed */
+        char *owd;   /* Where we were when we invoked rm */
+        char *cwd;   /* Current directory being transversed */
+        char *nwd;   /* Next directory to be transversed */
+
+        /* Counters */
+        int f_removed; /* Number of files unlinked */
+        int d_removed; /* Number of directories unlinked */
+} rm_job_t;
+
+static rm_job_t rm;
+
+static unsigned int rm_recursive(const char *);
+
 static unsigned int rm_start(rm_job_t *rm)
 {
@@ -95 +127 @@
         if (NULL != rm->cwd)
                 free(rm->cwd);
+}
+
+static unsigned int rm_single(const char *path)
+{
+        if (unlink(path)) {
+                cli_error(CL_EFAIL, "rm: could not remove file %s", path);
+                return 1;
+        }
+        return 0;
+}
+
+static unsigned int rm_scope(const char *path)
+{
+        int fd;
+        DIR *dirp;
+
+        dirp = opendir(path);
+        if (dirp) {
+                closedir(dirp);
+                return RM_DIR;
+        }
+
+        fd = open(path, O_RDONLY);
+        if (fd > 0) {
+                close(fd);
+                return RM_FILE;
+        }
+
+        return RM_BOGUS;
 }
 
@@ -154 +215 @@
 
         return ret + 1;
-}
-
-static unsigned int rm_single(const char *path)
-{
-        if (unlink(path)) {
-                cli_error(CL_EFAIL, "rm: could not remove file %s", path);
-                return 1;
-        }
-        return 0;
-}
-
-static unsigned int rm_scope(const char *path)
-{
-        int fd;
-        DIR *dirp;
-
-        dirp = opendir(path);
-        if (dirp) {
-                closedir(dirp);
-                return RM_DIR;
-        }
-
-        fd = open(path, O_RDONLY);
-        if (fd > 0) {
-                close(fd);
-                return RM_FILE;
-        }
-
-        return RM_BOGUS;
 }