diff options
| author | Rob Landley <rob@landley.net> | 2014-07-26 13:30:40 -0500 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2014-07-26 13:30:40 -0500 |
| commit | fec3fd1f8ac1db9ed87b79bd3eb5e38aa835e881 (patch) | |
| tree | a7e149cf0fefef5d252706797fff8c831ebb0460 /toys/posix/cp.c | |
| parent | ccb73f8bf9191c01c90975958a210c47175bd98c (diff) | |
| download | toybox-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/posix/cp.c')
| -rw-r--r-- | toys/posix/cp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toys/posix/cp.c b/toys/posix/cp.c index 283ee978..aecd1870 100644 --- a/toys/posix/cp.c +++ b/toys/posix/cp.c @@ -84,7 +84,7 @@ int cp_node(struct dirtree *try) if (!dirtree_notdotdot(try)) return 0; // If returning from COMEAGAIN, jump straight to -p logic at end. - if (S_ISDIR(try->st.st_mode) && try->data == -1) { + if (S_ISDIR(try->st.st_mode) && try->again) { fdout = try->extra; err = 0; } else { |