forked from pool/findutils
98 lines
3.4 KiB
Diff
98 lines
3.4 KiB
Diff
|
--- doc/find.texi
|
||
|
|
+++ doc/find.texi
|
||
|
|
@@ -2900,7 +2900,7 @@
|
||
|
|
@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
|
||
|
|
--- locate/updatedb.1
|
||
|
|
+++ locate/updatedb.1
|
||
|
|
@@ -75,8 +75,7 @@
|
||
|
|
.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 @@
|
||
|
|
.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
|
||
|
|
@@ -117,7 +117,7 @@
|
||
|
|
: ${NETPATHS=}
|
||
|
|
|
||
|
|
# Directories to not put in the database, which would otherwise be.
|
||
|
|
-: ${PRUNEPATHS="/tmp /usr/tmp /var/tmp /afs /amd /sfs"}
|
||
|
|
+: ${PRUNEPATHS="/tmp /usr/tmp /var/tmp /afs /amd /sfs /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
|
||
|
|
@@ -147,7 +147,7 @@
|
||
|
|
export TMPDIR
|
||
|
|
|
||
|
|
# The user to search network directories as.
|
||
|
|
-: ${NETUSER=daemon}
|
||
|
|
+: ${NETUSER=nobody}
|
||
|
|
|
||
|
|
# The directory containing the subprograms.
|
||
|
|
if test -n "$LIBEXECDIR" ; then
|
||
|
|
@@ -172,11 +172,10 @@
|
||
|
|
|
||
|
|
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 proc 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
|
||
|
|
@@ -235,8 +234,8 @@
|
||
|
|
# results in a temp file, then rename it atomically.
|
||
|
|
if test -s $LOCATE_DB.n; then
|
||
|
|
rm -f $LOCATE_DB
|
||
|
|
+ chmod 644 $LOCATE_DB.n
|
||
|
|
mv $LOCATE_DB.n $LOCATE_DB
|
||
|
|
- chmod 644 $LOCATE_DB
|
||
|
|
else
|
||
|
|
echo "updatedb: new database would be empty" >&2
|
||
|
|
rm -f $LOCATE_DB.n
|
||
|
|
@@ -305,8 +304,8 @@
|
||
|
|
# put the results in a temp file, then rename it atomically.
|
||
|
|
if test -s $LOCATE_DB.n; then
|
||
|
|
rm -f $LOCATE_DB
|
||
|
|
+ chmod 644 $LOCATE_DB.n
|
||
|
|
mv $LOCATE_DB.n $LOCATE_DB
|
||
|
|
- chmod 644 $LOCATE_DB
|
||
|
|
else
|
||
|
|
echo "updatedb: new database would be empty" >&2
|
||
|
|
rm -f $LOCATE_DB.n
|
||
|
|
--- xargs/xargs.c
|
||
|
|
+++ xargs/xargs.c
|
||
|
|
@@ -1234,7 +1234,7 @@
|
||
|
|
[-I replace-str] [-i[replace-str]] [--replace[=replace-str]]\n\
|
||
|
|
[-n max-args] [--max-args=max-args]\n\
|
||
|
|
[-s max-chars] [--max-chars=max-chars]\n\
|
||
|
|
- [-P max-procs] [--max-procs=max-procs] [[--show-limits]\n\
|
||
|
|
+ [-P max-procs] [--max-procs=max-procs] [--show-limits]\n\
|
||
|
|
[--verbose] [--exit] [--no-run-if-empty] [--arg-file=file]\n\
|
||
|
|
[--version] [--help] [command [initial-arguments]]\n"),
|
||
|
|
program_name);
|