aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/functions.c66
-rw-r--r--lib/lib.h10
2 files changed, 76 insertions, 0 deletions
diff --git a/lib/functions.c b/lib/functions.c
index 7efc2df9..a2f1708b 100644
--- a/lib/functions.c
+++ b/lib/functions.c
@@ -251,6 +251,11 @@ char *xgetcwd(void)
return buf;
}
+void xstat(char *path, struct stat *st)
+{
+ if(stat(path, st)) perror_exit("Can't stat %s\n",path);
+}
+
// Cannonicalizes path by removing ".", "..", and "//" elements. This is not
// the same as realpath(), where "dir/.." could wind up somewhere else by
// following symlinks.
@@ -495,3 +500,64 @@ void xpidfile(char *name)
xwrite(fd, spid, sprintf(spid, "%ld\n", (long)getpid()));
close(fd);
}
+
+// Create a dirtree node from a path.
+
+struct dirtree *read_dirtree_node(char *path)
+{
+ struct dirtree *dt;
+ char *name;
+
+ // Find last chunk of name.
+
+ for (;;) {
+ name = strrchr(path, '/');
+
+ if (!name) name = path;
+ else {
+ if (*(name+1)) name++;
+ else {
+ *name=0;
+ continue;
+ }
+ }
+ break;
+ }
+
+ dt = xzalloc(sizeof(struct dirtree)+strlen(name)+1);
+ xstat(path, &(dt->st));
+ strcpy(dt->name, name);
+
+ return dt;
+}
+
+// Given a directory (in a writeable PATH_MAX buffer), recursively read in a
+// directory tree.
+
+struct dirtree *read_dirtree(char *path)
+{
+ struct dirtree *dt = NULL, **ddt = &dt;
+ DIR *dir;
+ int len = strlen(path);
+
+ if (!(dir = opendir(path))) perror_msg("No %s", path);
+
+ for (;;) {
+ struct dirent *entry = readdir(dir);
+ if (!entry) break;
+
+ // Skip "." and ".."
+ if (entry->d_name[0]=='.') {
+ if (!entry->d_name[1]) continue;
+ if (entry->d_name[1]=='.' && !entry->d_name[2]) continue;
+ }
+
+ snprintf(path+len, sizeof(toybuf)-len, "/%s", entry->d_name);
+ *ddt = read_dirtree_node(path);
+ if (entry->d_type == DT_DIR) (*ddt)->child = read_dirtree(path);
+ ddt = &((*ddt)->next);
+ path[len]=0;
+ }
+
+ return dt;
+}
diff --git a/lib/lib.h b/lib/lib.h
index e2dc13ec..d3c937ca 100644
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -21,6 +21,13 @@ struct arg_list {
char *arg;
};
+struct dirtree {
+ struct dirtree *next;
+ struct dirtree *child;
+ struct stat st;
+ char name[];
+};
+
// args.c
void get_optflags(void);
@@ -52,6 +59,7 @@ size_t xread(int fd, void *buf, size_t len);
void xreadall(int fd, void *buf, size_t len);
void xwrite(int fd, void *buf, size_t len);
char *xgetcwd(void);
+void xstat(char *path, struct stat *st);
char *xabspath(char *path);
struct string_list *find_in_path(char *path, char *filename);
void utoa_to_buf(unsigned n, char *buf, unsigned buflen);
@@ -59,6 +67,8 @@ void itoa_to_buf(int n, char *buf, unsigned buflen);
char *utoa(unsigned n);
char *itoa(int n);
off_t fdlength(int fd);
+struct dirtree *read_dirtree_node(char *path);
+struct dirtree *read_dirtree(char *path);
// getmountlist.c
struct mtab_list {