BSD 4_4_Lite1 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 ad62994..237769e 100644 (file)
--- a/usr/src/usr.sbin/lpr/common_source/startdaemon.c
+++ b/usr/src/usr.sbin/lpr/common_source/startdaemon.c
@@ -1,18 +1,64 @@
-/*     startdaemon.c   4.6     83/06/29        */

 /*
 /*

- * Tell the printer daemon that there are new files in the spool directory.
+ * Copyright (c) 1983, 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.

  */
 
  */
 

-#include <stdio.h>
-#include <sys/types.h>
+#ifndef lint
+static char sccsid[] = "@(#)startdaemon.c      8.2 (Berkeley) 4/17/94";
+#endif /* not lint */
+
+
+#include <sys/param.h>

 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/socket.h>
 #include <sys/un.h>

-#include "lp.local.h"

 
 

+#include <dirent.h>
+#include <errno.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include "lp.h"
+#include "pathnames.h"
+
+static void perr __P((char *));
+
+/*
+ * Tell the printer daemon that there are new files in the spool directory.
+ */
+
+int

 startdaemon(printer)
        char *printer;
 {
 startdaemon(printer)
        char *printer;
 {

-       struct sockaddr_un sun;
+       struct sockaddr_un un;

        register int s, n;
        char buf[BUFSIZ];
 
        register int s, n;
        char buf[BUFSIZ];
 


@@ -21,9 +67,13 @@ startdaemon(printer)
                perr("socket");
                return(0);
        }
                perr("socket");
                return(0);
        }

-       sun.sun_family = AF_UNIX;
-       strcpy(sun.sun_path, SOCKETNAME);
-       if (connect(s, &sun, strlen(sun.sun_path) + 2) < 0) {
+       memset(&un, 0, sizeof(un));
+       un.sun_family = AF_UNIX;
+       strcpy(un.sun_path, _PATH_SOCKETNAME);
+#ifndef SUN_LEN
+#define SUN_LEN(unp) (strlen((unp)->sun_path) + 2)
+#endif
+       if (connect(s, (struct sockaddr *)&un, SUN_LEN(&un)) < 0) {

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


@@ -48,16 +98,11 @@ startdaemon(printer)
        return(0);
 }
 
        return(0);
 }
 

-static
+static void

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

-       extern int sys_nerr;
-       extern char *sys_errlist[];
-       extern int errno;

 
 

-       printf("%s: %s: ", name, msg);
-       fputs(errno < sys_nerr ? sys_errlist[errno] : "Unknown error" , stdout);
-       putchar('\n');
+       (void)printf("%s: %s: %s\n", name, msg, strerror(errno));

 }
 }