add confSORT_QUEUE_BY_HOST and confBROKEN_SMTP_PEERS

[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 4cb35bc..d72d7b0 100644 (file)
--- a/usr/src/usr.bin/comm/comm.c
+++ b/usr/src/usr.bin/comm/comm.c
@@ -1,6 +1,6 @@
 /*
 /*

- * 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.


@@ -9,33 +9,40 @@
  */
 
 #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.7 (Berkeley) %G%";
+static char sccsid[] = "@(#)comm.c     8.3 (Berkeley) %G%";

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

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

 #include <limits.h>
 #include <limits.h>

+#include <errno.h>

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

+#include <stdlib.h>
+#include <string.h>

 
 

-#define        MAXLINELEN      (_POSIX2_LINE_MAX + 1)
+#define        MAXLINELEN      (LINE_MAX + 1)

 
 char *tabs[] = { "", "\t", "\t\t" };
 
 
 char *tabs[] = { "", "\t", "\t\t" };
 

-main(argc,argv)
+FILE   *file __P((char *));
+void   show __P((FILE *, char *, char *));
+void   usage __P((void));
+
+int
+main(argc, argv)

        int argc;
        char *argv[];
 {
        int argc;
        char *argv[];
 {

-       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, *file();
+       FILE *fp1, *fp2;
+       char *col1, *col2, *col3;

        char **p, line1[MAXLINELEN], line2[MAXLINELEN];
        char **p, line1[MAXLINELEN], line2[MAXLINELEN];

-       extern int optind;

 
        flag1 = flag2 = flag3 = 1;
        while ((ch = getopt(argc, argv, "-123")) != EOF)
 
        flag1 = flag2 = flag3 = 1;
        while ((ch = getopt(argc, argv, "-123")) != EOF)


@@ -118,10 +125,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));


@@ -134,16 +143,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);
 }