aboutsummaryrefslogtreecommitdiff
path: root/lib/dirtree.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/dirtree.c')
-rw-r--r--lib/dirtree.c206
1 files changed, 102 insertions, 104 deletions
diff --git a/lib/dirtree.c b/lib/dirtree.c
index 3f5a2935..d1de40ee 100644
--- a/lib/dirtree.c
+++ b/lib/dirtree.c
@@ -1,4 +1,3 @@
-/* vi: set sw=4 ts=4 :*/
/* dirtree.c - Functions for dealing with directory trees.
*
* Copyright 2007 Rob Landley <rob@landley.net>
@@ -12,76 +11,75 @@
struct dirtree *dirtree_add_node(int dirfd, char *name, int symfollow)
{
- struct dirtree *dt = NULL;
- struct stat st;
- char buf[4096];
- int len = 0, linklen = 0;
-
- if (name) {
- if (fstatat(dirfd, name, &st, symfollow ? 0 : AT_SYMLINK_NOFOLLOW))
- goto error;
- if (S_ISLNK(st.st_mode)) {
- if (0>(linklen = readlinkat(dirfd, name, buf, 4095))) goto error;
- buf[linklen++]=0;
- }
- len = strlen(name);
- }
- dt = xzalloc((len = sizeof(struct dirtree)+len+1)+linklen);
- if (name) {
- memcpy(&(dt->st), &st, sizeof(struct stat));
- strcpy(dt->name, name);
-
- if (linklen) {
- dt->symlink = memcpy(len+(char *)dt, buf, linklen);
- dt->data = --linklen;
- }
- }
-
- return dt;
+ struct dirtree *dt = NULL;
+ struct stat st;
+ char buf[4096];
+ int len = 0, linklen = 0;
+
+ if (name) {
+ if (fstatat(dirfd, name, &st, symfollow ? 0 : AT_SYMLINK_NOFOLLOW))
+ goto error;
+ if (S_ISLNK(st.st_mode)) {
+ if (0>(linklen = readlinkat(dirfd, name, buf, 4095))) goto error;
+ buf[linklen++]=0;
+ }
+ len = strlen(name);
+ }
+ dt = xzalloc((len = sizeof(struct dirtree)+len+1)+linklen);
+ if (name) {
+ memcpy(&(dt->st), &st, sizeof(struct stat));
+ strcpy(dt->name, name);
+
+ if (linklen) {
+ dt->symlink = memcpy(len+(char *)dt, buf, linklen);
+ dt->data = --linklen;
+ }
+ }
+
+ return dt;
error:
- perror_msg("%s",name);
- free(dt);
- return 0;
+ perror_msg("%s",name);
+ free(dt);
+ return 0;
}
// Return path to this node, assembled recursively.
char *dirtree_path(struct dirtree *node, int *plen)
{
- char *path;
- int len;
-
- if (!node || !node->name) {
- path = xmalloc(*plen);
- *plen = 0;
- return path;
- }
-
- len = (plen ? *plen : 0)+strlen(node->name)+1;
- path = dirtree_path(node->parent, &len);
- if (len && path[len-1] != '/') path[len++]='/';
- len = (stpcpy(path+len, node->name) - path);
- if (plen) *plen = len;
-
- return path;
+ char *path;
+ int len;
+
+ if (!node || !node->name) {
+ path = xmalloc(*plen);
+ *plen = 0;
+ return path;
+ }
+
+ len = (plen ? *plen : 0)+strlen(node->name)+1;
+ path = dirtree_path(node->parent, &len);
+ if (len && path[len-1] != '/') path[len++]='/';
+ len = (stpcpy(path+len, node->name) - path);
+ if (plen) *plen = len;
+
+ return path;
}
// Default callback, filters out "." and "..".
int dirtree_notdotdot(struct dirtree *catch)
{
- // Should we skip "." and ".."?
- if (catch->name[0]=='.' && (!catch->name[1] ||
- (catch->name[1]=='.' && !catch->name[2])))
- return 0;
+ // Should we skip "." and ".."?
+ if (catch->name[0]=='.' && (!catch->name[1] ||
+ (catch->name[1]=='.' && !catch->name[2]))) return 0;
- return DIRTREE_SAVE|DIRTREE_RECURSE;
+ return DIRTREE_SAVE|DIRTREE_RECURSE;
}
int dirtree_parentfd(struct dirtree *node)
{
- return node->parent ? node->parent->data : AT_FDCWD;
+ return node->parent ? node->parent->data : AT_FDCWD;
}
// Handle callback for a node in the tree. Returns saved node(s) or NULL.
@@ -93,69 +91,69 @@ int dirtree_parentfd(struct dirtree *node)
//
struct dirtree *handle_callback(struct dirtree *new,
- int (*callback)(struct dirtree *node))
+ int (*callback)(struct dirtree *node))
{
- int flags, dir = S_ISDIR(new->st.st_mode);
+ int flags, dir = S_ISDIR(new->st.st_mode);
- if (!callback) callback = dirtree_notdotdot;
+ if (!callback) callback = dirtree_notdotdot;
- flags = callback(new);
+ flags = callback(new);
- if (dir) {
- if (flags & (DIRTREE_RECURSE|DIRTREE_COMEAGAIN)) {
- new->data = openat(dirtree_parentfd(new), new->name, 0);
- dirtree_recurse(new, callback, flags & DIRTREE_SYMFOLLOW);
- if (flags & DIRTREE_COMEAGAIN) flags = callback(new);
- }
- }
+ if (dir) {
+ if (flags & (DIRTREE_RECURSE|DIRTREE_COMEAGAIN)) {
+ new->data = openat(dirtree_parentfd(new), new->name, 0);
+ dirtree_recurse(new, callback, flags & DIRTREE_SYMFOLLOW);
+ if (flags & DIRTREE_COMEAGAIN) flags = callback(new);
+ }
+ }
- // If this had children, it was callback's job to free them already.
- if (!(flags & DIRTREE_SAVE)) {
- free(new);
- new = NULL;
- }
+ // If this had children, it was callback's job to free them already.
+ if (!(flags & DIRTREE_SAVE)) {
+ free(new);
+ new = NULL;
+ }
- return (flags & DIRTREE_ABORT)==DIRTREE_ABORT ? DIRTREE_ABORTVAL : new;
+ return (flags & DIRTREE_ABORT)==DIRTREE_ABORT ? DIRTREE_ABORTVAL : new;
}
// Recursively read/process children of directory node (with dirfd in data),
// filtering through callback().
void dirtree_recurse(struct dirtree *node,
- int (*callback)(struct dirtree *node), int symfollow)
+ int (*callback)(struct dirtree *node), int symfollow)
{
- struct dirtree *new, **ddt = &(node->child);
- struct dirent *entry;
- DIR *dir;
-
- if (!(dir = fdopendir(node->data))) {
- char *path = dirtree_path(node, 0);
- perror_msg("No %s", path);
- free(path);
- close(node->data);
-
- return;
- }
-
- // according to the fddir() man page, the filehandle in the DIR * can still
- // be externally used by things that don't lseek() it.
-
- // The extra parentheses are to shut the stupid compiler up.
- while ((entry = readdir(dir))) {
- if (!(new = dirtree_add_node(node->data, entry->d_name, symfollow)))
- continue;
- new->parent = node;
- new = handle_callback(new, callback);
- if (new == DIRTREE_ABORTVAL) break;
- if (new) {
- *ddt = new;
- ddt = &((*ddt)->next);
- }
- }
-
- // This closes filehandle as well, so note it
- closedir(dir);
- node->data = -1;
+ struct dirtree *new, **ddt = &(node->child);
+ struct dirent *entry;
+ DIR *dir;
+
+ if (!(dir = fdopendir(node->data))) {
+ char *path = dirtree_path(node, 0);
+ perror_msg("No %s", path);
+ free(path);
+ close(node->data);
+
+ return;
+ }
+
+ // according to the fddir() man page, the filehandle in the DIR * can still
+ // be externally used by things that don't lseek() it.
+
+ // The extra parentheses are to shut the stupid compiler up.
+ while ((entry = readdir(dir))) {
+ if (!(new = dirtree_add_node(node->data, entry->d_name, symfollow)))
+ continue;
+ new->parent = node;
+ new = handle_callback(new, callback);
+ if (new == DIRTREE_ABORTVAL) break;
+ if (new) {
+ *ddt = new;
+ ddt = &((*ddt)->next);
+ }
+ }
+
+ // This closes filehandle as well, so note it
+ closedir(dir);
+ node->data = -1;
}
// Create dirtree from path, using callback to filter nodes.
@@ -165,7 +163,7 @@ void dirtree_recurse(struct dirtree *node,
struct dirtree *dirtree_read(char *path, int (*callback)(struct dirtree *node))
{
- struct dirtree *root = dirtree_add_node(AT_FDCWD, path, 0);
+ struct dirtree *root = dirtree_add_node(AT_FDCWD, path, 0);
- return root ? handle_callback(root, callback) : DIRTREE_ABORTVAL;
+ return root ? handle_callback(root, callback) : DIRTREE_ABORTVAL;
}