fix prototypes/forward declarations/return type

kill obsolete updatedb.csh, it's been rewritten in sh now.

2 files changed, 5 insertions, 78 deletions

diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c
index 0b33188..102c5e9 100644
--- a/usr.bin/locate/locate/locate.c
+++ b/usr.bin/locate/locate/locate.c
@@ -83,6 +83,9 @@ static char sccsid[] = "@(#)locate.c	8.1 (Berkeley) 6/6/93";
 
 FILE *fp;
 
+void fastfind __P((char *pathpart));
+char *patprep __P((char *name));
+
 int
 main(argc, argv)
 	int argc;
@@ -102,13 +105,14 @@ main(argc, argv)
 	exit(0);
 }
 
+void
 fastfind(pathpart)
 	char *pathpart;
 {
 	register char *p, *s;
 	register int c;
 	int count, found, globflag;
-	char *cutoff, *patend, *q, *patprep();
+	char *cutoff, *patend, *q;
 	char bigram1[NBG], bigram2[NBG], path[MAXPATHLEN];
 
 	for (c = 0, p = bigram1, s = bigram2; c < NBG; c++)
diff --git a/usr.bin/locate/locate/updatedb.csh b/usr.bin/locate/locate/updatedb.csh
deleted file mode 100644
index 155dd75..0000000
--- a/usr.bin/locate/locate/updatedb.csh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/csh -f
-#
-# 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.
-#
-# 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.
-#
-# 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.3 (Berkeley) 3/19/94
-#
-
-set SRCHPATHS = "/"			# directories to be put in the database
-set LIBDIR = /usr/libexec		# for subprograms
-					# for temp files
-if (! $?TMPDIR) setenv TMPDIR /var/tmp
-set FCODES = /var/db/locate.database	# the database
-
-set path = ( /bin /usr/bin )
-set bigrams = $TMPDIR/locate.bigrams.$$
-set filelist = $TMPDIR/locate.list.$$
-set errs = $TMPDIR/locate.errs.$$
-
-# Make a file list and compute common bigrams.
-# Alphabetize '/' before any other char with 'tr'.
-# If the system is very short of sort space, 'bigram' can be made
-# smarter to accumulate common bigrams directly without sorting
-# ('awk', with its associative memory capacity, can do this in several
-# lines, but is too slow, and runs out of string space on small machines).
-
-# search locally or everything
-# find ${SRCHPATHS} -print | \
-find ${SRCHPATHS} \! -fstype ufs -prune -or -print | \
-	tr '/' '\001' | \
-	(sort -T $TMPDIR -f; echo $status > $errs) | tr '\001' '/' > $filelist
-
-$LIBDIR/locate.bigram < $filelist | \
-	(sort -T /$TMPDIR; echo $status >> $errs) | \
-	uniq -c | sort -T /$TMPDIR -nr | \
-	awk '{ if (NR <= 128) print $2 }' | tr -d '\012' > $bigrams
-
-# code the file list
-
-if { grep -s -v 0 $errs } then
-	printf 'locate: updatedb failed\n\n'
-else
-	$LIBDIR/locate.code $bigrams < $filelist > $FCODES
-	chmod 644 $FCODES
-	rm $bigrams $filelist $errs
-endif