From 1a5bac7242b5267f816c85cfd03283a4f58392b3 Mon Sep 17 00:00:00 2001
From: Apple <opensource@apple.com>
Date: Mon, 20 Feb 2006 21:39:55 +0000
Subject: [PATCH] shell_cmds-81.tar.gz

---
 date/date.c                      |  16 +-
 find/find.c                      |  31 ++-
 find/find.h                      |   1 +
 find/function.c                  | 129 +++++++++-
 locate/bigram/Makefile           |   1 -
 locate/bigram/locate.bigram.c    |  85 +++----
 locate/code/locate.code.c        | 145 ++++-------
 locate/locate/Makefile           |   8 +-
 locate/locate/Makefile.postamble |   9 +-
 locate/locate/concatdb.sh        |  70 ------
 locate/locate/fastfind.c         | 330 -------------------------
 locate/locate/locate.1           | 233 ++----------------
 locate/locate/locate.c           | 400 ++++++++++---------------------
 locate/locate/locate.h           |  37 +--
 locate/locate/locate.rc          |  26 --
 locate/locate/locate.updatedb.8  |  43 ++--
 locate/locate/mklocatedb.sh      |  92 -------
 locate/locate/pathnames.h        |   2 +
 locate/locate/updatedb.csh       |  81 +++++++
 locate/locate/updatedb.sh        |  93 -------
 locate/locate/util.c             | 278 ---------------------
 who/who.c                        |  42 ++++
 xargs/xargs.c                    |  36 ++-
 23 files changed, 569 insertions(+), 1619 deletions(-)
 delete mode 100644 locate/locate/concatdb.sh
 delete mode 100644 locate/locate/fastfind.c
 delete mode 100644 locate/locate/locate.rc
 delete mode 100644 locate/locate/mklocatedb.sh
 create mode 100644 locate/locate/updatedb.csh
 delete mode 100644 locate/locate/updatedb.sh
 delete mode 100644 locate/locate/util.c

diff --git a/date/date.c b/date/date.c
index 7067535..fc456f8 100644
--- a/date/date.c
+++ b/date/date.c
@@ -74,7 +74,7 @@ int retval = 0;
 int  unix2003_std = 0;		/* to determine legacy vs std mode */
 
 int main __P((int, char *[]));
-static void setthetime __P((const char *));
+static void setthetime __P((char *));
 static void badformat __P((void));
 static void badtime __P((void));
 static void usage __P((void));
@@ -91,6 +91,11 @@ main(argc, argv)
 
 	(void)setlocale(LC_ALL, "");
 
