BSD 4_4_Lite2 release

[unix-history] / usr / src / usr.bin / comm / comm.c

diff --git a/usr/src/usr.bin/comm/comm.c b/usr/src/usr.bin/comm/comm.c
index 0b6a496..82f995f 100644 (file)
--- a/usr/src/usr.bin/comm/comm.c
+++ b/usr/src/usr.bin/comm/comm.c
@@ -1,49 +1,74 @@
 /*
 /*

- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
+ * 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.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * Case Larsen.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 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
  */
 
 #ifndef lint

-char copyright[] =
-"@(#) Copyright (c) 1989 The Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1989, 1993, 1994\n\
+       The Regents of the University of California.  All rights reserved.\n";

 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)comm.c     5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)comm.c     8.4 (Berkeley) 5/4/95";

 #endif /* not lint */
 
 #endif /* not lint */
 

-#include <sys/file.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <errno.h>

 #include <stdio.h>
 #include <stdio.h>

+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#define        MAXLINELEN      (LINE_MAX + 1)

 
 

-#define        MAXLINELEN      (2048 + 1)
+char *tabs[] = { "", "\t", "\t\t" };

 
 

-static char *tabs[] = { "", "\t", "\t\t" };
+FILE   *file __P((char *));
+void   show __P((FILE *, char *, char *));
+void   usage __P((void));

 
 

-main(argc,argv)
+int
+main(argc, argv)

        int argc;
        int argc;

-       char **argv;
+       char *argv[];

 {
 {

-       extern int optind;
-       FILE *fp1, *fp2, *file();
-       register int comp, file1done, file2done, read1, read2;
-       register char *col1, *col2, *col3;
+       int comp, file1done, file2done, read1, read2;

        int ch, flag1, flag2, flag3;
        int ch, flag1, flag2, flag3;

+       FILE *fp1, *fp2;
+       char *col1, *col2, *col3;

        char **p, line1[MAXLINELEN], line2[MAXLINELEN];
 
        flag1 = flag2 = flag3 = 1;
        char **p, line1[MAXLINELEN], line2[MAXLINELEN];
 
        flag1 = flag2 = flag3 = 1;


@@ -76,12 +101,13 @@ done:      argc -= optind;
 
        /* for each column printed, add another tab offset */
        p = tabs;
 
        /* for each column printed, add another tab offset */
        p = tabs;

+       col1 = col2 = col3 = NULL;

        if (flag1)
                col1 = *p++;
        if (flag2)
                col2 = *p++;
        if (flag3)
        if (flag1)
                col1 = *p++;
        if (flag2)
                col2 = *p++;
        if (flag3)

-               col3 = *p++;
+               col3 = *p;

 
        for (read1 = read2 = 1;;) {
                /* read next line, check for EOF */
 
        for (read1 = read2 = 1;;) {
                /* read next line, check for EOF */


@@ -93,12 +119,12 @@ done:      argc -= optind;
                /* if one file done, display the rest of the other file */
                if (file1done) {
                        if (!file2done && col2)
                /* if one file done, display the rest of the other file */
                if (file1done) {
                        if (!file2done && col2)

-                               show(fp1, col2, line2);
+                               show(fp2, col2, line2);

                        break;
                }
                if (file2done) {
                        if (!file1done && col1)
                        break;
                }
                if (file2done) {
                        if (!file1done && col1)

-                               show(fp2, col1, line1);
+                               show(fp1, col1, line1);

                        break;
                }
 
                        break;
                }
 


@@ -126,10 +152,12 @@ done:     argc -= optind;
        exit(0);
 }
 
        exit(0);
 }
 

+void

 show(fp, offset, buf)
        FILE *fp;
        char *offset, *buf;
 {
 show(fp, offset, buf)
        FILE *fp;
        char *offset, *buf;
 {

+

        do {
                (void)printf("%s%s", offset, buf);
        } while (fgets(buf, MAXLINELEN, fp));
        do {
                (void)printf("%s%s", offset, buf);
        } while (fgets(buf, MAXLINELEN, fp));


@@ -142,16 +170,18 @@ file(name)
        FILE *fp;
 
        if (!strcmp(name, "-"))
        FILE *fp;
 
        if (!strcmp(name, "-"))

-               return(stdin);
-       if (!(fp = fopen(name, "r"))) {
-               (void)fprintf(stderr, "comm: can't read %s.\n", name);
+               return (stdin);
+       if ((fp = fopen(name, "r")) == NULL) {
+               (void)fprintf(stderr, "comm: %s: %s\n", name, strerror(errno));

                exit(1);
        }
                exit(1);
        }

-       return(fp);
+       return (fp);

 }
 
 }
 

+void

 usage()
 {
 usage()
 {

-       (void)fprintf(stderr, "usage: comm [-123] [ - ] file1 file2\n");
+
+       (void)fprintf(stderr, "usage: comm [-123] file1 file2\n");

        exit(1);
 }
        exit(1);
 }