Mercurial > hg > toybox
changeset 588:9c2277b92b86
Factor out dirtree_comeagain() callback, setting up depth-first search with open filehandle in node->extra.
| author | Rob Landley <rob@landley.net> |
|---|---|
| date | Fri, 01 Jun 2012 20:04:39 -0500 |
| parents | 82ffae226c40 |
| children | 7013fd450ff4 |
| files | lib/dirtree.c lib/lib.h toys/chgrp.c |
| diffstat | 3 files changed, 23 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/dirtree.c Fri Jun 01 17:59:11 2012 -0500 +++ b/lib/dirtree.c Fri Jun 01 20:04:39 2012 -0500 @@ -78,6 +78,23 @@ return DIRTREE_SAVE|DIRTREE_RECURSE; } +// depth first recursion +int dirtree_comeagain(struct dirtree *try, int recurse) +{ + int ret = dirtree_notdotdot(try); + if (ret) { + if (S_ISDIR(try->st.st_mode)) { + if (!try->extra) { + try->extra = xdup(try->data); + if (recurse) return DIRTREE_COMEAGAIN; + } + } else try->extra = openat(try->parent ? try->parent->data : AT_FDCWD, + try->name, 0); + } + + return ret; +} + // Handle callback for a node in the tree. Returns saved node(s) or NULL. // // By default, allocates a tree of struct dirtree, not following symlinks
--- a/lib/lib.h Fri Jun 01 17:59:11 2012 -0500 +++ b/lib/lib.h Fri Jun 01 20:04:39 2012 -0500 @@ -74,6 +74,7 @@ struct dirtree *dirtree_add_node(int dirfd, char *name); char *dirtree_path(struct dirtree *node, int *plen); int dirtree_notdotdot(struct dirtree *catch); +int dirtree_comeagain(struct dirtree *try, int recurse); struct dirtree *handle_callback(struct dirtree *new, int (*callback)(struct dirtree *node)); void dirtree_recurse(struct dirtree *node,
--- a/toys/chgrp.c Fri Jun 01 17:59:11 2012 -0500 +++ b/toys/chgrp.c Fri Jun 01 20:04:39 2012 -0500 @@ -40,19 +40,12 @@ static int do_chgrp(struct dirtree *node) { - int fd, ret = 1, flags = toys.optflags; - - if (!dirtree_notdotdot(node)) return 0; + int ret, flags = toys.optflags; - // Handle recursion, and make it depth first - if (S_ISDIR(node->st.st_mode)) { - if (!node->extra) node->extra = dup(node->data); - if ((flags & FLAG_R) && node->data != -1) return DIRTREE_COMEAGAIN; - fd = node->extra; - } else fd = openat(node->parent ? node->parent->data : AT_FDCWD, - node->name, 0); + ret = dirtree_comeagain(node, flags & FLAG_R); + if (!ret || ret == DIRTREE_COMEAGAIN) return ret; - if (fd != -1) ret = fchown(fd, -1, TT.group); + if (node->extra != -1) ret = fchown(node->extra, -1, TT.group); if (ret || (flags & FLAG_v)) { char *path = dirtree_path(node, 0); @@ -62,7 +55,7 @@ perror_msg("changing group of '%s' to '%s'", path, TT.group_name); free(path); } - close(fd); + close(node->extra); toys.exitval |= ret; return 0;