aboutsummaryrefslogtreecommitdiff
path: root/toys/other/switch_root.c
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2014-07-26 13:30:40 -0500
committerRob Landley <rob@landley.net>2014-07-26 13:30:40 -0500
commitfec3fd1f8ac1db9ed87b79bd3eb5e38aa835e881 (patch)
treea7e149cf0fefef5d252706797fff8c831ebb0460 /toys/other/switch_root.c
parentccb73f8bf9191c01c90975958a210c47175bd98c (diff)
downloadtoybox-fec3fd1f8ac1db9ed87b79bd3eb5e38aa835e881.tar.gz
Move DIRTREE_COMEAGAIN second callback up to when the filehandle is still open, and add dir->again variable to distinguish second call instead of checking for -1 filehandle.
Diffstat (limited to 'toys/other/switch_root.c')
-rw-r--r--toys/other/switch_root.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/toys/other/switch_root.c b/toys/other/switch_root.c
index 1dfa20de..0861c70e 100644
--- a/toys/other/switch_root.c
+++ b/toys/other/switch_root.c
@@ -32,7 +32,7 @@ static int del_node(struct dirtree *node)
if (node->st.st_dev == TT.rootdev && dirtree_notdotdot(node)) {
int flag = 0;
if (S_ISDIR(node->st.st_mode)) {
- if (node->data != -1) return DIRTREE_COMEAGAIN;
+ if (!node->again) return DIRTREE_COMEAGAIN;
flag = AT_REMOVEDIR;
}
unlinkat(dirtree_parentfd(node), node->name, flag);