+	if (compat_mode("bin/date", "unix2003"))	/* Determine the STD */
+		unix2003_std = 1;
+	else
+		unix2003_std = 0;
+
 	rflag = 0;
 	while ((ch = getopt(argc, argv, "nr:u")) != -1)
 		switch((char)ch) {
@@ -146,7 +151,7 @@ main(argc, argv)
 
 void
 setthetime(p)
-	const char *p;
+	char *p;
 {
 
 	struct tm *lt;
@@ -169,6 +174,8 @@ setthetime(p)
 
 	lt = localtime(&tval);
 
+	lt->tm_isdst = -1;			/* Divine correct DST */
+
 	if (dot != NULL) {			/* .ss */
 		len = strlen(dot);
 		if (len != 3)
@@ -182,11 +189,6 @@ setthetime(p)
 
 	yearset = 0;
 
-	if (compat_mode("bin/date", "unix2003"))	/* Determine the STD */
-		unix2003_std = 1;
-	else
-		unix2003_std = 0;
-
 	switch (strlen(p) - len) {
 	case 12:				/* cc */
 		if(unix2003_std) {
diff --git a/find/find.c b/find/find.c
index e5577ea..9f5db7d 100644
--- a/find/find.c
+++ b/find/find.c
@@ -55,6 +55,12 @@ static const char rcsid[] =
 #include <stdlib.h>
 #include <unistd.h>
 
+#ifdef __APPLE__
+#include "get_compat.h"
+#else
+#define COMPAT_MODE(func, mode) 1
+#endif
+
 #include "find.h"
 
 static int	find_compare __P((const FTSENT **s1, const FTSENT **s2));
@@ -218,15 +224,28 @@ find_execute(plan, paths)
 	 * (whether or not it's empty). UNIX conformance... <sigh>
 	 */
 		
+	int strict_symlinks = (ftsoptions & (FTS_COMFOLLOW|FTS_LOGICAL))
+	  && COMPAT_MODE("bin/find", "unix2003");
+
 	myPaths = addPath(NULL, NULL);
 	for (pathIndex = 0; paths[pathIndex] != NULL; ++pathIndex) {
-		/* retrieve mode bits, and examine "searchable" bit of directories */
-		/* exempt root from POSIX conformance */
-		if (getuid() && (stat(paths[pathIndex], &statInfo) == 0) && ((statInfo.st_mode & S_IFMT) == S_IFDIR)) {
+		int stat_ret = stat(paths[pathIndex], &statInfo);
+		int stat_errno = errno;
+		if (strict_symlinks && stat_ret < 0) {
+		    if (stat_errno == ELOOP) {
+			errx(1, "Symlink loop resolving %s", paths[pathIndex]);
+		    }
+		}
+
+		/* retrieve mode bits, and examine "searchable" bit of 
+		  directories, exempt root from POSIX conformance */
+		if (COMPAT_MODE("bin/find", "unix2003") && getuid() 
+		  && stat_ret == 0 
+		  && ((statInfo.st_mode & S_IFMT) == S_IFDIR)) {
 			if ((statInfo.st_mode & (S_IXUSR + S_IXGRP + S_IXOTH)) != 0) {
 				myPaths = addPath(myPaths, paths[pathIndex]);
 			} else {
-				if (errno != ENAMETOOLONG) {	/* if name is too long, just let existing logic handle it */
+				if (stat_errno != ENAMETOOLONG) {	/* if name is too long, just let existing logic handle it */
 					warnx("%s: Permission denied", paths[pathIndex]);
 					nonSearchableDirFound = 1;
 				}
@@ -295,6 +314,10 @@ find_execute(plan, paths)
 	if (errno)
 		err(1, "fts_read");
 
+	for (p = plan; p; p = p->next) {
+	    if (p->flags & F_CLEANUP) (p->execute)(p, NULL);
+	}
+
 	free (myPaths);
 	return (rval);
 }
diff --git a/find/find.h b/find/find.h
index 3916769..24eaa55 100644
--- a/find/find.h
+++ b/find/find.h
@@ -68,6 +68,7 @@ typedef	struct _plandata *creat_f(struct _option *, char ***);
 #define	F_MTFLAG	0x00000000	/* fstype */
 #define	F_MTTYPE	0x00001000
 #define	F_IGNCASE	0x00010000	/* iname ipath iregex */
+#define F_CLEANUP	0x00020000	/* need an extra cleanup call at the end*/
 
 /* node definition */
 typedef struct _plandata {
diff --git a/find/function.c b/find/function.c
index 5411be3..eb2c65a 100644
--- a/find/function.c
+++ b/find/function.c
@@ -49,6 +49,8 @@ static const char rcsid[] =
 #include <sys/wait.h>
 #include <sys/mount.h>
 #include <sys/timeb.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
 
 #include <dirent.h>
 #include <err.h>
@@ -65,6 +67,12 @@ static const char rcsid[] =
 
 #include "find.h"
 
+#ifdef __APPLE__
+#include "get_compat.h"
+#else
+#define COMPAT_MODE(func, mode) 1
+#endif
+
 time_t get_date __P((char *date, struct timeb *now));
 
 #define	COMPARE(a, b) {							\
@@ -227,15 +235,17 @@ f_Xtime(plan, entry)
 {
 	extern time_t now;
 
+	int fudge = COMPAT_MODE("bin/find", "unix2003") ? 0 : 86400 - 1;
+
 	if (plan->flags & F_TIME_C) {
 		COMPARE((now - entry->fts_statp->st_ctime +
-		    86400 - 1) / 86400, plan->t_data);
+		    fudge) / 86400, plan->t_data);
 	} else if (plan->flags & F_TIME_A) {
 		COMPARE((now - entry->fts_statp->st_atime +
-		    86400 - 1) / 86400, plan->t_data);
+		    fudge) / 86400, plan->t_data);
 	} else {
 		COMPARE((now - entry->fts_statp->st_mtime +
-		    86400 - 1) / 86400, plan->t_data);
+		    fudge) / 86400, plan->t_data);
 	}
 }
 
@@ -443,16 +453,81 @@ f_exec(plan, entry)
 	register int cnt;
 	pid_t pid;
 	int status;
-	char *file;
-
-	/* XXX - if file/dir ends in '/' this will not work -- can it? */
-	if ((plan->flags & F_EXECDIR) && \
-	    (file = strrchr(entry->fts_path, '/')))
+	char *file = NULL;
+	static char **plus_path = NULL;
+	static int plus_path_cnt = 0;
+	static unsigned long exec_after = 0;
+	static unsigned long path_so_far = 0;
+	struct _ex saved_ex;
+
+	if (entry) {
+	    /* XXX - if file/dir ends in '/' this will not work -- can it? */
+	    if ((plan->flags & F_EXECDIR) && 
+	      (file = strrchr(entry->fts_path, '/'))) {
 		file++;
-	else
+	    } else {
 		file = entry->fts_path;
+	    }
+
+	    if (plan->flags & F_CLEANUP) {
+		plus_path = realloc(plus_path, sizeof(char *) * ++plus_path_cnt);
+		if (!plus_path) errx(1, "out of memory");
+		plus_path[plus_path_cnt -1] = strdup(file);
+		if (!plus_path[plus_path_cnt -1]) errx(1, "out of memory");
+
+		path_so_far += sizeof(char *) + strlen(file);
+
+		if (!exec_after) {
+		    size_t l = sizeof(exec_after);
+		    int rc = 
+		      sysctlbyname("kern.argmax", &exec_after, &l, NULL, NULL);
+		    if (rc < 0) {
+			/* Something conservitave */
+			exec_after = 16 * 1024;
+		    }
+		}
+		if (path_so_far >= exec_after) {
+		    return f_exec(plan, NULL);
+		}
+
+		return 1;
+	    }
+	} else {
+	    if (!plus_path) return 1;
+	    saved_ex = plan->p_un.ex;
+	    int new_len = 0;
+	    int ocnt;
+	    for(cnt = 0; plan->e_argv[cnt]; ++cnt) {
+		if (plan->e_len[cnt]) {
+		    new_len += plus_path_cnt;
+		} else {
+		    new_len++;
+		}
+	    }
+	    new_len++;
+
+	    plan->e_argv = malloc(sizeof(char *) * new_len);
+	    if (!plan->e_argv) errx(1, "out of memory");
+
+	    for(ocnt = cnt = 0; saved_ex._e_argv[ocnt]; ++ocnt) {
+		if (saved_ex._e_len[ocnt]) {
+		    int ppi;
+		    for(ppi = 0; ppi < plus_path_cnt; ++ppi) {
+			plan->e_argv[cnt++] = plus_path[ppi];
+		    }
+#if 0
+		    memmove(plan->e_argv + cnt, *plus_path,
+		      sizeof(char *) * plus_path_cnt);
+		    cnt += plus_path_cnt;
+#endif
+		} else {
+		    plan->e_argv[cnt++] = saved_ex._e_argv[ocnt];
+		}
+	    }
+	    plan->e_argv[cnt++] = NULL;
+	}
 
-	for (cnt = 0; plan->e_argv[cnt]; ++cnt)
+	if (!(plan->flags & F_CLEANUP)) for (cnt = 0; plan->e_argv[cnt]; ++cnt)
 		if (plan->e_len[cnt])
 			brace_subst(plan->e_orig[cnt], &plan->e_argv[cnt],
 			    file, plan->e_len[cnt]);
@@ -479,6 +554,20 @@ f_exec(plan, entry)
 		_exit(1);
 	}
 	pid = waitpid(pid, &status, 0);
+	if (plus_path) {
+	    int i;
+	    for(i = 0; i < plus_path_cnt; ++i) {
+		free(plus_path[i]);
+	    }
+	    free(plus_path);
+	    plus_path = NULL;
+	    plus_path_cnt = 0;
+	    plan->p_un.ex = saved_ex;
+	    path_so_far = 0;
+	    if (WIFEXITED(status) && WEXITSTATUS(status)) {
+		exit(WEXITSTATUS(status));
+	    }
+	}
 	return (pid != -1 && WIFEXITED(status) && !WEXITSTATUS(status));
 }
 
@@ -497,6 +586,7 @@ c_exec(option, argvp)
 	PLAN *new;			/* node returned */
 	register int cnt;
 	register char **argv, **ap, *p;
+	int plus_armed = 0;
 
 	/* XXX - was in c_execdir, but seems unnecessary!?
 	ftsoptions &= ~FTS_NOSTAT;
@@ -510,8 +600,18 @@ c_exec(option, argvp)
 		if (!*ap)
 			errx(1,
 			    "%s: no terminating \";\"", option->name);
-		if (**ap == ';')
+		if (**ap == '{' && ap[0][1] == '}' && ap[0][2] == '\0') {
+		    plus_armed = COMPAT_MODE("bin/find", "unix2003");
+		    continue;
+		}
+		if (**ap == ';') {
 			break;
+		}
+		if (plus_armed && **ap == '+') {
+			new->flags |= F_CLEANUP;
+			break;
+		}
+		plus_armed = 0;
 	}
 
 	cnt = ap - *argvp + 1;
@@ -1025,8 +1125,11 @@ c_perm(option, argvp)
 		new->flags |= F_ATLEAST;
 		++perm;
 	} else if (*perm == '+') {
-		new->flags |= F_ANY;
-		++perm;
+		if ((set = setmode(perm +1)) != NULL) {
+		    new->flags |= F_ANY;
+		    ++perm;
+		    free(set);
+		}
 	}
 
 	if ((set = setmode(perm)) == NULL)
diff --git a/locate/bigram/Makefile b/locate/bigram/Makefile
index 21039bf..3916131 100644
--- a/locate/bigram/Makefile
+++ b/locate/bigram/Makefile
@@ -26,7 +26,6 @@ DEBUG_LIBS = $(LIBS)
 PROF_LIBS = $(LIBS)
 
 
-HEADER_PATHS = -I../locate
 
 
 NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build
diff --git a/locate/bigram/locate.bigram.c b/locate/bigram/locate.bigram.c
index a4ad2b1..89a87eb 100644
--- a/locate/bigram/locate.bigram.c
+++ b/locate/bigram/locate.bigram.c
@@ -1,5 +1,6 @@
+/*	$NetBSD: locate.bigram.c,v 1.6 1997/10/19 04:11:52 lukem Exp $	*/
+
 /*
- * Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -33,78 +34,62 @@
  * 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.
- *
- * $FreeBSD: src/usr.bin/locate/bigram/locate.bigram.c,v 1.12 2005/02/09 09:13:36 stefanf Exp $
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
+__COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n");
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)locate.bigram.c	8.1 (Berkeley) 6/6/93";
+#if 0
+static char sccsid[] = "@(#)locate.bigram.c	8.2 (Berkeley) 4/28/95";
+#endif
+__RCSID("$NetBSD: locate.bigram.c,v 1.6 1997/10/19 04:11:52 lukem Exp $");
 #endif /* not lint */
 
 /*
- *  bigram < sorted_file_names | sort -nr | 
- *  	awk 'NR <= 128 { printf $2 }' > bigrams
- *
+ *  bigram < text > bigrams
+ * 
  * List bigrams for 'updatedb' script.
  * Use 'code' to encode a file using this output.
  */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <sys/param.h>			/* for MAXPATHLEN */
-#include "locate.h"
 
-u_char buf1[MAXPATHLEN] = " ";
-u_char buf2[MAXPATHLEN];
-u_int bigram[UCHAR_MAX + 1][UCHAR_MAX + 1];
+char buf1[MAXPATHLEN] = " ";	
+char buf2[MAXPATHLEN];
+
+int	main __P((int, char **));
 
 int
-main(void)
+main(argc, argv)
+	int argc;
+	char *argv[];
 {
-  	register u_char *cp;
-	register u_char *oldpath = buf1, *path = buf2;
-	register u_int i, j;
-
-     	while (fgets(path, sizeof(buf2), stdin) != NULL) {
-
-		/* 
-		 * We don't need remove newline character '\n'.
-		 * '\n' is less than ASCII_MIN and will be later
-		 * ignored at output.
-		 */
+  	char *cp;
+	char *oldpath = buf1, *path = buf2;
 
+     	while ( fgets ( path, sizeof(buf2), stdin ) != NULL ) {
 
 		/* skip longest common prefix */
-		for (cp = path; *cp == *oldpath; cp++, oldpath++)
-			if (*cp == '\0')
+		for ( cp = path; *cp == *oldpath; cp++, oldpath++ )
+			if ( *oldpath == '\0' )
 				break;
-
-		while (*cp != '\0' && *(cp + 1) != '\0') {
-			bigram[(u_char)*cp][(u_char)*(cp + 1)]++;
-			cp += 2;
-		}
-
-		/* swap pointers */
-		if (path == buf1) { 
-			path = buf2;
-			oldpath = buf1;
-		} else {
-			path = buf1;
-			oldpath = buf2;
+		/*
+		 * output post-residue bigrams only
+		 */
+		while ( *cp != '\0' && *(cp + 1) != '\0' ) {
+			putchar ( *cp++ );
+			putchar ( *cp++ );
+			putchar ( '\n' );
 		}
+		if ( path == buf1 )		/* swap pointers */
+			path = buf2, oldpath = buf1;
+		else
+			path = buf1, oldpath = buf2;
    	}
-
-	/* output, boundary check */
-	for (i = ASCII_MIN; i <= ASCII_MAX; i++)
-		for (j = ASCII_MIN; j <= ASCII_MAX; j++)
-			if (bigram[i][j] != 0)
-				(void)printf("%4u %c%c\n", bigram[i][j], i, j);
-
-	exit(0);
+	return (0);
 }
diff --git a/locate/code/locate.code.c b/locate/code/locate.code.c
index 9f7850e..c3a262e 100644
--- a/locate/code/locate.code.c
+++ b/locate/code/locate.code.c
@@ -1,5 +1,6 @@
+/*	$NetBSD: locate.code.c,v 1.6 1997/10/19 04:11:54 lukem Exp $	*/
+
 /*
- * Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -33,18 +34,19 @@
  * 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.
- *
- * $FreeBSD: src/usr.bin/locate/code/locate.code.c,v 1.13 2002/03/22 01:22:47 imp Exp $
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
+__COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n");
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)locate.code.c	8.1 (Berkeley) 6/6/93";
+#if 0
+static char sccsid[] = "@(#)locate.code.c	8.4 (Berkeley) 5/4/95";
+#endif
+__RCSID("$NetBSD: locate.code.c,v 1.6 1997/10/19 04:11:54 lukem Exp $");
 #endif /* not lint */
 
 /*
@@ -73,66 +75,48 @@ static char sccsid[] = "@(#)locate.code.c	8.1 (Berkeley) 6/6/93";
  *
  *	0-28	likeliest differential counts + offset to make nonnegative
  *	30	switch code for out-of-range count to follow in next word
- *      31      an 8 bit char followed
  *	128-255 bigram codes (128 most common, as determined by 'updatedb')
  *	32-127  single character (printable) ascii residue (ie, literal)
  *
- * The locate database store any character except newline ('\n') 
- * and NUL ('\0'). The 8-bit character support don't wast extra
- * space until you have characters in file names less than 32
- * or greather than 127.
- * 
- *
- * SEE ALSO:	updatedb.sh, ../bigram/locate.bigram.c
+ * SEE ALSO:	updatedb.csh, bigram.c
  *
  * AUTHOR:	James A. Woods, Informatics General Corp.,
  *		NASA Ames Research Center, 10/82
- *              8-bit file names characters: 
- *              	Wolfram Schneider, Berlin September 1996
  */
 
 #include <sys/param.h>
+
 #include <err.h>
 #include <errno.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 #include <unistd.h>
+
 #include "locate.h"
 
 #define	BGBUFSIZE	(NBG * 2)	/* size of bigram buffer */
 
-u_char buf1[MAXPATHLEN] = " ";	
-u_char buf2[MAXPATHLEN];
-u_char bigrams[BGBUFSIZE + 1] = { 0 };
-
-#define LOOKUP 1 /* use a lookup array instead a function, 3x faster */
+char buf1[MAXPATHLEN] = " ";	
+char buf2[MAXPATHLEN];
+char bigrams[BGBUFSIZE + 1] = { 0 };
 
-#ifdef LOOKUP
-#define BGINDEX(x) (big[(u_char)*x][(u_char)*(x + 1)])
-typedef short bg_t;
-bg_t big[UCHAR_MAX + 1][UCHAR_MAX + 1];
-#else
-#define BGINDEX(x) bgindex(x)
-typedef int bg_t;
-int	bgindex(char *);
-#endif /* LOOKUP */
-
-
-void	usage(void);
+int	bgindex __P((char *));
+int	main __P((int, char **));
+void	usage __P((void));
 
 int
 main(argc, argv)
 	int argc;
 	char *argv[];
 {
-	register u_char *cp, *oldpath, *path;
+	char *cp, *oldpath, *path;
 	int ch, code, count, diffcount, oldcount;
 	FILE *fp;
-	register int i, j;
 
 	while ((ch = getopt(argc, argv, "")) != -1)
 		switch(ch) {
+		case '?':
 		default:
 			usage();
 		}
@@ -147,51 +131,30 @@ main(argc, argv)
 
 	/* First copy bigram array to stdout. */
 	(void)fgets(bigrams, BGBUFSIZE + 1, fp);
-
 	if (fwrite(bigrams, 1, BGBUFSIZE, stdout) != BGBUFSIZE)
 		err(1, "stdout");
 	(void)fclose(fp);
 
-#ifdef LOOKUP
-	/* init lookup table */
-	for (i = 0; i < UCHAR_MAX + 1; i++)
-	    	for (j = 0; j < UCHAR_MAX + 1; j++) 
-			big[i][j] = (bg_t)-1;
-
-	for (cp = bigrams, i = 0; *cp != '\0'; i += 2, cp += 2)
-	        big[(u_char)*cp][(u_char)*(cp + 1)] = (bg_t)i;
-
-#endif /* LOOKUP */
-
 	oldpath = buf1;
 	path = buf2;
 	oldcount = 0;
-
 	while (fgets(path, sizeof(buf2), stdin) != NULL) {
+		/* Truncate newline. */
+		cp = path + strlen(path) - 1;
+		if (cp > path && *cp == '\n')
+			*cp = '\0';
 
-		/* skip empty lines */
-		if (*path == '\n')
-			continue;
-
-		/* remove newline */
+		/* Squelch characters that would botch the decoding. */
 		for (cp = path; *cp != '\0'; cp++) {
-#ifndef LOCATE_CHAR30
-			/* old locate implementations core'd for char 30 */
-			if (*cp == SWITCH)
+			*cp &= PARITY-1;
+			if (*cp <= SWITCH)
 				*cp = '?';
-			else
-#endif /* !LOCATE_CHAR30 */
-
-			/* chop newline */
-			if (*cp == '\n')
-				*cp = '\0';
 		}
 
 		/* Skip longest common prefix. */
 		for (cp = path; *cp == *oldpath; cp++, oldpath++)
-			if (*cp == '\0')
+			if (*oldpath == '\0')
 				break;
-
 		count = cp - path;
 		diffcount = count - oldcount + OFFSET;
 		oldcount = count;
@@ -204,42 +167,22 @@ main(argc, argv)
 				err(1, "stdout");
 
 		while (*cp != '\0') {
-			/* print *two* characters */
-
-			if ((code = BGINDEX(cp)) != (bg_t)-1) {
-				/*
-				 * print *one* as bigram
-				 * Found, so mark byte with 
-				 *  parity bit. 
-				 */
+			if (*(cp + 1) == '\0') {
+				if (putchar(*cp) == EOF)
+					err(1, "stdout");
+				break;
+			}
+			if ((code = bgindex(cp)) < 0) {
+				if (putchar(*cp++) == EOF ||
+				    putchar(*cp++) == EOF)
+					err(1, "stdout");
+			} else {
+				/* Found, so mark byte with parity bit. */
 				if (putchar((code / 2) | PARITY) == EOF)
 					err(1, "stdout");
 				cp += 2;
 			}
-
-			else {
-				for (i = 0; i < 2; i++) {
-					if (*cp == '\0')
-						break;
-
-					/* print umlauts in file names */
-					if (*cp < ASCII_MIN || 
-					    *cp > ASCII_MAX) {
-						if (putchar(UMLAUT) == EOF ||
-						    putchar(*cp++) == EOF)
-							err(1, "stdout");
-					} 
-
-					else {
-						/* normal character */
-						if(putchar(*cp++) == EOF)
-							err(1, "stdout");
-					}
-				}
-
-			}
 		}
-
 		if (path == buf1) {		/* swap pointers */
 			path = buf2;
 			oldpath = buf1;
@@ -254,21 +197,19 @@ main(argc, argv)
 	exit(0);
 }
 
-#ifndef LOOKUP
 int
 bgindex(bg)			/* Return location of bg in bigrams or -1. */
 	char *bg;
 {
-	register char bg0, bg1, *p;
+	char bg0, bg1, *p;
 
 	bg0 = bg[0];
 	bg1 = bg[1];
-	for (p = bigrams; *p != NULL; p++)
+	for (p = bigrams; *p != '\0'; p++)
 		if (*p++ == bg0 && *p == bg1)
 			break;
-	return (*p == NULL ? -1 : (--p - bigrams));
+	return (*p == '\0' ? -1 : --p - bigrams);
 }
-#endif /* !LOOKUP */
 
 void
 usage()
diff --git a/locate/locate/Makefile b/locate/locate/Makefile
index 7980aca..8682185 100644
--- a/locate/locate/Makefile
+++ b/locate/locate/Makefile
@@ -14,12 +14,10 @@ PROJECT_TYPE = Tool
 
 HFILES = locate.h pathnames.h
 
-CFILES = util.c locate.c
+CFILES = locate.c
 
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble \
-            fastfind.c \
-            locate.1 locate.updatedb.8 locate.rc \
-            concatdb.sh mklocatedb.sh updatedb.sh
+OTHERSRCS = Makefile Makefile.preamble Makefile.postamble locate.1\
+            updatedb.csh locate.updatedb.8
 
 
 MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
diff --git a/locate/locate/Makefile.postamble b/locate/locate/Makefile.postamble
index 0ea2a99..abf00eb 100644
--- a/locate/locate/Makefile.postamble
+++ b/locate/locate/Makefile.postamble
@@ -1,10 +1,5 @@
 include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
 
 after_install::
-	$(INSTALL_SCRIPT) concatdb.sh $(DSTROOT)/usr/libexec/locate.concatdb
-	$(INSTALL_SCRIPT) mklocatedb.sh $(DSTROOT)/usr/libexec/locate.mklocatedb
-	$(INSTALL_SCRIPT) updatedb.sh $(DSTROOT)/usr/libexec/locate.updatedb
-	$(LN) $(DSTROOT)/usr/share/man/man8/locate.updatedb.8 $(DSTROOT)/usr/share/man/man8/locate.concatdb.8
-	$(LN) $(DSTROOT)/usr/share/man/man8/locate.updatedb.8 $(DSTROOT)/usr/share/man/man8/locate.mklocatedb.8
-	$(MKDIR) $(DSTROOT)$(ETCDIR)
-	$(INSTALL_FILE) locate.rc $(DSTROOT)$(ETCDIR)
+	$(CP) updatedb.csh $(DSTROOT)/usr/libexec/locate.updatedb
+	$(CHMOD) 555 $(DSTROOT)/usr/libexec/locate.updatedb
diff --git a/locate/locate/concatdb.sh b/locate/locate/concatdb.sh
deleted file mode 100644
index a236332..0000000
--- a/locate/locate/concatdb.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) September 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
-# All rights reserved.
-#
-# 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.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
-#
-# concatdb - concatenate locate databases
-# 
-# usage: concatdb database1 ... databaseN > newdb
-#
-# Sequence of databases is important.
-#
-# $FreeBSD: src/usr.bin/locate/locate/concatdb.sh,v 1.10 2000/01/12 08:01:00 kris Exp $
-
-# The directory containing locate subprograms
-: ${LIBEXECDIR:=/usr/libexec}; export LIBEXECDIR
-
-PATH=$LIBEXECDIR:/bin:/usr/bin:$PATH; export PATH
-
-umask 077			# protect temp files
-
-: ${TMPDIR:=/var/tmp}; export TMPDIR;
-test -d "$TMPDIR" || TMPDIR=/var/tmp
-
-# utilities to built locate database
-: ${bigram:=locate.bigram}
-: ${code:=locate.code}
-: ${sort:=sort}
-: ${locate:=locate}
-
-
-case $# in 
-        [01]) 	echo 'usage: concatdb databases1 ... databaseN > newdb'
-		exit 1
-		;;
-esac
-
-
-bigrams=`mktemp ${TMPDIR=/tmp}/_bigrams.XXXXXXXXXX` || exit 1
-trap 'rm -f $bigrams' 0 1 2 3 5 10 15
-
-for db 
-do
-       $locate -d $db /
-done | $bigram | $sort -nr | awk 'NR <= 128 { printf $2 }' > $bigrams
-
-for db
-do
-	$locate -d $db /
-done | $code $bigrams
diff --git a/locate/locate/fastfind.c b/locate/locate/fastfind.c
deleted file mode 100644
index 9383f07..0000000
--- a/locate/locate/fastfind.c
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
- * 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.
- *
- * $FreeBSD: src/usr.bin/locate/locate/fastfind.c,v 1.14 2005/12/07 12:22:46 des Exp $
- */
-
-
-#ifndef _LOCATE_STATISTIC_
-#define _LOCATE_STATISTIC_
-
-void 
-statistic (fp, path_fcodes)
-	FILE *fp;               /* open database */
-	char *path_fcodes;  	/* for error message */
-{
-	register int lines, chars, size, big, zwerg;
-	register u_char *p, *s;
-	register int c;
-	int count, umlaut;
-	u_char bigram1[NBG], bigram2[NBG], path[MAXPATHLEN];
-
-	for (c = 0, p = bigram1, s = bigram2; c < NBG; c++) {
-		p[c] = check_bigram_char(getc(fp));
-		s[c] = check_bigram_char(getc(fp));
-	}
-
-	lines = chars = big = zwerg = umlaut = 0;
-	size = NBG + NBG;
-
-	for (c = getc(fp), count = 0; c != EOF; size++) {
-		if (c == SWITCH) {
-			count += getwf(fp) - OFFSET;
-			size += sizeof(int);
-			zwerg++;
-		} else
-			count += c - OFFSET;
-		
-		for (p = path + count; (c = getc(fp)) > SWITCH; size++)
-			if (c < PARITY) {
-				if (c == UMLAUT) {
-					c = getc(fp);
-					size++;
-					umlaut++;
-				}
-				p++;
-			} else {
-				/* bigram char */
-				big++;
-				p += 2;
-			}
-
-		p++;
-		lines++;
-		chars += (p - path);
-	}
-
-	(void)printf("\nDatabase: %s\n", path_fcodes);
-	(void)printf("Compression: Front: %2.2f%%, ",
-		     (size + big - (2 * NBG)) / (chars / (float)100));
-	(void)printf("Bigram: %2.2f%%, ", (size - big) / (size / (float)100));
-	(void)printf("Total: %2.2f%%\n", 
-		     (size - (2 * NBG)) / (chars / (float)100));
-	(void)printf("Filenames: %d, ", lines);
-	(void)printf("Characters: %d, ", chars);
-	(void)printf("Database size: %d\n", size);
-	(void)printf("Bigram characters: %d, ", big);
-	(void)printf("Integers: %d, ", zwerg);
-	(void)printf("8-Bit characters: %d\n", umlaut);
-
-}
-#endif /* _LOCATE_STATISTIC_ */
-
-extern	char	separator;
-
-void
-#ifdef FF_MMAP
-
-
-#ifdef FF_ICASE
-fastfind_mmap_icase
-#else
-fastfind_mmap
-#endif /* FF_ICASE */
-(pathpart, paddr, len, database)
-	char *pathpart; 	/* search string */
-	caddr_t paddr;  	/* mmap pointer */
-	int len;        	/* length of database */
-	char *database; 	/* for error message */
-
-
-#else /* MMAP */
-
-
-#ifdef FF_ICASE
-fastfind_icase
-#else
-fastfind
-#endif /* FF_ICASE */
-
-(fp, pathpart, database)
-	FILE *fp;               /* open database */
-	char *pathpart;		/* search string */
-	char *database;		/* for error message */
-
-
-#endif /* MMAP */
-
-{
-	register u_char *p, *s, *patend, *q, *foundchar;
-	register int c, cc;
-	int count, found, globflag;
-	u_char *cutoff;
-	u_char bigram1[NBG], bigram2[NBG], path[MAXPATHLEN];
-
-#ifdef FF_ICASE
-	/* use a lookup table for case insensitive search */
-	u_char table[UCHAR_MAX + 1];
-
-	tolower_word(pathpart);
-#endif /* FF_ICASE*/
-
-	/* init bigram table */
-#ifdef FF_MMAP
-	if (len < (2*NBG))
-		errx(1, "database too small: %s", database);
-	
-	for (c = 0, p = bigram1, s = bigram2; c < NBG; c++, len-= 2) {
-		p[c] = check_bigram_char(*paddr++);
-		s[c] = check_bigram_char(*paddr++);
-	}
-#else
-	for (c = 0, p = bigram1, s = bigram2; c < NBG; c++) {
-		p[c] = check_bigram_char(getc(fp));
-		s[c] = check_bigram_char(getc(fp));
-	}
-#endif /* FF_MMAP */
-
-	/* find optimal (last) char for searching */
-	for (p = pathpart; *p != '\0'; p++)
-		if (index(LOCATE_REG, *p) != NULL)
-			break;
-
-	if (*p == '\0')
-		globflag = 0;
-	else
-		globflag = 1;
-
-	p = pathpart;
-	patend = patprep(p);
-	cc = *patend;
-
-#ifdef FF_ICASE
-	/* set patend char to true */
-        for (c = 0; c < UCHAR_MAX + 1; c++)
-                table[c] = 0;
-
-	table[TOLOWER(*patend)] = 1;
-	table[toupper(*patend)] = 1;
-#endif /* FF_ICASE */
-
-
-	/* main loop */
-	found = count = 0;
-	foundchar = 0;
-
-#ifdef FF_MMAP
-	c = (u_char)*paddr++; len--;
-	for (; len > 0; ) {
-#else
-	c = getc(fp);
-	for (; c != EOF; ) {
-#endif /* FF_MMAP */
-
-		/* go forward or backward */
-		if (c == SWITCH) { /* big step, an integer */
-#ifdef FF_MMAP
-			count += getwm(paddr) - OFFSET;
-			len -= INTSIZE; paddr += INTSIZE;
-#else
-			count +=  getwf(fp) - OFFSET;
-#endif /* FF_MMAP */
-		} else {	   /* slow step, =< 14 chars */
-			count += c - OFFSET;
-		}
-
-		/* overlay old path */
-		p = path + count;
-		foundchar = p - 1;
-
-#ifdef FF_MMAP
-		for (; len > 0;) {
-			c = (u_char)*paddr++; 
-		        len--;
-#else
-		for (;;) {
-			c = getc(fp);
-#endif /* FF_MMAP */
-			/*
-			 * == UMLAUT: 8 bit char followed
-			 * <= SWITCH: offset
-			 * >= PARITY: bigram
-			 * rest:      single ascii char
-			 *
-			 * offset < SWITCH < UMLAUT < ascii < PARITY < bigram
-			 */
-			if (c < PARITY) {
-				if (c <= UMLAUT) {
-					if (c == UMLAUT) {
-#ifdef FF_MMAP
-						c = (u_char)*paddr++;
-						len--;
-#else
-						c = getc(fp);
-#endif /* FF_MMAP */
-						
-					} else
-						break; /* SWITCH */
-				}
-#ifdef FF_ICASE
-				if (table[c])
-#else
-				if (c == cc)
-#endif /* FF_ICASE */
-					foundchar = p;
-				*p++ = c;
-			}
-			else {		
-				/* bigrams are parity-marked */
-				TO7BIT(c);
-
-#ifndef FF_ICASE
-				if (bigram1[c] == cc ||
-				    bigram2[c] == cc)
-#else
-
-					if (table[bigram1[c]] ||
-					    table[bigram2[c]])
-#endif /* FF_ICASE */
-						foundchar = p + 1;
-
-				*p++ = bigram1[c];
-				*p++ = bigram2[c];
-			}
-		}
-		
-		if (found) {                     /* previous line matched */
-			cutoff = path;
-			*p-- = '\0';
-			foundchar = p;
-		} else if (foundchar >= path + count) { /* a char matched */
-			*p-- = '\0';
-			cutoff = path + count;
-		} else                           /* nothing to do */
-			continue;
-
-		found = 0;
-		for (s = foundchar; s >= cutoff; s--) {
-			if (*s == cc
-#ifdef FF_ICASE
-			    || TOLOWER(*s) == cc
-#endif /* FF_ICASE */
-			    ) {	/* fast first char check */
-				for (p = patend - 1, q = s - 1; *p != '\0';
-				     p--, q--)
-					if (*q != *p
-#ifdef FF_ICASE
-					    && TOLOWER(*q) != *p
-#endif /* FF_ICASE */
-					    )
-						break;
-				if (*p == '\0') {   /* fast match success */
-					found = 1;
-					if (!globflag || 
-#ifndef FF_ICASE
-					    !fnmatch(pathpart, path, 0)) 
-#else 
-					    !fnmatch(pathpart, path, 
-						     FNM_CASEFOLD))
-#endif /* !FF_ICASE */						
-					{
-						if (f_silent)
-							counter++;
-						else if (f_limit) {
-							counter++;
-							if (f_limit >= counter)
-								(void)printf("%s%c",path,separator);
-							else 
-								errx(0, "[show only %d lines]", counter - 1);
-						} else
-							(void)printf("%s%c",path,separator);
-					}
-					break;
-				}
-			}
-		}
-	}
-}
diff --git a/locate/locate/locate.1 b/locate/locate/locate.1
index 05c036e..8ebdbae 100644
--- a/locate/locate/locate.1
+++ b/locate/locate/locate.1
@@ -1,4 +1,5 @@
-.\" Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
+.\"	$NetBSD: locate.1,v 1.6 1998/08/08 14:49:23 hubertf Exp $
+.\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -31,182 +32,46 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)locate.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.bin/locate/locate/locate.1,v 1.34 2006/09/29 15:20:45 ru Exp $
 .\"
-.Dd August 17, 2006
+.Dd June 6, 1993
 .Dt LOCATE 1
-.Os
+.Os BSD 4.4
 .Sh NAME
 .Nm locate
-.Nd find filenames quickly
+.Nd find files
 .Sh SYNOPSIS
 .Nm
-.Op Fl 0Scims
-.Op Fl l Ar limit
-.Op Fl d Ar database
-.Ar pattern ...
+.Ar pattern
 .Sh DESCRIPTION
-The
 .Nm
-program searches a database for all pathnames which match the specified
-.Ar pattern .
-The database is recomputed periodically (usually weekly or daily),
-and contains the pathnames
+searches a database for all pathnames which match the specified
+.Ar pattern  .
+The database is recomputed periodically, and contains the pathnames
 of all files which are publicly accessible.
 .Pp
-Shell globbing and quoting characters
-.Dq ( * ,
-.Dq \&? ,
-.Dq \e ,
-.Dq \&[
-and
-.Dq \&] )
+Shell globbing and quoting characters (``*'', ``?'', ``\e'', ``[''
+and ``]'')
 may be used in
-.Ar pattern ,
+.Ar pattern  ,
 although they will have to be escaped from the shell.
-Preceding any character with a backslash
-.Pq Dq \e
-eliminates any special
+Preceding any character with a backslash (``\e'') eliminates any special
 meaning which it may have.
 The matching differs in that no characters must be matched explicitly,
-including slashes
-.Pq Dq / .
-.Pp
-As a special case, a pattern containing no globbing characters
-.Pq Dq foo
-is matched as though it were
-.Dq *foo* .
-.Pp
-Historically, locate only stored characters between 32 and 127.
-The
-current implementation store any character except newline
-.Pq Sq \en
-and
-.Dv NUL
-.Pq Sq \e0 .
-The 8-bit character support does not waste extra space for
-plain ASCII file names.
-Characters less than 32 or greater than 127
-are stored in 2 bytes.
-.Pp
-The following options are available:
-.Bl -tag -width 10n
-.It Fl 0
-Print pathnames separated by an
-.Tn ASCII
-.Dv NUL
-character (character code 0) instead of default NL
-(newline, character code 10).
-.It Fl S
-Print some statistics about the database and exit.
-.It Fl c
-Suppress normal output; instead print a count of matching file names.
-.It Fl d Ar database
-Search in
-.Ar database
-instead of the default file name database.
-Multiple
-.Fl d
-options are allowed.
-Each additional
-.Fl d
-option adds the specified database to the list
-of databases to be searched.
-.Pp
-The option
-.Ar database
-may be a colon-separated list of databases.
-A single colon is a reference
-to the default database.
-.Bd -literal
-$ locate -d $HOME/lib/mydb: foo
-.Ed
-.Pp
-will first search string
-.Dq foo
-in
-.Pa $HOME/lib/mydb
-and then in
-.Pa /var/db/locate.database .
-.Bd -literal
-$ locate -d $HOME/lib/mydb::/cdrom/locate.database foo
-.Ed
-.Pp
-will first search string
-.Dq foo
-in
-.Pa $HOME/lib/mydb
-and then in
-.Pa /var/db/locate.database
-and then in
-.Pa /cdrom/locate.database .
-.Pp
-.Dl "$ locate -d db1 -d db2 -d db3 pattern"
-.Pp
-is the same as
-.Pp
-.Dl "$ locate -d db1:db2:db3 pattern"
-.Pp
-or
-.Pp
-.Dl "$ locate -d db1:db2 -d db3 pattern"
-.Pp
-If
-.Fl
-is given as the database name, standard input will be read instead.
-For example, you can compress your database
-and use:
-.Bd -literal
-$ zcat database.gz | locate -d - pattern
-.Ed
+including slashes (``/'').
 .Pp
-This might be useful on machines with a fast CPU and little RAM and slow
-I/O.
-Note: you can only use
-.Em one
-pattern for stdin.
-.It Fl i
-Ignore case distinctions in both the pattern and the database.
-.It Fl l Ar number
-Limit output to
-.Ar number
-of file names and exit.
-.It Fl m
-Use
-.Xr mmap 2
-instead of the
-.Xr stdio 3
-library.
-This is the default behavior
-and is faster in most cases.
-.It Fl s
-Use the
-.Xr stdio 3
-library instead of
-.Xr mmap 2 .
-.El
-.Sh ENVIRONMENT
-.Bl -tag -width LOCATE_PATH -compact
-.It Pa LOCATE_PATH
-path to the locate database if set and not empty, ignored if the
-.Fl d
-option was specified.
-.El
+As a special case, a pattern containing no globbing characters (``foo'')
+is matched as though it were ``*foo*''.
 .Sh FILES
-.Bl -tag -width /etc/periodic/weekly/310.locate -compact
+.Bl -tag -width /usr/libexec/locate.updatedb -compact
 .It Pa /var/db/locate.database
-locate database
-.It Pa /usr/libexec/locate.updatedb
-Script to update the locate database
-.It Pa /etc/periodic/weekly/310.locate
-Script that starts the database rebuild
+Database
+.It /usr/libexec/locate.updatedb
+Script to update database.
 .El
 .Sh SEE ALSO
 .Xr find 1 ,
-.Xr whereis 1 ,
-.Xr which 1 ,
 .Xr fnmatch 3 ,
-.Xr locate.updatedb 8
+.Xr weekly.conf 5
 .Rs
 .%A Woods, James A.
 .%D 1983
@@ -218,59 +83,5 @@ Script that starts the database rebuild
 .Sh HISTORY
 The
 .Nm
-command first appeared in
+command appears in
 .Bx 4.4 .
-Many new features were
-added in
-.Fx 2.2 .
-.Sh BUGS
-The
-.Nm
-program may fail to list some files that are present, or may
-list files that have been removed from the system.
-This is because
-locate only reports files that are present in the database, which is
-typically only regenerated once a week by the
-.Pa /etc/periodic/weekly/310.locate
-script.
-Use
-.Xr find 1
-to locate files that are of a more transitory nature.
-.Pp
-The
-.Nm
-database is typically built by user
-.Dq nobody
-and the
-.Xr locate.updatedb 8
-utility skips directories
-which are not readable for user
-.Dq nobody ,
-group
-.Dq nobody ,
-or
-world.
-For example, if your HOME directory is not world-readable,
-.Em none
-of your files are
-in the database.
-.Pp
-The
-.Nm
-database is not byte order independent.
-It is not possible
-to share the databases between machines with different byte order.
-The current
-.Nm
-implementation understands databases in host byte order or
-network byte order if both architectures use the same integer size.
-So on a
-.Fx Ns /i386
-machine
-(little endian), you can read
-a locate database which was built on SunOS/sparc machine
-(big endian, net).
-.Pp
-The
-.Nm
-utility does not recognize multibyte characters.
diff --git a/locate/locate/locate.c b/locate/locate/locate.c
index bad3e34..67e3567 100644
--- a/locate/locate/locate.c
+++ b/locate/locate/locate.c
@@ -1,7 +1,8 @@
+/*	$NetBSD: locate.c,v 1.8 1997/10/19 04:11:56 lukem Exp $	*/
+
 /*
- * Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
  * Copyright (c) 1989, 1993
- *      The Regents of the University of California.  All rights reserved.
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * James A. Woods.
@@ -16,8 +17,8 @@
  *    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.
+ *	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.
@@ -35,19 +36,17 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1995-1996 Wolfram Schneider, Berlin.\n\
-@(#) Copyright (c) 1989, 1993\n\
-        The Regents of the University of California.  All rights reserved.\n";
+__COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n");
 #endif /* not lint */
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)locate.c    8.1 (Berkeley) 6/6/93";
+static char sccsid[] = "@(#)locate.c	8.1 (Berkeley) 6/6/93";
 #endif
-static const char rcsid[] =
-  "$FreeBSD: src/usr.bin/locate/locate/locate.c,v 1.17 2006/06/11 17:40:25 maxim Exp $";
+__RCSID("$NetBSD: locate.c,v 1.8 1997/10/19 04:11:56 lukem Exp $");
 #endif /* not lint */
 
 /*
@@ -60,11 +59,10 @@ static const char rcsid[] =
  *
  * The codes are:
  *
- *      0-28    likeliest differential counts + offset to make nonnegative
- *      30      switch code for out-of-range count to follow in next word
- *      31      an 8 bit char followed
- *      128-255 bigram codes (128 most common, as determined by 'updatedb')
- *      32-127  single character (printable) ascii residue (ie, literal)
+ * 	0-28	likeliest differential counts + offset to make nonnegative
+ *	30	switch code for out-of-range count to follow in next word
+ *	128-255 bigram codes (128 most common, as determined by 'updatedb')
+ *	32-127  single character (printable) ascii residue (ie, literal)
  *
  * A novel two-tiered string search technique is employed:
  *
@@ -79,289 +77,131 @@ static const char rcsid[] =
  */
 
 #include <sys/param.h>
-#include <ctype.h>
-#include <err.h>
+
 #include <fnmatch.h>
-#include <locale.h>
+#include <unistd.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-
-#ifdef MMAP
-#  include <sys/types.h>
-#  include <sys/stat.h>
-#  include <sys/mman.h>
-#  include <fcntl.h>
-#endif
-
+#include <stdlib.h>
 
 #include "locate.h"
 #include "pathnames.h"
 
-#ifdef DEBUG
-#  include <sys/time.h>
-#  include <sys/types.h>
-#  include <sys/resource.h>
-#endif
-
-int f_mmap;             /* use mmap */
-int f_icase;            /* ignore case */
-int f_stdin;            /* read database from stdin */
-int f_statistic;        /* print statistic */
-int f_silent;           /* suppress output, show only count of matches */
-int f_limit;            /* limit number of output lines, 0 == infinite */
-u_int counter;          /* counter for matches [-c] */
-char separator='\n';	/* line separator */
-#ifdef __APPLE__
-u_char myctype[UCHAR_MAX + 1];
-#endif /* __APPLE__ */
-
+void	fastfind __P((char *));
+int	main __P((int, char **));
+char   *patprep __P((char *));
 
-void    usage(void);
-void    statistic(FILE *, char *);
-void    fastfind(FILE *, char *, char *);
-void    fastfind_icase(FILE *, char *, char *);
-void    fastfind_mmap(char *, caddr_t, int, char *);
-void    fastfind_mmap_icase(char *, caddr_t, int, char *);
-void	search_mmap(char *, char **);
-void	search_fopen(char *, char **);
-unsigned long cputime(void);
-
-extern char     **colon(char **, char*, char*);
-extern void     print_matches(u_int);
-extern int      getwm(caddr_t);
-extern int      getwf(FILE *);
-extern u_char   *tolower_word(u_char *);
-extern int	check_bigram_char(int);
-extern char 	*patprep(char *);
+FILE *fp;
 
 int
 main(argc, argv)
-        int argc;
-        char **argv;
+	int argc;
+	char *argv[];
 {
-        register int ch;
-        char **dbv = NULL;
-	char *path_fcodes;      /* locate database */
-#ifdef MMAP
-        f_mmap = 1;		/* mmap is default */
-#endif
-	(void) setlocale(LC_ALL, "");
-
-        while ((ch = getopt(argc, argv, "0Scd:il:ms")) != -1)
-                switch(ch) {
-                case '0':	/* 'find -print0' style */
-			separator = '\0';
-			break;
-                case 'S':	/* statistic lines */   
-                        f_statistic = 1;
-                        break;
-                case 'l': /* limit number of output lines, 0 == infinite */
-                        f_limit = atoi(optarg);
-                        break;
-                case 'd':	/* database */
-                        dbv = colon(dbv, optarg, _PATH_FCODES);
-                        break;
-                case 'i':	/* ignore case */
-                        f_icase = 1;
-                        break;
-                case 'm':	/* mmap */
-#ifdef MMAP
-                        f_mmap = 1;
-#else
-						warnx("mmap(2) not implemented");
-#endif
-                        break;
-                case 's':	/* stdio lib */
-                        f_mmap = 0;
-                        break;
-                case 'c': /* suppress output, show only count of matches */
-                        f_silent = 1;
-                        break;
-                default:
-                        usage();
-                }
-        argv += optind;
-        argc -= optind;
-
-        /* to few arguments */
-        if (argc < 1 && !(f_statistic))
-                usage();
-
-        /* no (valid) database as argument */
-        if (dbv == NULL || *dbv == NULL) {
-                /* try to read database from enviroment */
-                if ((path_fcodes = getenv("LOCATE_PATH")) == NULL ||
-		     *path_fcodes == '\0')
-                        /* use default database */
-                        dbv = colon(dbv, _PATH_FCODES, _PATH_FCODES);
-                else		/* $LOCATE_PATH */
-                        dbv = colon(dbv, path_fcodes, _PATH_FCODES);
-        }
-
-        if (f_icase && UCHAR_MAX < 4096) /* init tolower lookup table */
-                for (ch = 0; ch < UCHAR_MAX + 1; ch++)
-                        myctype[ch] = tolower(ch);
-
-        /* foreach database ... */
-        while((path_fcodes = *dbv) != NULL) {
-                dbv++;
-
-                if (!strcmp(path_fcodes, "-"))
-                        f_stdin = 1;
-		else
-			f_stdin = 0;
-
-#ifndef MMAP
-		f_mmap = 0;	/* be paranoid */
-#endif
-                if (!f_mmap || f_stdin || f_statistic) 
-			search_fopen(path_fcodes, argv);
-                else 
-			search_mmap(path_fcodes, argv);
-        }
-
-        if (f_silent)
-                print_matches(counter);
-        exit(0);
-}
-
-
-void
-search_fopen(db, s)
-	char *db; /* database */
-	char **s; /* search strings */
-{
-	FILE *fp;
-#ifdef DEBUG
-        long t0;
-#endif
-	       
-	/* can only read stdin once */
-	if (f_stdin) { 
-		fp = stdin;
-		if (*(s+1) != NULL) {
-			warnx("read database from stdin, use only `%s' as pattern", *s);
-			*(s+1) = NULL;
-		}
-	} 
-	else if ((fp = fopen(db, "r")) == NULL)
-		err(1,  "`%s'", db);
-
-	/* count only chars or lines */
-	if (f_statistic) {
-		statistic(fp, db);
-		(void)fclose(fp);
-		return;
+	if (argc != 2) {
+		(void)fprintf(stderr, "usage: locate pattern\n");
+		exit(1);
 	}
+	if (!(fp = fopen(_PATH_FCODES, "r"))) {
+		(void)fprintf(stderr, "locate: no database file %s.\n",
+		    _PATH_FCODES);
+		exit(1);
+	}
+	while (*++argv)
+		fastfind(*argv);
+	exit(0);
+}
 
-	/* foreach search string ... */
-	while(*s != NULL) {
-#ifdef DEBUG
-		t0 = cputime();
-#endif
-		if (!f_stdin &&
-		    fseek(fp, (long)0, SEEK_SET) == -1)
-			err(1, "fseek to begin of ``%s''\n", db);
-
-		if (f_icase)
-			fastfind_icase(fp, *s, db);
-		else
-			fastfind(fp, *s, db);
-#ifdef DEBUG
-		warnx("fastfind %ld ms", cputime () - t0);
-#endif
-		s++;
-	} 
-	(void)fclose(fp);
-} 
-
-#ifdef MMAP
 void
-search_mmap(db, s)
-	char *db; /* database */
-	char **s; /* search strings */
+fastfind(pathpart)
+	char *pathpart;
 {
-        struct stat sb;
-        int fd;
-        caddr_t p;
-        off_t len;
-#ifdef DEBUG
-        long t0;
-#endif
-	if ((fd = open(db, O_RDONLY)) == -1 ||
-	    fstat(fd, &sb) == -1)
-		err(1, "`%s'", db);
-	len = sb.st_size;
-
-	if ((p = mmap((caddr_t)0, (size_t)len,
-		      PROT_READ, MAP_SHARED,
-		      fd, (off_t)0)) == MAP_FAILED)
-		err(1, "mmap ``%s''", db);
-
-	/* foreach search string ... */
-	while (*s != NULL) {
-#ifdef DEBUG
-		t0 = cputime();
-#endif
-		if (f_icase)
-			fastfind_mmap_icase(*s, p, (int)len, db);
-		else
-			fastfind_mmap(*s, p, (int)len, db);
-#ifdef DEBUG
-		warnx("fastfind %ld ms", cputime () - t0);
-#endif
-		s++;
+	char *p, *s;
+	int c;
+	int count, found, globflag;
+	char *cutoff, *patend, *q;
+	char bigram1[NBG], bigram2[NBG], path[MAXPATHLEN];
+
+	for (c = 0, p = bigram1, s = bigram2; c < NBG; c++)
+		p[c] = getc(fp), s[c] = getc(fp);
+
+	p = pathpart;
+	globflag = strchr(p, '*') || strchr(p, '?') || strchr(p, '[');
+	patend = patprep(p);
+
+	found = 0;
+	for (c = getc(fp), count = 0; c != EOF;) {
+		count += ((c == SWITCH) ? getw(fp) : c) - OFFSET;
+		/* overlay old path */
+		for (p = path + count; (c = getc(fp)) > SWITCH;)
+			if (c < PARITY)
+				*p++ = c;
+			else {		/* bigrams are parity-marked */
+				c &= PARITY - 1;
+				*p++ = bigram1[c], *p++ = bigram2[c];
+			}
+		*p-- = '\0';
+		cutoff = (found ? path : path + count);
+		for (found = 0, s = p; s >= cutoff; s--)
+			if (*s == *patend) {	/* fast first char check */
+				for (p = patend - 1, q = s - 1; *p != '\0';
+				    p--, q--)
+					if (*q != *p)
+						break;
+				if (*p == '\0') {	/* fast match success */
+					found = 1;
+					if (!globflag ||
+					    !fnmatch(pathpart, path, 0))
+						(void)printf("%s\n", path);
+					break;
+				}
+			}
 	}
-
-	if (munmap(p, (size_t)len) == -1)
-		warn("munmap %s\n", db);
-	
-	(void)close(fd);
 }
-#endif /* MMAP */
-
-#ifdef DEBUG
-unsigned long
-cputime ()
-{
-	struct rusage rus;
 
-	getrusage(0, &rus);
-	return(rus.ru_utime.tv_sec * 1000 + rus.ru_utime.tv_usec / 1000);
-}
-#endif /* DEBUG */
+/*
+ * extract last glob-free subpattern in name for fast pre-match; prepend
+ * '\0' for backwards match; return end of new pattern
+ */
+static char globfree[100];
 
-void
-usage ()
+char *
+patprep(name)
+	char *name;
 {
-        (void)fprintf(stderr,
-	"usage: locate [-0Scims] [-l limit] [-d database] pattern ...\n\n");
-        (void)fprintf(stderr,
-	"default database: `%s' or $LOCATE_PATH\n", _PATH_FCODES);
-        exit(1);
+	char *endmark, *p, *subp;
+
+	subp = globfree;
+	*subp++ = '\0';
+	p = name + strlen(name) - 1;
+	/* skip trailing metacharacters (and [] ranges) */
+	for (; p >= name; p--)
+		if (strchr("*?", *p) == 0)
+			break;
+	if (p < name)
+		p = name;
+	if (*p == ']')
+		for (p--; p >= name; p--)
+			if (*p == '[') {
+				p--;
+				break;
+			}
+	if (p < name)
+		p = name;
+	/*
+	 * if pattern has only metacharacters, check every path (force '/'
+	 * search)
+	 */
+	if ((p == name) && strchr("?*[]", *p) != 0)
+		*subp++ = '/';
+	else {
+		for (endmark = p; p >= name; p--)
+			if (strchr("]*?", *p) != 0)
+				break;
+		for (++p;
+		    (p <= endmark) && subp < (globfree + sizeof(globfree));)
+			*subp++ = *p++;
+	}
+	*subp = '\0';
+	return(--subp);
 }
-
-
-/* load fastfind functions */
-
-/* statistic */
-/* fastfind_mmap, fastfind_mmap_icase */
-#ifdef MMAP
-#undef FF_MMAP
-#undef FF_ICASE
-
-#define FF_MMAP
-#include "fastfind.c"
-#define FF_ICASE
-#include "fastfind.c"
-#endif /* MMAP */
-
-/* fopen */
-/* fastfind, fastfind_icase */
-#undef FF_MMAP
-#undef FF_ICASE
-#include "fastfind.c"
-#define FF_ICASE
-#include "fastfind.c"
diff --git a/locate/locate/locate.h b/locate/locate/locate.h
index d4aef46..467c2cb 100644
--- a/locate/locate/locate.h
+++ b/locate/locate/locate.h
@@ -1,5 +1,6 @@
+/*	$NetBSD: locate.h,v 1.3 1994/12/22 06:17:48 jtc Exp $	*/
+
 /*
- * Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -32,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)locate.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD: src/usr.bin/locate/locate/locate.h,v 1.7 1999/08/28 01:02:59 peter Exp $
  */
 
 /* Symbolic constants shared by locate.c and code.c */
@@ -41,36 +41,3 @@
 #define	OFFSET		14		/* abs value of max likely diff */
 #define	PARITY		0200		/* parity bit */
 #define	SWITCH		30		/* switch code */
-#define UMLAUT          31              /* an 8 bit char followed */
-
-/* 	0-28	likeliest differential counts + offset to make nonnegative */
-#define LDC_MIN         0
-#define LDC_MAX        28
-
-/*	128-255 bigram codes (128 most common, as determined by 'updatedb') */
-#define BIGRAM_MIN    (UCHAR_MAX - CHAR_MAX) 
-#define BIGRAM_MAX    UCHAR_MAX
-
-/*	32-127  single character (printable) ascii residue (ie, literal) */
-#define ASCII_MIN      32
-#define ASCII_MAX     CHAR_MAX
-
-/* #define TO7BIT(x)     (x = ( ((u_char)x) & CHAR_MAX )) */
-#define TO7BIT(x)     (x = x & CHAR_MAX )
-
-
-#if UCHAR_MAX >= 4096
-   define TOLOWER(ch)	  tolower(ch)
-#else
-
-#ifdef __APPLE__
-extern u_char myctype[UCHAR_MAX + 1];
-#else
-u_char myctype[UCHAR_MAX + 1];
-#endif
-#define TOLOWER(ch)	(myctype[ch])
-#endif
-
-#define INTSIZE (sizeof(int))
-
-#define LOCATE_REG "*?[]\\"  /* fnmatch(3) meta characters */
diff --git a/locate/locate/locate.rc b/locate/locate/locate.rc
deleted file mode 100644
index fdf099b..0000000
--- a/locate/locate/locate.rc
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# /etc/locate.rc -  command script for updatedb(8)
-#
-# $FreeBSD: src/usr.bin/locate/locate/locate.rc,v 1.9 2005/08/22 08:22:48 cperciva Exp $
-
-#
-# All commented values are the defaults
-#
-# temp directory
-#TMPDIR="/tmp"
-
-# the actual database
-#FCODES="/var/db/locate.database"
-
-# directories to be put in the database
-#SEARCHPATHS="/"
-
-# directories unwanted in output
-#PRUNEPATHS="/tmp /var/tmp"
-
-# filesystems allowed. Beware: a non-listed filesystem will be pruned
-# and if the SEARCHPATHS starts in such a filesystem locate will build
-# an empty database.
-#
-# be careful if you add 'nfs'
-#FILESYSTEMS="hfs ufs"
diff --git a/locate/locate/locate.updatedb.8 b/locate/locate/locate.updatedb.8
index 12db435..7408d0f 100755
--- a/locate/locate/locate.updatedb.8
+++ b/locate/locate/locate.updatedb.8
@@ -1,3 +1,5 @@
+.\"	$OpenBSD: locate.updatedb.8,v 1.3 1997/01/04 01:36:01 millert Exp $
+.\"
 .\" Copyright (c) 1996
 .\"	Mike Pritchard <mpp@FreeBSD.org>.  All rights reserved.
 .\"
@@ -28,32 +30,46 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.bin/locate/locate/locate.updatedb.8,v 1.12 2005/01/18 13:43:50 ru Exp $
-.\"
 .Dd February 11, 1996
 .Dt LOCATE.UPDATEDB 8
-.Os
+.Os BSD 4.4
 .Sh NAME
 .Nm locate.updatedb
 .Nd update locate database
 .Sh SYNOPSIS
 .Nm /usr/libexec/locate.updatedb
+.Op Fl --tmpdir=dir
+.Op Fl --fcodes=dbfile
+.Op Fl --searchpaths='dir1 dir2...'
+.Op Fl --prunepaths='dir1 dir2...'
+.Op Fl --filesystems='type1 type2...'
 .Sh DESCRIPTION
-The
-.Nm
-utility updates the database used by
+.Nm Locate.updatedb
+updates the database used by
 .Xr locate 1 .
 It is typically run once a week by the
-.Pa /etc/periodic/weekly/310.locate
+.Pa /etc/weekly
 script.
 .Pp
 The contents of the newly built database can be controlled by the
 .Pa /etc/locate.rc
-file.
-.Sh ENVIRONMENT
-.Bl -tag -width /var/db/locate.database -compact
-.It Pa LOCATE_CONFIG
-path to the configuration file
+file as well as the command line arguments.
+.Sh OPTIONS
+.Bl -tag -width --filesystems
+The available options are as follows:
+.It Fl --tmpdir
+Sets the directory temporary files are stored in.
+.It Fl --fcodes
+Use the named file as the find codes database.  If the file
+name ``-'' is given, the database will be sent to standard output.
+.It Fl --searchpaths
+Sets the list of directories to be put in the database.
+.It Fl --prunepaths
+Sets the list of parent directories that should not be go in
+the database.
+.It Fl --filesystems
+A list of filesystem types to be traversed by
+.Xr find 1 .
 .El
 .Sh FILES
 .Bl -tag -width /var/db/locate.database -compact
@@ -63,8 +79,7 @@ the default database
 the configuration file
 .El
 .Sh SEE ALSO
-.Xr locate 1 ,
-.Xr periodic 8
+.Xr locate 1
 .Rs
 .%A Woods, James A.
 .%D 1983
diff --git a/locate/locate/mklocatedb.sh b/locate/locate/mklocatedb.sh
deleted file mode 100644
index 7231eba..0000000
--- a/locate/locate/mklocatedb.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) September 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
-# All rights reserved.
-#
-# 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.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
-#
-# mklocatedb - build locate database
-# 
-# usage: mklocatedb [-presort] < filelist > database
-#
-# $FreeBSD: src/usr.bin/locate/locate/mklocatedb.sh,v 1.13 2002/07/22 05:35:59 tjr Exp $
-
-# The directory containing locate subprograms
-: ${LIBEXECDIR:=/usr/libexec}; export LIBEXECDIR
-
-PATH=$LIBEXECDIR:/bin:/usr/bin:$PATH; export PATH
-
-umask 077			# protect temp files
-
-: ${TMPDIR:=/tmp}; export TMPDIR
-test -d "$TMPDIR" || TMPDIR=/tmp
-if ! TMPDIR=`mktemp -d $TMPDIR/mklocateXXXXXXXXXX`; then
-	exit 1
-fi
-
-
-# utilities to built locate database
-: ${bigram:=locate.bigram}
-: ${code:=locate.code}
-: ${sort:=sort}
-
-
-sortopt="-u -T $TMPDIR"
-sortcmd=$sort
-
-
-bigrams=$TMPDIR/_mklocatedb$$.bigrams
-filelist=$TMPDIR/_mklocatedb$$.list
-
-trap 'rm -f $bigrams $filelist; rmdir $TMPDIR' 0 1 2 3 5 10 15
-
-
-# Input already sorted
-if [ X"$1" = "X-presort" ]; then
-    shift; 
-
-    # create an empty file
-    true > $bigrams
-    
-    # Locate database bootstrapping
-    # 1. first build a temp database without bigram compression
-    # 2. create the bigram from the temp database
-    # 3. create the real locate database with bigram compression.
-    #
-    # This scheme avoid large temporary files in /tmp
-
-    $code $bigrams > $filelist || exit 1
-    locate -d $filelist / | $bigram | $sort -nr | head -128 |
-    awk '{if (/^[ 	]*[0-9]+[ 	]+..$/) {printf("%s",$2)} else {exit 1}}' > $bigrams || exit 1
-    locate -d $filelist / | $code $bigrams || exit 1
-    exit 	
-
-else
-    if $sortcmd $sortopt > $filelist; then
-        $bigram < $filelist | $sort -nr | 
-	awk '{if (/^[ 	]*[0-9]+[ 	]+..$/) {printf("%s",$2)} else {exit 1}}' > $bigrams || exit 1
-        $code $bigrams < $filelist || exit 1
-    else
-        echo "`basename $0`: cannot build locate database" >&2
-        exit 1
-    fi
-fi
diff --git a/locate/locate/pathnames.h b/locate/locate/pathnames.h
index 8fb0e8c..8021ffe 100644
--- a/locate/locate/pathnames.h
+++ b/locate/locate/pathnames.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: pathnames.h,v 1.3 1994/12/22 06:17:49 jtc Exp $	*/
+
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/locate/locate/updatedb.csh b/locate/locate/updatedb.csh
new file mode 100644
index 0000000..8347169
--- /dev/null
+++ b/locate/locate/updatedb.csh
@@ -0,0 +1,81 @@
+#!/bin/csh -f
+#
+#	$NetBSD: updatedb.csh,v 1.7 1995/08/31 22:36:35 jtc Exp $
+#
+# 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.4 (Berkeley) 10/27/94
+#
+
+set SRCHPATHS = "/"			# directories to be put in the database
+set LIBDIR = /usr/libexec		# for subprograms
+					# for temp files
+if (! $?TMPDIR) setenv TMPDIR /tmp
+if (! $?DBDIR) setenv DBDIR /var/db
+set FCODES = $DBDIR/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 local -o -fstype fdesc -o -fstype devfs \) -a \
+		-prune -o -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
diff --git a/locate/locate/updatedb.sh b/locate/locate/updatedb.sh
deleted file mode 100644
index 22f2f33..0000000
--- a/locate/locate/updatedb.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) September 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
-# All rights reserved.
-#
-# 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.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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 - update locate database for local mounted filesystems
-#
-# $FreeBSD: src/usr.bin/locate/locate/updatedb.sh,v 1.20 2005/11/12 12:45:08 grog Exp $
-
-if [ "$(id -u)" = "0" ]; then
-	echo ">>> WARNING" 1>&2
-	echo ">>> Executing updatedb as root.  This WILL reveal all filenames" 1>&2
-	echo ">>> on your machine to all login users, which is a security risk." 1>&2
-fi
-: ${LOCATE_CONFIG="/etc/locate.rc"}
-if [ -f "$LOCATE_CONFIG" -a -r "$LOCATE_CONFIG" ]; then
-       . $LOCATE_CONFIG
-fi
-
-# The directory containing locate subprograms
-: ${LIBEXECDIR:=/usr/libexec}; export LIBEXECDIR
-: ${TMPDIR:=/tmp}; export TMPDIR
-if ! TMPDIR=`mktemp -d $TMPDIR/locateXXXXXXXXXX`; then
-	exit 1
-fi
-
-PATH=$LIBEXECDIR:/bin:/usr/bin:$PATH; export PATH
-
-
-: ${mklocatedb:=locate.mklocatedb}	 # make locate database program
-: ${FCODES:=/var/db/locate.database}	 # the database
-: ${SEARCHPATHS:="/"}		# directories to be put in the database
-: ${PRUNEPATHS:="/tmp /var/tmp"} # unwanted directories
-: ${FILESYSTEMS:="hfs ufs"}			 # allowed filesystems 
-: ${find:=find}
-
-case X"$SEARCHPATHS" in 
-	X) echo "$0: empty variable SEARCHPATHS"; exit 1;; esac
-case X"$FILESYSTEMS" in 
-	X) echo "$0: empty variable FILESYSTEMS"; exit 1;; esac
-
-# Make a list a paths to exclude in the locate run
-excludes="! (" or=""
-for fstype in $FILESYSTEMS
-do
-       excludes="$excludes $or -fstype $fstype"
-       or="-or"
-done
-excludes="$excludes ) -prune"
-
-case X"$PRUNEPATHS" in
-	X) ;;
-	*) for path in $PRUNEPATHS
-           do 
-		excludes="$excludes -or -path $path -prune"
-	   done;;
-esac
-
-tmp=$TMPDIR/_updatedb$$
-trap 'rm -f $tmp; rmdir $TMPDIR; exit' 0 1 2 3 5 10 15
-		
-# search locally
-# echo $find $SEARCHPATHS $excludes -or -print && exit
-if $find -s $SEARCHPATHS $excludes -or -print 2>/dev/null |
-        $mklocatedb -presort > $tmp
-then
-	case X"`$find $tmp -size -257c -print`" in
-		X) cat $tmp > $FCODES;;
-		*) echo "updatedb: locate database $tmp is empty"
-		   exit 1
-	esac
-fi
diff --git a/locate/locate/util.c b/locate/locate/util.c
deleted file mode 100644
index 0a94c9c..0000000
--- a/locate/locate/util.c
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
- * 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.
- *
- * $FreeBSD: src/usr.bin/locate/locate/util.c,v 1.10 2002/06/24 12:40:11 naddy Exp $
- */
-
-
-#include <stdlib.h>
-#include <string.h>
-#include <err.h>
-#include <sys/param.h>
-#include <arpa/inet.h>
-#include <stdio.h>
-
-#include "locate.h"
-
-char 	**colon(char **, char*, char*);
-char 	*patprep(char *);
-void print_matches(u_int);
-u_char 	*tolower_word(u_char *);
-int 	getwm(caddr_t);
-int 	getwf(FILE *);
-int	check_bigram_char(int);
-
-/* 
- * Validate bigram chars. If the test failed the database is corrupt 
- * or the database is obviously not a locate database.
- */
-int
-check_bigram_char(ch)
-	int ch;
-{
-	/* legal bigram: 0, ASCII_MIN ... ASCII_MAX */
-	if (ch == 0 ||
-	    (ch >= ASCII_MIN && ch <= ASCII_MAX))
-		return(ch);
-
-	errx(1,
-		"locate database header corrupt, bigram char outside 0, %d-%d: %d",  
-		ASCII_MIN, ASCII_MAX, ch);
-	exit(1);
-}
-
-/* split a colon separated string into a char vector
- *
- * "bla:foo" -> {"foo", "bla"}
- * "bla:"    -> {"foo", dot}
- * "bla"     -> {"bla"}
- * ""	     -> do nothing
- *
- */
-char **
-colon(dbv, path, dot)
-	char **dbv;
-	char *path;
-	char *dot; /* default for single ':' */
-{
-	int vlen, slen;
-	char *c, *ch, *p;
-	char **pv;
-
-	if (dbv == NULL) {
-		if ((dbv = malloc(sizeof(char **))) == NULL)
-			err(1, "malloc");
-		*dbv = NULL;
-	}
-
-	/* empty string */
-	if (*path == '\0') {
-		warnx("empty database name, ignored");
-		return(dbv);
-	}
-
-	/* length of string vector */
-	for(vlen = 0, pv = dbv; *pv != NULL; pv++, vlen++);
-
-	for (ch = c = path; ; ch++) {
-		if (*ch == ':' ||
-		    (!*ch && !(*(ch - 1) == ':' && ch == 1+ path))) {
-			/* single colon -> dot */
-			if (ch == c)
-				p = dot;
-			else {
-				/* a string */
-				slen = ch - c;
-				if ((p = malloc(sizeof(char) * (slen + 1))) 
-				    == NULL)
-					err(1, "malloc");
-				bcopy(c, p, slen);
-				*(p + slen) = '\0';
-			}
-			/* increase dbv with element p */
-			if ((dbv = realloc(dbv, sizeof(char **) * (vlen + 2)))
-			    == NULL)
-				err(1, "realloc");
-			*(dbv + vlen) = p;
-			*(dbv + ++vlen) = NULL;
-			c = ch + 1;
-		}
-		if (*ch == '\0')
-			break;
-	}
-	return (dbv);
-}
-
-void 
-print_matches(counter)
-	u_int counter;
-{
-	(void)printf("%d\n", counter);
-}
-
-
-/*
- * extract last glob-free subpattern in name for fast pre-match; prepend
- * '\0' for backwards match; return end of new pattern
- */
-static char globfree[100];
-
-char *
-patprep(name)
-	char *name;
-{
-	register char *endmark, *p, *subp;
-
-	subp = globfree;
-	*subp++ = '\0';   /* set first element to '\0' */
-	p = name + strlen(name) - 1;
-
-	/* skip trailing metacharacters */
-	for (; p >= name; p--)
-		if (index(LOCATE_REG, *p) == NULL)
-			break;
-
-	/* 
-	 * check if maybe we are in a character class
-	 *
-	 * 'foo.[ch]'
-	 *        |----< p
-	 */
-	if (p >= name && 
-	    (index(p, '[') != NULL || index(p, ']') != NULL)) {
-		for (p = name; *p != '\0'; p++)
-			if (*p == ']' || *p == '[')
-				break;
-		p--;
-
-		/* 
-		 * cannot find a non-meta character, give up
-		 * '*\*[a-z]'
-		 *    |-------< p
-		 */
-		if (p >= name && index(LOCATE_REG, *p) != NULL)
-			p = name - 1;
-	}
-	
-	if (p < name) 			
-		/* only meta chars: "???", force '/' search */
-		*subp++ = '/';
-
-	else {
-		for (endmark = p; p >= name; p--)
-			if (index(LOCATE_REG, *p) != NULL)
-				break;
-		for (++p;
-		    (p <= endmark) && subp < (globfree + sizeof(globfree));)
-			*subp++ = *p++;
-	}
-	*subp = '\0';
-	return(--subp);
-}
-
-/* tolower word */
-u_char *
-tolower_word(word)
-	u_char *word;
-{
-	register u_char *p;
-
-	for(p = word; *p != '\0'; p++)
-		*p = TOLOWER(*p);
-
-	return(word);
-}
-
-
-/*
- * Read integer from mmap pointer. 
- * Essential a simple  ``return *(int *)p'' but avoid sigbus 
- * for integer alignment (SunOS 4.x, 5.x).
- *
- * Convert network byte order to host byte order if neccessary. 
- * So we can read on FreeBSD/i386 (little endian) a locate database
- * which was built on SunOS/sparc (big endian).
- */
-
-int 
-getwm(p)
-	caddr_t p;
-{
-	union {
-		char buf[INTSIZE];
-		int i;
-	} u;
-	register int i;
-
-	for (i = 0; i < INTSIZE; i++)
-		u.buf[i] = *p++;
-
-	i = u.i;
-
-	if (i > MAXPATHLEN || i < -(MAXPATHLEN)) {
-		i = ntohl(i);
-		if (i > MAXPATHLEN || i < -(MAXPATHLEN))
-			errx(1, "integer out of +-MAXPATHLEN (%d): %d",
-			    MAXPATHLEN, abs(i) < abs(htonl(i)) ? i : htonl(i));
-	}
-	return(i);
-}
-
-/*
- * Read integer from stream.
- *
- * Convert network byte order to host byte order if neccessary. 
- * So we can read on FreeBSD/i386 (little endian) a locate database
- * which was built on SunOS/sparc (big endian).
- */
-
-int
-getwf(fp)
-	FILE *fp;
-{
-	register int word;
-
-	word = getw(fp);
-
-	if (word > MAXPATHLEN || word < -(MAXPATHLEN)) {
-		word = ntohl(word);
-		if (word > MAXPATHLEN || word < -(MAXPATHLEN))
-			errx(1, "integer out of +-MAXPATHLEN (%d): %d",
-			    MAXPATHLEN, abs(word) < abs(htonl(word)) ? word :
-				htonl(word));
-	}
-	return(word);
-}
diff --git a/who/who.c b/who/who.c
index 8b26333..b700264 100644
--- a/who/who.c
+++ b/who/who.c
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD: src/usr.bin/who/who.c,v 1.20 2003/10/26 05:05:48 peter Exp $
 #include <timeconv.h>
 #include <unistd.h>
 #include <utmp.h>
