X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/ec37e2d9348c11c6545e08bb07eca8b2bdb4036f..ed554bc5e4201344d7eaad78263566e79428759c:/usr/src/usr.bin/cmp/cmp.c

diff --git a/usr/src/usr.bin/cmp/cmp.c b/usr/src/usr.bin/cmp/cmp.c
index be016fb0bf..dc6c64e8be 100644
--- a/usr/src/usr.bin/cmp/cmp.c
+++ b/usr/src/usr.bin/cmp/cmp.c
@@ -1,245 +1,146 @@
 /*
- * Copyright (c) 1987 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1987, 1990, 1993, 1994
+ *	The Regents of the University of California.  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 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.
  */
 
 #ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1987 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* !lint */
+static char copyright[] =
+"@(#) Copyright (c) 1987, 1990, 1993, 1994\n\
+	The Regents of the University of California.  All rights reserved.\n";
+#endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)cmp.c	4.6 (Berkeley) %G%";
-#endif /* !lint */
+static char sccsid[] = "@(#)cmp.c	8.3 (Berkeley) 4/2/94";
+#endif /* not lint */
 
-#include <sys/param.h>
-#include <sys/file.h>
+#include <sys/types.h>
 #include <sys/stat.h>
+
+#include <err.h>
+#include <fcntl.h>
 #include <stdio.h>
-#include <ctype.h>
-#include <errno.h>
-
-#define DIFF	1			/* found differences */
-#define ERR	2			/* error during run */
-#define NO	0			/* no/false */
-#define OK	0			/* didn't find differences */
-#define YES	1			/* yes/true */
-
-static int	fd1, fd2;		/* file descriptors */
-		silent = NO;		/* if silent run */
-static short	all = NO;		/* if report all differences */
-static u_char	buf1[MAXBSIZE],		/* read buffers */
-		buf2[MAXBSIZE];
-static char	*file1, *file2;		/* file names */
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "extern.h"
+
+int	lflag, sflag;
 
+static void usage __P((void));
+
+int
 main(argc, argv)
