initial population

2 files changed, 315 insertions, 0 deletions

diff --git a/usr.bin/comm/comm.1 b/usr.bin/comm/comm.1
new file mode 100644
index 0000000..d304388
--- /dev/null
+++ b/usr.bin/comm/comm.1
@@ -0,0 +1,102 @@
+.\"	$NetBSD: comm.1,v 1.12 2014/04/13 01:45:34 snj Exp $
+.\"
+.\" Copyright (c) 1989, 1990, 1993
+.\"	The Regents of the University of California.  All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" the Institute of Electrical and Electronics Engineers, Inc.
+.\"
+.\" 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. 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.
+.\"
+.\"     @(#)comm.1	8.1 (Berkeley) 6/6/93
+.\"
+.Dd June 6, 1993
+.Dt COMM 1
+.Os
+.Sh NAME
+.Nm comm
+.Nd select or reject lines common to two files
+.Sh SYNOPSIS
+.Nm
+.Op Fl 123f
+.Ar file1 file2
+.Sh DESCRIPTION
+The
+.Nm
+utility reads
+.Ar file1
+and
+.Ar file2 ,
+which should be
+sorted lexically, and produces three text
+columns as output: lines only in
+.Ar file1 ;
+lines only in
+.Ar file2 ;
+and lines in both files.
+.Pp
+The filename ``-'' means the standard input.
+.Pp
+The following options are available:
+.Bl -tag -width Ds
+.It Fl 1
+Suppress printing of column 1.
+.It Fl 2
+Suppress printing of column 2.
+.It Fl 3
+Suppress printing of column 3.
+.It Fl f
+Fold case in line comparisons.
+.El
+.Pp
+Each column will have a number of tab characters prepended to it
+equal to the number of lower numbered columns that are being printed.
+For example, if column number two is being suppressed, lines printed
+in column number one will not have any tabs preceding them, and lines
+printed in column number three will have one.
+.Pp
+.Nm
+assumes that the files are lexically sorted; all characters
+participate in line comparisons.
+.\" .Sh ENVIRONMENT
+.\" .Bl -tag -width indent
+.\" .It Ev LANG
+.\" .It Ev LC_ALL
+.\" .It Ev LC_CTYPE
+.\" .It Ev LC_COLLATE
+.\" .It Ev LC_MESSAGES
+.\" .El
+.Sh EXIT STATUS
+.Ex -std
+.Sh SEE ALSO
+.Xr cmp 1 ,
+.Xr diff 1 ,
+.Xr sort 1 ,
+.Xr uniq 1
+.Sh STANDARDS
+The
+.Nm
+utility conforms to
+.St -p1003.2-92 .
diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c
new file mode 100644
index 0000000..c1416e2
--- /dev/null
+++ b/usr.bin/comm/comm.c
@@ -0,0 +1,213 @@
+/*	$NetBSD: comm.c,v 1.20 2012/09/05 04:01:23 simonb Exp $	*/
+
+/*
+ * Copyright (c) 1989, 1993, 1994
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Case Larsen.
+ *
+ * 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. 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.
+ */
+
+#include <sys/cdefs.h>
+#ifndef lint
+__COPYRIGHT("@(#) Copyright (c) 1989, 1993, 1994\
+ The Regents of the University of California.  All rights reserved.");
+#endif /* not lint */
+
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)comm.c	8.4 (Berkeley) 5/4/95";
+#endif
+__RCSID("$NetBSD: comm.c,v 1.20 2012/09/05 04:01:23 simonb Exp $");
+#endif /* not lint */
+
+#include <err.h>
+#include <limits.h>
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#define	MAXLINELEN	(LINE_MAX + 1)
+
+static const char *tabs[] = { "", "\t", "\t\t" };
+
+static FILE   *file(const char *);
+static void	show(FILE *, const char *, char *);
+__dead static void	usage(void);
+static char   *getnextln(char *buf, FILE *);
+
+int
+main(int argc, char **argv)
+{
+	int comp, file1done, file2done, read1, read2;
+	int ch, flag1, flag2, flag3;
+	FILE *fp1, *fp2;
+	const char *col1, *col2, *col3, **p;
+	char line1[MAXLINELEN], line2[MAXLINELEN];
+	int (*compare)(const char*,const char*);
+
+	(void)setlocale(LC_ALL, "");
+
+	file1done = file2done = 0;
+	flag1 = flag2 = flag3 = 1;
+	compare = strcoll;
+	while ((ch = getopt(argc, argv, "123f")) != -1)
+		switch(ch) {
+		case '1':
+			flag1 = 0;
+			break;
+		case '2':
+			flag2 = 0;
+			break;
+		case '3':
+			flag3 = 0;
+			break;
+		case 'f':
+			compare = strcasecmp;
+			break;
+		case '?':
+		default:
+			usage();
+		}
+	argc -= optind;
+	argv += optind;
+
+	if (argc != 2)
+		usage();
+
+	fp1 = file(argv[0]);
+	fp2 = file(argv[1]);
+
+	/* for each column printed, add another tab offset */
+	p = tabs;
+	col1 = col2 = col3 = NULL;
+	if (flag1)
+		col1 = *p++;
+	if (flag2)
+		col2 = *p++;
+	if (flag3)
+		col3 = *p;
+
+	for (read1 = read2 = 1;;) {
+		/* read next line, check for EOF */
+		if (read1)
+			file1done = !getnextln(line1, fp1);
+		if (read2)
+			file2done = !getnextln(line2, fp2);
+
+		/* if one file done, display the rest of the other file */
+		if (file1done) {
+			if (!file2done && col2)
+				show(fp2, col2, line2);
+			break;
+		}
+		if (file2done) {
+			if (!file1done && col1)
+				show(fp1, col1, line1);
+			break;
+		}
+
+		/* lines are the same */
+		if (!(comp = compare(line1, line2))) {
+			read1 = read2 = 1;
+			if (col3)
+				if (printf("%s%s\n", col3, line1) < 0)
+					break;
+			continue;
+		}
+
+		/* lines are different */
+		if (comp < 0) {
+			read1 = 1;
+			read2 = 0;
+			if (col1)
+				if (printf("%s%s\n", col1, line1) < 0)
+					break;
+		} else {
+			read1 = 0;
+			read2 = 1;
+			if (col2)
+				if (printf("%s%s\n", col2, line2) < 0)
+					break;
+		}
+	}
+
+	if (ferror (stdout) || fclose (stdout) == EOF)
+		err(1, "stdout");
+
+	exit(0);
+}
+
+static void
+show(FILE *fp, const char *offset, char *buf)
+{
+	while (printf("%s%s\n", offset, buf) >= 0 && getnextln(buf, fp))
+		;
+}
+
+static FILE *
+file(const char *name)
+{
+	FILE *fp;
+
+	if (!strcmp(name, "-"))
+		return (stdin);
+	if ((fp = fopen(name, "r")) == NULL)
+		err(1, "%s", name);
+	return (fp);
+}
+
+static void
+usage(void)
+{
+
+	(void)fprintf(stderr, "usage: comm [-123f] file1 file2\n");
+	exit(1);
+}
+
+static char *
+getnextln(char *buf, FILE *fp)
+{
+	size_t i = 0;
+	int c;
+
+	while ((c = getc(fp)) != '\n' && c != EOF) {
+		buf[i++] = c;
+
+		if (i >= MAXLINELEN)
+			i--; /* consumes extra characters till newline */
+	}
+
+	if (c == EOF && !i)
+		return NULL;
+
+	buf[i] = 0;
+	return buf;
+}
+