BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.sbin / lpr / common_source / startdaemon.c

diff --git a/usr/src/usr.sbin/lpr/common_source/startdaemon.c b/usr/src/usr.sbin/lpr/common_source/startdaemon.c
index 4e0a56a..3b3e865 100644 (file)
--- a/usr/src/usr.sbin/lpr/common_source/startdaemon.c
+++ b/usr/src/usr.sbin/lpr/common_source/startdaemon.c
@@ -2,23 +2,37 @@
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1983 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

-static char sccsid[] = "@(#)startdaemon.c      5.6 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)startdaemon.c      5.7 (Berkeley) 3/2/91";

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


@@ -38,6 +52,7 @@ startdaemon(printer)
        struct sockaddr_un sun;
        register int s, n;
        char buf[BUFSIZ];
        struct sockaddr_un sun;
        register int s, n;
        char buf[BUFSIZ];

+       static void perr();

 
        s = socket(AF_UNIX, SOCK_STREAM, 0);
        if (s < 0) {
 
        s = socket(AF_UNIX, SOCK_STREAM, 0);
        if (s < 0) {


@@ -46,7 +61,7 @@ startdaemon(printer)
        }
        sun.sun_family = AF_UNIX;
        strcpy(sun.sun_path, _PATH_SOCKETNAME);
        }
        sun.sun_family = AF_UNIX;
        strcpy(sun.sun_path, _PATH_SOCKETNAME);

-       if (connect(s, &sun, strlen(sun.sun_path) + 2) < 0) {
+       if (connect(s, (struct sockaddr *)&sun, strlen(sun.sun_path) + 2) < 0) {

                perr("connect");
                (void) close(s);
                return(0);
                perr("connect");
                (void) close(s);
                return(0);


@@ -71,7 +86,7 @@ startdaemon(printer)
        return(0);
 }
 
        return(0);
 }
 

-static
+static void

 perr(msg)
        char *msg;
 {
 perr(msg)
        char *msg;
 {