Rename dirtree->data to dirfd, and don't store symlink length in it.

2 files changed, 3 insertions, 2 deletions

diff --git a/toys/posix/find.c b/toys/posix/find.c
index 3019cb60..1e748feb 100644
--- a/toys/posix/find.c
+++ b/toys/posix/find.c
@@ -83,7 +83,7 @@ static int flush_exec(struct dirtree *new, struct exec_range *aa)
 
   // switch to directory for -execdir, or back to top if we have an -execdir
   // _and_ a normal -exec, or are at top of tree in -execdir
-  if (aa->dir && new->parent) rc = fchdir(new->parent->data);
+  if (aa->dir && new->parent) rc = fchdir(new->parent->dirfd);
   else if (TT.topdir != -1) rc = fchdir(TT.topdir);
   if (rc) {
     perror_msg("%s", new->name);
diff --git a/toys/posix/ls.c b/toys/posix/ls.c
index 7d15935c..04f64152 100644
--- a/toys/posix/ls.c
+++ b/toys/posix/ls.c
@@ -12,6 +12,7 @@ config LS
   default y
   help
     usage: ls [-ACFHLRSZacdfhiklmnpqrstux1] [directory...]
+
     list files
 
     what to show:
@@ -317,7 +318,7 @@ 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->data = dup(dirfd);
+    indir->dirfd = dup(dirfd);
     dirtree_recurse(indir, filter, DIRTREE_SYMFOLLOW*!!(flags&FLAG_L));
   }