+#include <utmpx.h>
 
 static void	heading(void);
 static void	process_utmp(FILE *);
@@ -69,6 +70,13 @@ static int	sflag;			/* Show name, line, time */
 static int	tflag;			/* time of change to system clock */
 static int	Tflag;			/* Show terminal state */
 static int	uflag;			/* Show idle time */
+#ifdef __APPLE__
+#include <get_compat.h>
+#else  /* !__APPLE__ */
+#define COMPAT_MODE(a,b) (1)
+#endif /* __APPLE__ */
+static int	unix2003_std;
+static struct utmpx *utx_db = NULL;
 
 int
 main(int argc, char *argv[])
@@ -80,6 +88,8 @@ main(int argc, char *argv[])
 
 	setlocale(LC_TIME, "");
 
+	unix2003_std = COMPAT_MODE("bin/who", "unix2003");
+
 	while ((ch = getopt(argc, argv, "abdHlmpqrstTu")) != -1) {
 		switch (ch) {
 
@@ -177,6 +187,9 @@ main(int argc, char *argv[])
 		}
 	}
 
+	if (utx_db) {
+		endutxent();	/* close db */
+	}
 	exit(0);
 }
 
@@ -199,6 +212,8 @@ heading(void)
 	printf("%-*s ", 12, "TIME");
 	if (uflag)
 		printf("IDLE  ");
