From bb77dde5ddfba8fe0c819b18b547c2d710956502 Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Thu, 21 Apr 2016 17:46:25 -0500
Subject: Have dirtree_recurse() take the new dirfd as an argument.

---
 toys/posix/ls.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'toys/posix/ls.c')

diff --git a/toys/posix/ls.c b/toys/posix/ls.c
index bec76e99..2ebc062a 100644
--- a/toys/posix/ls.c
+++ b/toys/posix/ls.c
@@ -337,8 +337,8 @@ static void listfiles(int dirfd, struct dirtree *indir)
   } else {
     // Read directory contents. We dup() the fd because this will close it.
     // This reads/saves contents to display later, except for in "ls -1f" mode.
-    indir->dirfd = dup(dirfd);
-    dirtree_recurse(indir, filter, DIRTREE_SYMFOLLOW*!!(flags&FLAG_L));
+    dirtree_recurse(indir, filter, dup(dirfd),
+      DIRTREE_SYMFOLLOW*!!(flags&FLAG_L));
   }
 
   // Copy linked list to array and sort it. Directories go in array because
-- 
cgit v1.2.3