diff options
Diffstat (limited to 'lib/libc/gen')
| -rw-r--r-- | lib/libc/gen/fts.3 | 8 | ||||
| -rw-r--r-- | lib/libc/gen/fts.c | 30 |
2 files changed, 9 insertions, 29 deletions
diff --git a/lib/libc/gen/fts.3 b/lib/libc/gen/fts.3 index 0fc6263fe23..61df9e1ab2f 100644 --- a/lib/libc/gen/fts.3 +++ b/lib/libc/gen/fts.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: fts.3,v 1.14 1999/08/27 19:00:48 millert Exp $ +.\" $OpenBSD: fts.3,v 1.15 1999/10/03 19:22:22 millert Exp $ .\" .\" Copyright (c) 1989, 1991, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -454,12 +454,6 @@ This option prevents .Nm from descending into directories that have a different device number than the file from which the descent began. -.It Dv FTS_CHDIRROOT -This option causes -.Fn fts_read -to change the current directory to the root of the hierarchy when -starting a new one. The default is to change to the original -starting directory. .El .Pp The diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c index a2983891f20..26d67fff3f9 100644 --- a/lib/libc/gen/fts.c +++ b/lib/libc/gen/fts.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fts.c,v 1.21 1999/10/03 19:17:31 millert Exp $ */ +/* $OpenBSD: fts.c,v 1.22 1999/10/03 19:22:22 millert Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94"; #else -static char rcsid[] = "$OpenBSD: fts.c,v 1.21 1999/10/03 19:17:31 millert Exp $"; +static char rcsid[] = "$OpenBSD: fts.c,v 1.22 1999/10/03 19:22:22 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -373,16 +373,9 @@ next: tmp = p; * the root of the tree), and load the paths for the next root. */ if (p->fts_level == FTS_ROOTLEVEL) { - if ((sp->fts_options & FTS_CHDIRROOT)) { - if (chdir(p->fts_accpath)) { - SET(FTS_STOP); - return (NULL); - } - } else { - if (FCHDIR(sp, sp->fts_rfd)) { - SET(FTS_STOP); - return (NULL); - } + if (FCHDIR(sp, sp->fts_rfd)) { + SET(FTS_STOP); + return (NULL); } fts_load(sp, p); return (sp->fts_cur = p); @@ -437,16 +430,9 @@ name: t = sp->fts_path + NAPPEND(p->fts_parent); * one directory. */ if (p->fts_level == FTS_ROOTLEVEL) { - if ((sp->fts_options & FTS_CHDIRROOT)) { - if (chdir(p->fts_accpath)) { - SET(FTS_STOP); - return (NULL); - } - } else { - if (FCHDIR(sp, sp->fts_rfd)) { - SET(FTS_STOP); - return (NULL); - } + if (FCHDIR(sp, sp->fts_rfd)) { + SET(FTS_STOP); + return (NULL); } } else if (p->fts_flags & FTS_SYMFOLLOW) { if (FCHDIR(sp, p->fts_symfd)) { |