-	int	argc;
-	char	**argv;
+	int argc;
+	char *argv[];
 {
-	extern char	*optarg;
-	extern int	optind;
-	int	ch;
-	u_long	otoi();
+	struct stat sb1, sb2;
+	off_t skip1, skip2;
+	int ch, fd1, fd2, special;
+	char *file1, *file2;
 
-	while ((ch = getopt(argc, argv, "ls")) != EOF)
-		switch(ch) {
+	while ((ch = getopt(argc, argv, "-ls")) != EOF)
+		switch (ch) {
 		case 'l':		/* print all differences */
-			all = YES;
+			lflag = 1;
 			break;
 		case 's':		/* silent run */
-			silent = YES;
+			sflag = 1;
 			break;
+		case '-':		/* stdin (must be after options) */
+			--optind;
+			goto endargs;
 		case '?':
 		default:
 			usage();
 		}
+endargs:
 	argv += optind;
 	argc -= optind;
 
+	if (lflag && sflag)
+		errx(ERR_EXIT, "only one of -l and -s may be specified");
+
 	if (argc < 2 || argc > 4)
 		usage();
 
-	/* open up files; "-" is stdin */
-	file1 = argv[0];
-	if (strcmp(file1, "-") && (fd1 = open(file1, O_RDONLY, 0)) < 0)
-		error(file1);
-	file2 = argv[1];
-	if ((fd2 = open(file2, O_RDONLY, 0)) < 0)
-		error(file2);
-
-	/* handle skip arguments */
-	if (argc > 2) {
-		skip(otoi(argv[2]), fd1, file1);
-		if (argc == 4)
-			skip(otoi(argv[3]), fd2, file2);
+	/* Backward compatibility -- handle "-" meaning stdin. */
+	special = 0;
+	if (strcmp(file1 = argv[0], "-") == 0) {
+		special = 1;
+		fd1 = 0;
+		file1 = "stdin";
 	}
-	cmp();
-	/*NOTREACHED*/
-}
-
-/*
- * skip --
- *	skip first part of file
- */
-static
-skip(dist, fd, fname)
-	register u_long	dist;		/* length in bytes, to skip */
-	register int	fd;		/* file descriptor */
-	char	*fname;			/* file name for error */
-{
-	register int	rlen;		/* read length */
-	register int	nread;
-
-	for (; dist; dist -= rlen) {
-		rlen = MIN(dist, sizeof(buf1));
-		if ((nread = read(fd, buf1, rlen)) != rlen) {
-			if (nread < 0)
-				error(fname);
-			else
-				endoffile(fname);
-		}
+	else if ((fd1 = open(file1, O_RDONLY, 0)) < 0)
+		err(ERR_EXIT, "%s", file1);
+	if (strcmp(file2 = argv[1], "-") == 0) {
+		if (special)
+			errx(ERR_EXIT,
+				"standard input may only be specified once");
+		special = 1;
+		fd2 = 0;
+		file2 = "stdin";
 	}
-}
+	else if ((fd2 = open(file2, O_RDONLY, 0)) < 0)
+		err(ERR_EXIT, "%s", file2);
 
-static
-cmp()
-{
-	register u_char	*C1, *C2;	/* traveling pointers */
-	register int	cnt,		/* counter */
-			len1, len2;	/* read lengths */
-	register long	byte,		/* byte count */
-			line;		/* line count */
-	short	dfound = NO;		/* if difference found */
-
-	for (byte = 0, line = 1;;) {
-		switch(len1 = read(fd1, buf1, MAXBSIZE)) {
-		case -1:
-			error(file1);
-		case 0:
-			/*
-			 * read of file 1 just failed, find out
-			 * if there's anything left in file 2
-			 */
-			switch(read(fd2, buf2, 1)) {
-				case -1:
-					error(file2);
-				case 0:
-					exit(dfound ? DIFF : OK);
-				default:
-					endoffile(file1);
-			}
-		}
-		/*
-		 * file1 might be stdio, which means that a read of less than
-		 * MAXBSIZE might not mean an EOF.  So, read whatever we read
-		 * from file1 from file2.
-		 */
-		if ((len2 = read(fd2, buf2, len1)) == -1)
-			error(file2);
-		if (bcmp(buf1, buf2, len2)) {
-			if (silent)
-				exit(DIFF);
-			if (all) {
-				dfound = YES;
-				for (C1 = buf1, C2 = buf2, cnt = len2; cnt--; ++C1, ++C2) {
-					++byte;
-					if (*C1 != *C2)
-						printf("%6ld %3o %3o\n", byte, *C1, *C2);
-				}
-			}
-			else for (C1 = buf1, C2 = buf2;; ++C1, ++C2) {
-				++byte;
-				if (*C1 != *C2) {
-					printf("%s %s differ: char %ld, line %ld\n", file1, file2, byte, line);
-					exit(DIFF);
-				}
-				if (*C1 == '\n')
-					++line;
-			}
-		}
+	skip1 = argc > 2 ? strtol(argv[2], NULL, 10) : 0;
+	skip2 = argc == 4 ? strtol(argv[3], NULL, 10) : 0;
+
+	if (!special) {
+		if (fstat(fd1, &sb1))
+			err(ERR_EXIT, "%s", file1);
+		if (!S_ISREG(sb1.st_mode))
+			special = 1;
 		else {
-			byte += len2;
-			/*
-			 * here's the real performance problem, we've got to
-			 * count the stupid lines, which means that -l is a
-			 * *much* faster version, i.e., unless you really
-			 * *want* to know the line number, run -s or -l.
-			 */
-			if (!silent && !all)
-				for (C1 = buf1, cnt = len2; cnt--;)
-					if (*C1++ == '\n')
-						++line;
+			if (fstat(fd2, &sb2))
+				err(ERR_EXIT, "%s", file2);
+			if (!S_ISREG(sb2.st_mode))
+				special = 1;
 		}
-		/*
-		 * couldn't read as much from file2 as from file1; checked
-		 * here because there might be a difference before we got
-		 * to this point, which would have precedence.
-		 */
-		if (len2 < len1)
-			endoffile(file2);
 	}
-}
 
-/*
- * otoi --
- *	octal/decimal string to u_long
- */
-static u_long
-otoi(C)
-	register char	*C;		/* argument string */
-{
-	register u_long	val;		/* return value */
-	register int	base;		/* number base */
-
-	base = (*C == '0') ? 8 : 10;
-	for (val = 0; isdigit(*C); ++C)
-		val = val * base + *C - '0';
-	return(val);
-}
-
-/*
- * error --
- *	print I/O error message and die
- */
-static
-error(filename)
-	char *filename;
-{
-	extern int errno;
-	int sverrno;
-
-	if (!silent) {
-		sverrno = errno;
-		(void)fprintf(stderr, "cmp: %s: ", filename);
-		errno = sverrno;
-		perror((char *)NULL);
-	}
-	exit(ERR);
+	if (special)
+		c_special(fd1, file1, skip1, fd2, file2, skip2);
+	else
+		c_regular(fd1, file1, skip1, sb1.st_size,
+		    fd2, file2, skip2, sb2.st_size);
+	exit(0);
 }
 
-/*
- * endoffile --
- *	print end-of-file message and exit indicating the files were different
- */
-static
-endoffile(filename)
-	char *filename;
-{
-	/* 32V put this message on stdout, S5 does it on stderr. */
-	if (!silent)
-		(void)fprintf(stderr, "cmp: EOF on %s\n", filename);
-	exit(DIFF);
-}
-
-/*
- * usage --
- *	print usage and die
- */
-static
+static void
 usage()
 {
-	fputs("usage: cmp [-ls] file1 file2 [skip1] [skip2]\n", stderr);
-	exit(ERR);
+
+	(void)fprintf(stderr,
+	    "usage: cmp [-l | s] file1 file2 [skip1 [skip2]]\n");
+	exit(ERR_EXIT);
 }