forked from pool/findutils
101 lines
3.3 KiB
Diff
101 lines
3.3 KiB
Diff
--- doc/find.texi
|
|
+++ doc/find.texi
|
|
@@ -3329,7 +3329,7 @@ Default is none.
|
|
@item --prunepaths='@var{path}@dots{}'
|
|
Directories to omit from the database, which would otherwise be
|
|
included. The environment variable @code{PRUNEPATHS} also sets this
|
|
-value. Default is @file{/tmp /usr/tmp /var/tmp /afs}. The paths are
|
|
+value. Default is @file{/tmp /usr/tmp /var/tmp /afs /var/spool}. The paths are
|
|
used as regular expressions (with @code{find ... -regex}, so you need
|
|
to specify these paths in the same way that @code{find} will encounter
|
|
them. This means for example that the paths must not include trailing
|
|
--- find/ftsfind.c
|
|
+++ find/ftsfind.c
|
|
@@ -388,7 +388,7 @@ consider_visiting(FTS *p, FTSENT *ent)
|
|
{
|
|
struct stat statbuf;
|
|
mode_t mode;
|
|
- int ignore, isdir;
|
|
+ int ignore;
|
|
|
|
if (options.debug_options & DebugSearch)
|
|
fprintf(stderr,
|
|
@@ -498,22 +498,6 @@ consider_visiting(FTS *p, FTSENT *ent)
|
|
|
|
/* examine this item. */
|
|
ignore = 0;
|
|
- isdir = S_ISDIR(statbuf.st_mode)
|
|
- || (FTS_D == ent->fts_info)
|
|
- || (FTS_DP == ent->fts_info)
|
|
- || (FTS_DC == ent->fts_info);
|
|
-
|
|
- if (isdir && (ent->fts_info == FTS_NSOK))
|
|
- {
|
|
- /* This is a directory, but fts did not stat it, so
|
|
- * presumably would not be planning to search its
|
|
- * children. Force a stat of the file so that the
|
|
- * children can be checked.
|
|
- */
|
|
- fts_set(p, ent, FTS_AGAIN);
|
|
- return;
|
|
- }
|
|
-
|
|
if (options.maxdepth >= 0)
|
|
{
|
|
if (ent->fts_level >= options.maxdepth)
|
|
--- locate/updatedb.1
|
|
+++ locate/updatedb.1
|
|
@@ -75,8 +75,7 @@ Default is \fInfs NFS proc\fP.
|
|
.TP
|
|
.B \-\-output=\fIdbfile\fP
|
|
The database file to build.
|
|
-Default is system-dependent. In Debian GNU/Linux, the default
|
|
-is /var/cache/locate/locatedb.
|
|
+Default is /var/lib/locatedb.
|
|
.TP
|
|
.B \-\-localuser=\fIuser\fP
|
|
The user to search non-network directories as, using \fBsu\fP(1).
|
|
@@ -85,7 +84,7 @@ You can also use the environment variabl
|
|
.TP
|
|
.B \-\-netuser=\fIuser\fP
|
|
The user to search network directories as, using \fBsu\fP(1).
|
|
-Default is \fBdaemon\fP.
|
|
+Default is \fBnobody\fP.
|
|
You can also use the environment variable \fBNETUSER\fP to set this user.
|
|
.TP
|
|
.B \-\-old\-format
|
|
--- locate/updatedb.sh
|
|
+++ locate/updatedb.sh
|
|
@@ -158,7 +158,7 @@ select_shell() {
|
|
: ${NETPATHS=}
|
|
|
|
# Directories to not put in the database, which would otherwise be.
|
|
-: ${PRUNEPATHS="/tmp /usr/tmp /var/tmp /afs /amd /sfs /proc"}
|
|
+: ${PRUNEPATHS="/tmp /usr/tmp /var/tmp /afs /amd /sfs /proc /var/spool"}
|
|
|
|
# Trailing slashes result in regex items that are never matched, which
|
|
# is not what the user will expect. Therefore we now reject such
|
|
@@ -188,7 +188,7 @@ fi
|
|
export TMPDIR
|
|
|
|
# The user to search network directories as.
|
|
-: ${NETUSER=daemon}
|
|
+: ${NETUSER=nobody}
|
|
|
|
# The directory containing the subprograms.
|
|
if test -n "$LIBEXECDIR" ; then
|
|
@@ -228,11 +228,10 @@ done
|
|
|
|
PATH=/bin:/usr/bin:${BINDIR}; export PATH
|
|
|
|
-: ${PRUNEFS="nfs NFS proc afs proc smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs sysfs shfs"}
|
|
+: ${PRUNEFS="nfs NFS nfs4 afs proc smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs sysfs shfs cifs 9P"}
|
|
|
|
if test -n "$PRUNEFS"; then
|
|
-prunefs_exp=`echo $PRUNEFS |sed -e 's/\([^ ][^ ]*\)/-o -fstype \1/g' \
|
|
- -e 's/-o //' -e 's/$/ -o/'`
|
|
+ prunefs_exp=`echo $PRUNEFS |sed -e 's/\([^ ][^ ]*\)/-fstype \1 -o/g'`
|
|
else
|
|
prunefs_exp=''
|
|
fi
|