+	if (unix2003_std && uflag && !Tflag)
+		printf("     PID ");
 	printf("%-*s", UT_HOSTSIZE, "FROM");
 	putchar('\n');
 }
@@ -212,6 +227,7 @@ row(struct utmp *ut)
 	static int d_first = -1;
 	struct tm *tm;
 	char state;
+	char login_pidstr[20];
 
 	if (d_first < 0)
 		d_first = (*nl_langinfo(D_MD_ORDER) == 'd');
@@ -226,6 +242,29 @@ row(struct utmp *ut)
 			    '+' : '-';
 			idle = time(NULL) - sb.st_mtime;
 		}
+		if (unix2003_std && !Tflag) {
+			/* uflag without Tflag */
+			struct utmpx * utx = NULL;
+			if (!utx_db) {
+				utx_db = getutxent(); /* just to open db */
+			}
+			if (utx_db) {
+				struct utmpx this_line;
+				setutxent();	/* reset db */
+				memset(&this_line, 0, sizeof(this_line));
+/*
+				strcpy(this_line.ut_user, ut->ut_name);
+*/
+				strcpy(this_line.ut_line, ut->ut_line);
+				utx = getutxline(&this_line);
+			}
+			if (utx) {
+				snprintf(login_pidstr,sizeof(login_pidstr),
+						"%8d",utx->ut_pid);
+			} else {
+				strcpy(login_pidstr,"       ?");
+			}
+		}
 	}
 
 	printf("%-*.*s ", UT_NAMESIZE, UT_NAMESIZE, ut->ut_name);
