Use the dirfd() macro instead of accessing struct _dirdesc directly.

This is in preparation for making dirfd() a function (for POSIX
conformance) and struct _dirdesc private.

diff --git a/usr.bin/rdist/expand.c b/usr.bin/rdist/expand.c
index 1fe6e04..366f73f 100644 (file)
--- a/usr.bin/rdist/expand.c
+++ b/usr.bin/rdist/expand.c
@@ -293,7 +293,7 @@ matchdir(char *pattern)
                        return;
                goto patherr2;
        }
-       if (fstat(dirp->dd_fd, &stb) < 0)
+       if (fstat(dirfd(dirp), &stb) < 0)
                goto patherr1;
        if (!ISDIR(stb.st_mode)) {
                errno = ENOTDIR;

diff --git a/usr.sbin/lpr/common_source/common.c b/usr.sbin/lpr/common_source/common.c
index 7c371ae..4adea63 100644 (file)
--- a/usr.sbin/lpr/common_source/common.c
+++ b/usr.sbin/lpr/common_source/common.c
@@ -116,7 +116,7 @@ getq(const struct printer *pp, struct jobqueue *(*namelist[]))
                seteuid(uid);
                return (-1);
        }
-       if (fstat(dirp->dd_fd, &stbuf) < 0)
+       if (fstat(dirfd(dirp), &stbuf) < 0)
                goto errdone;
        seteuid(uid);