BSD 4_4 release

[unix-history] / usr / src / usr.bin / locate / locate / updatedb.csh

diff --git a/usr/src/usr.bin/locate/locate/updatedb.csh b/usr/src/usr.bin/locate/locate/updatedb.csh
index c2fa896..e72c758 100644 (file)
--- a/usr/src/usr.bin/locate/locate/updatedb.csh
+++ b/usr/src/usr.bin/locate/locate/updatedb.csh
@@ -1,14 +1,40 @@
 #!/bin/csh -f
 #
 #!/bin/csh -f
 #

-# Copyright (c) 1989 The Regents of the University of California.
-# All rights reserved.
+# Copyright (c) 1989, 1993
+#      The Regents of the University of California.  All rights reserved.

 #
 # This code is derived from software contributed to Berkeley by
 # James A. Woods.
 #
 #
 # This code is derived from software contributed to Berkeley by
 # James A. Woods.
 #

-# %sccs.include.redist.sh%
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#      This product includes software developed by the University of
+#      California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.

 #
 #

-#      @(#)updatedb.csh        5.3 (Berkeley) %G%
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#      @(#)updatedb.csh        8.1 (Berkeley) 6/6/93

 #
 
 set SRCHPATHS = "/"                    # directories to be put in the database
 #
 
 set SRCHPATHS = "/"                    # directories to be put in the database


@@ -30,7 +56,7 @@ set errs = $TMPDIR/locate.errs.$$
 
 # search locally or everything
 # find ${SRCHPATHS} -print | \
 
 # search locally or everything
 # find ${SRCHPATHS} -print | \

-find ${SRCHPATHS} -fstype local -print | \
+find ${SRCHPATHS} \! -fstype local -prune -or -print | \

        tr '/' '\001' | \
        (sort -T /var/tmp -f; echo $status > $errs) | tr '\001' '/' > $filelist
 
        tr '/' '\001' | \
        (sort -T /var/tmp -f; echo $status > $errs) | tr '\001' '/' > $filelist