BSD 4_3_Net_2 release

[unix-history] / usr / src / libexec / comsat / comsat.c

diff --git a/usr/src/libexec/comsat/comsat.c b/usr/src/libexec/comsat/comsat.c
index 1d63a0b..1bcd4d1 100644 (file)
--- a/usr/src/libexec/comsat/comsat.c
+++ b/usr/src/libexec/comsat/comsat.c
@@ -2,19 +2,33 @@
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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 ``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


@@ -24,7 +38,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)comsat.c   5.22 (Berkeley) 6/24/90";
+static char sccsid[] = "@(#)comsat.c   5.24 (Berkeley) 2/25/91";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -70,7 +84,7 @@ main(argc, argv)
 
        /* verify proper invocation */
        fromlen = sizeof(from);
 
        /* verify proper invocation */
        fromlen = sizeof(from);

-       if (getsockname(0, &from, &fromlen) < 0) {
+       if (getsockname(0, (struct sockaddr *)&from, &fromlen) < 0) {

                (void)fprintf(stderr,
                    "comsat: getsockname: %s.\n", strerror(errno));
                exit(1);
                (void)fprintf(stderr,
                    "comsat: getsockname: %s.\n", strerror(errno));
                exit(1);


@@ -112,7 +126,7 @@ main(argc, argv)
 void
 reapchildren()
 {
 void
 reapchildren()
 {

-       while (wait3((union wait *)NULL, WNOHANG, (struct rusage *)NULL) > 0);
+       while (wait3((int *)NULL, WNOHANG, (struct rusage *)NULL) > 0);

 }
 
 void
 }
 
 void


@@ -210,7 +224,6 @@ jkfprintf(tp, name, offset)
        register FILE *fi;
        register int linecnt, charcnt, inheader;
        char line[BUFSIZ];
        register FILE *fi;
        register int linecnt, charcnt, inheader;
        char line[BUFSIZ];

-       off_t fseek();

 
        if ((fi = fopen(name, "r")) == NULL)
                return;
 
        if ((fi = fopen(name, "r")) == NULL)
                return;