@@ -244,6 +283,9 @@ row(struct utmp *ut)
 			    (int)(idle / 60 % 60));
 		else
 			printf(" old  ");
+		if (unix2003_std && !Tflag) {
+			printf("%s ", login_pidstr);
+		}
 	}
 	if (*ut->ut_host != '\0')
 		printf("(%.*s)", UT_HOSTSIZE, ut->ut_host);
diff --git a/xargs/xargs.c b/xargs/xargs.c
index ed3eba7..a543261 100644
--- a/xargs/xargs.c
+++ b/xargs/xargs.c
@@ -66,6 +66,12 @@ __RCSID("$FreeBSD: src/usr.bin/xargs/xargs.c,v 1.41 2002/07/01 03:21:05 tjr Exp
 
 #include "pathnames.h"
 
+#ifdef __APPLE__
+#include <get_compat.h>
+#else
+#define COMPAT_MODE(a,b) (1)
+#endif /* __APPLE__ */
+
 static void	parse_input(int, char *[]);
 static void	prerun(int, char *[]);
 static int	prompt(void);
@@ -79,6 +85,8 @@ static char *argp, *bbp, *ebp, *inpline, *p, *replstr;
 static const char *eofstr;
 static int count, insingle, indouble, pflag, tflag, Rflag, rval, zflag;
 static int cnt, Iflag, jfound, Lflag, wasquoted, xflag;
+static int last_was_newline = 1;
+static int last_was_blank = 0;
 
 extern char **environ;
 
@@ -133,9 +141,16 @@ main(int argc, char *argv[])
 			break;
 		case 'L':
 			Lflag = atoi(optarg);
+			if (COMPAT_MODE("bin/xargs", "Unix2003")) {
+				nflag = 0; /* Override */
+				nargs = 5000;
+			}
 			break;
 		case 'n':
 			nflag = 1;
+			if (COMPAT_MODE("bin/xargs", "Unix2003")) {
+				Lflag = 0; /* Override */
+			}
 			if ((nargs = atoi(optarg)) <= 0)
 				errx(1, "illegal argument count");
 			break;
@@ -237,6 +252,7 @@ parse_input(int argc, char *argv[])
 {
 	int ch, foundeof;
 	char **avj;
+	int last_was_backslashed = 0;
 
 	foundeof = 0;
 
@@ -247,6 +263,7 @@ parse_input(int argc, char *argv[])
 			exit(rval);
 		goto arg1;
 	case ' ':
+		last_was_blank = 1;
 	case '\t':
 		/* Quotes escape tabs and spaces. */
 		if (insingle || indouble || zflag)
@@ -257,7 +274,19 @@ parse_input(int argc, char *argv[])
 			goto arg2;
 		goto addch;
 	case '\n':
-		count++;
+		if (COMPAT_MODE("bin/xargs", "Unix2003")) {
+			if (last_was_newline) {
+				/* don't count empty line */
+				break;
+			}
+			if (!last_was_blank ) {
+				/* only count if NOT continuation line */
+				count++;
+			} 
+		} else {
+			count++;
+		}
+		last_was_newline = 1;
 		if (zflag)
 			goto addch;
 
@@ -343,6 +372,7 @@ arg2:
 		wasquoted = 1;
 		break;
 	case '\\':
+		last_was_backslashed = 1;
 		if (zflag)
 			goto addch;
 		/* Backslash escapes anything, is escaped by quotes. */
@@ -374,6 +404,10 @@ addch:		if (p < ebp) {
 		*p++ = ch;
 		break;
 	}
+	if (ch != ' ')
+		last_was_blank = 0;
+	if (ch != '\n' || last_was_backslashed)
+		last_was_newline = 0;
 	return;
 }
 
-- 
2.45.2