Retire v1.81 sources and build instead from src/contrib/global sources. Reviewed by: jdp

3 files changed, 4 insertions, 539 deletions

diff --git a/usr.bin/global/btreeop/Makefile b/usr.bin/global/btreeop/Makefile
index c9e0409..3666c68 100644
--- a/usr.bin/global/btreeop/Makefile
+++ b/usr.bin/global/btreeop/Makefile
@@ -1,4 +1,7 @@
-#	@(#)Makefile	1.0 (Berkeley) 4/21/96
+# $Id: Makefile,v 1.3 1997/07/30 04:52:56 skynyrd Exp $
+
+GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
+.PATH:		${GLOBAL_DIR}/btreeop
 
 PROG=	btreeop
 
diff --git a/usr.bin/global/btreeop/btreeop.1 b/usr.bin/global/btreeop/btreeop.1
deleted file mode 100644
index 08bbf51..0000000
--- a/usr.bin/global/btreeop/btreeop.1
+++ /dev/null
@@ -1,168 +0,0 @@
-.\"
-.\" Copyright (c) 1996, 1997 Shigio Yamaguchi. 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.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by Shigio Yamaguchi.
-.\" 4. Neither the name of the author nor the names of any co-contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" 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.
-.\"
-.Dd April 21, 1997
-.Dt BTREEOP 1
-.Os BSD 4
-.Sh NAME
-.Nm btreeop
-.Nd btree database maintenance tool
-.Sh SYNOPSIS
-.Nm btreeop
-.Op Fl A
-.Op Fl C
-.Op Fl D Ar key
-.Op Fl K Ar key
-.Op Fl b
-.Op Fl c Ar cashesize
-.Op Fl l
-.Op Fl p Ar psize
-.Op Ar dbname
-.Sh DESCRIPTION
-.Nm Btreeop
-execute simple operations for
-.Xr btree 3
-database.
-.Nm Btreeop
-can create database, write record, read record (sequential or index) and
-delete record from it.
-Duplicate entries are allowed.
-.Sh OPTIONS
-A capital letter means a command. If no command specified
-then it assume sequential read operation.
-.Bl -tag -width Ds
-.It Fl A
-append records. If database doesn't exist, btreeop creates it.
-.It Fl C
-create database and write records to it.
-.It Fl D Ar key
-delete records by the key.
-.It Fl K Ar key
-search records by the key.
-.It Fl b
-assume BIG_ENDIAN byte order. default is LITTLE_ENDIAN.
-.It Fl c Ar cashesize
-specify cashesize. It's identical to 
-.Nm info.cachesize
-of BTREEINFO. (see btree(3))
-.It Fl l
-assume LITTLE_ENDIAN byte order. (the default)
-.It Fl p Ar psize
-specify page size. It's identical to 
-.Nm info.psize
-of BTREEINFO. (see btree(3))
-.It Ar dbname
-database name. default is 'btree'.
-.Sh DATA FORMAT
-To creat (or append) database,
-.Nm btreeop
-read data from stdin.
-The format of the data is the following.
-
-  Key         Data\\n
-  Key         Data\\n
-  .
-  .
-  .
-
-.El
-
-.Bl -enum -offset indent
-.It
-Key and Data are separated by blank('\\t' or ' '). 
-.It
-Key cannot include blank.
-.It
-Data can include blank.
-.It
-Null Data not allowed.
-.It
-Additionally, META record is available. META record has a key that start with
-a blank. You can read this record only by indexed search (with -K option).
-Usage is unlimited by Btreeop.
-.El
-.Sh EXAMPLES
-Create database.
-
-  % btreeop -C
-  key1	data1
-  key2	data2
-  key3	data3
-  ^D
-  %
-
-Append records.
-
-  % btreeop -A
-   __.VERSION 2
-  key2	data2-2
-  ^D
-  %
-
-Sequential read.
-
-  % btreeop
-  key2  data2
-  key3  data3
-  key2  data2-2
-  key1  data1
-  %
-
-Indexed read.
-
-  % btreeop -K key2
-  key2  data2-2
-  key2  data2
-  % btreeop -K ' __.VERSION'
-   __.VERSION 2
-  %
-
-Delete record.
-
-  % btreeop -D ' __.VERSION'
-  % btreeop -K ' __.VERSION'
-  %
-
-.Sh FILES
-.Bl -tag -width tags -compact
-.It Pa btree
-default database name.
-.El
-.Sh DIAGNOSTICS
-.Nm Btreeop
-exits with a value of 1 if an error occurred, 0 otherwise.
-.Sh SEE ALSO
-.Xr btree 3
-.Sh AUTHOR
-Shigio Yamaguchi (shigio@wafu.netgate.net)
-.Sh HISTORY
-The
-.Nm
-command appeared in FreeBSD 2.2.
diff --git a/usr.bin/global/btreeop/btreeop.c b/usr.bin/global/btreeop/btreeop.c
deleted file mode 100644
index d090e59..0000000
--- a/usr.bin/global/btreeop/btreeop.c
+++ /dev/null
@@ -1,370 +0,0 @@
-/*
- * Copyright (c) 1996, 1997 Shigio Yamaguchi. 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Shigio Yamaguchi.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * 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.
- *
- *	btreeop.c				21-Apr-97
- *
- */
-#include <err.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/types.h>
-#include <ctype.h>
-#include <db.h>
-#include <fcntl.h>
-
-char    *dbdefault = "btree";   	/* default database name */
-char    *dbname;
-char	buf[BUFSIZ+1];
-
-#ifndef __P
-#if defined(__STDC__)
-#define __P(protos)     protos
-#else
-#define __P(protos)     ()
-#endif
-#endif
-void	die __P((char *));
-static void	usage __P((void));
-void	entab __P((char *));
-void	main __P((int, char **));
-int	dbwrite __P((DB *));
-int	dbkey __P((DB *, char *));
-int	dbscan __P((DB *));
-int	dbdel __P((DB *, char *));
-DB	*db;
-char	*key;
-
-#ifndef LITTLE_ENDIAN
-#define LITTLE_ENDIAN   1234
-#endif
-#ifndef BIG_ENDIAN
-#define BIG_ENDIAN      4321
-#endif
-
-void
-die(s)
-char	*s;
-{
-	errx(1, "%s", s);
-}
-
-static void
-usage()
-{
-	fprintf(stderr, "%s\n%s\n",
-		"usage: btreeop [-A][-C][-D key][-K key][-b][-c cachesize]",
-		"               [-l][-p psize][dbname]");
-	exit(1);
-}
-
-#define TABPOS(i)	((i)%8 == 0)
-/*
- * entab: convert spaces into tabs
- *
- *	io)	buf	string buffer
- */
-void
-entab(buf)
-char	*buf;
-{
-	int	blanks = 0;
-	int	pos, src, dst;
-	char	c;
-
-	pos = src = dst = 0;
-	while ((c = buf[src++]) != 0) {
-		if (c == ' ') {
-			if (!TABPOS(++pos)) {
-				blanks++;		/* count blanks */
-				continue;
-			}
-			buf[dst++] = '\t';
-		} else if (c == '\t') {
-			while (!TABPOS(++pos))
-				;
-			buf[dst++] = '\t';
-		} else {
-			++pos;
-			while (blanks--)
-				buf[dst++] = ' ';
-			buf[dst++] = c;
-		}
-		blanks = 0;
-	}
-	buf[dst] = 0;
-}
-
-void
-main(argc, argv)
-int	argc;
-char	*argv[];
-{
-	char	command = 'R';
-	char	*key = NULL;
-	DB	*db;
-	BTREEINFO info;
-	int	c;
-	int	flags;
-	extern	char *optarg;
-	extern	int optind;
-
-	info.flags = R_DUP;		/* allow duplicate entries */
-	info.cachesize = 500000;
-	info.maxkeypage = 0;
-	info.minkeypage = 0;
-	info.psize = 0;
-	info.compare = NULL;
-	info.prefix = NULL;
-	info.lorder = LITTLE_ENDIAN;
-
-	while ((c = getopt(argc, argv, "ACD:K:bc:lp:")) != -1) {
-		switch (c) {
-		case 'K':
-		case 'D':
-			key = optarg;
-		case 'A':
-		case 'C':
-			if (command != 'R')
-				usage();
-			command = c;
-			break;
-		case 'b':
-			info.lorder = BIG_ENDIAN;
-			break;
-		case 'c':
-			info.cachesize = atoi(optarg);
-			break;
-		case 'l':
-			info.lorder = LITTLE_ENDIAN;
-			break;
-		case 'p':
-			info.psize = atoi(optarg);
-			break;
-		default:
-			usage();
-		}
-	}
-
-	dbname = (optind < argc) ? argv[optind] : dbdefault;
-	switch (command) {
-	case 'A':
-	case 'D':
-		flags = O_RDWR|O_CREAT;
-		break;
-	case 'C':
-		flags = O_RDWR|O_CREAT|O_TRUNC;
-		break;
-	case 'K':
-	case 'R':
-		flags = O_RDONLY;
-		break;
-	}
-	db = dbopen(dbname, flags, 0644, DB_BTREE, &info);
-	if (db == NULL) {
-		die("dbopen failed.");
-	}
-	switch (command) {
-	case 'A':			/* Append records */
-	case 'C':			/* Create database */
-		dbwrite(db);
-		break;
-	case 'D':			/* Delete records */
-		dbdel(db, key);
-		break;
-	case 'K':			/* Keyed (indexed) read */
-		dbkey(db, key);
-		break;
-	case 'R':			/* sequencial Read */
-		dbscan(db);
-		break;
-	}
-	if (db->close(db)) {
-		die("db->close failed.");
-	}
-	exit(0);
-}
-/*
- * dbwrite: write to database
- *
- *	i)	db
- *	r)		0: normal
- */
-int
-dbwrite(db)
-DB	*db;
-{
-	DBT     key, dat;
-	int	status;
-#define IDENTLEN 80
-	char	keybuf[IDENTLEN+1];
-	char	*c;
-
-	/*
-	 * Input file format:
-	 * +------------------
-	 * |Key		Data\n
-	 * |Key		Data\n
-	 * 	.
-	 * 	.
-	 * - Key and Data are separated by blank('\t' or ' '). 
-	 * - Key cannot include blank.
-	 * - Data can include blank.
-	 * - Null Data not allowed.
-	 *
-	 * META record:
-	 * You can write meta record by making key start with a ' '.
-	 * You can read this record only by indexed read ('-K' option).
-	 * +------------------
-	 * | __.VERSION 2
-	 */
-	while (fgets(buf, BUFSIZ, stdin)) {
-		if (buf[strlen(buf)-1] == '\n')		/* chop(buf) */
-			buf[strlen(buf)-1] = 0;
-		else
-			while (fgetc(stdin) != '\n')
-				;
-		c = buf;
-		if (*c == ' ') {			/* META record */
-			if (*++c == ' ')
-				die("illegal format.");
-		}
-		for (; *c && !isspace(*c); c++)		/* skip key part */
-			;
-		if (*c == 0)
-			die("data part not found.");
-		if (c - buf > IDENTLEN)
-			die("key too long.");
-		strncpy(keybuf, buf, c - buf);		/* make key string */
-		keybuf[c - buf] = 0;
-		for (; *c && isspace(*c); c++)		/* skip blanks */
-			;
-		if (*c == 0)
-			die("data part is null.");
-		entab(buf);
-		key.data = keybuf;
-		key.size = strlen(keybuf)+1;
-		dat.data = buf;
-		dat.size = strlen(buf)+1;
-
-		status = (db->put)(db, &key, &dat, 0);
-		switch (status) {
-		case RET_SUCCESS:
-			break;
-		case RET_ERROR:
-		case RET_SPECIAL:
-			die("db->put: failed.");
-		}
-	}
-	return(0);
-}
-
-/*
- * dbkey: Keyed search
- *
- *	i)	db
- *	i)	skey	
- *	r)		0: normal
- *			1: not found
- */
-int
-dbkey(db, skey)
-DB	*db;
-char	*skey;
-{
-	DBT	dat, key;
-	int	status;
-
-	key.data = skey;
-	key.size = strlen(skey)+1;
-
-	for (status = (*db->seq)(db, &key, &dat, R_CURSOR);
-		status == RET_SUCCESS && !strcmp(key.data, skey);
-		status = (*db->seq)(db, &key, &dat, R_NEXT)) {
-		(void)fprintf(stdout, "%s\n", (char *)dat.data);
-	}
-	if (status == RET_ERROR)
-		die("db->seq failed.");
-	return (0);
-}
-
-/*
- * dbscan: Scan all records
- *
- *	i)	db
- *	r)		0: normal
- *			1: not found
- */
-int
-dbscan(db)
-DB	*db;
-{
-	DBT	dat, key;
-	int	status;
-
-	for (status = (*db->seq)(db, &key, &dat, R_FIRST);
-		status == RET_SUCCESS;
-		status = (*db->seq)(db, &key, &dat, R_NEXT)) {
-		/* skip META record */
-		if (*(char *)key.data == ' ')
-			continue;
-		(void)fprintf(stdout, "%s\n", (char *)dat.data);
-	}
-	if (status == RET_ERROR)
-		die("db->seq failed.");
-	return (0);
-}
-
-/*
- * dbdel: Delete records
- *
- *	i)	db
- *	i)	key	key
- *	r)		0: normal
- *			1: not found
- */
-int
-dbdel(db, skey)
-DB	*db;
-char	*skey;
-{
-	DBT	key;
-	int	status;
-
-	key.data = skey;
-	key.size = strlen(skey)+1;
-
-	status = (*db->del)(db, &key, 0);
-	if (status == RET_ERROR)
-		die("db->del failed.");
-	return (0);
-}