BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.bin / rdist / docmd.c

diff --git a/usr/src/usr.bin/rdist/docmd.c b/usr/src/usr.bin/rdist/docmd.c
index 7865c59..cd5aba2 100644 (file)
--- a/usr/src/usr.bin/rdist/docmd.c
+++ b/usr/src/usr.bin/rdist/docmd.c
@@ -2,32 +2,48 @@
  * 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 this notice is preserved and that due credit is given
- * to the University of California at 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'' without express or implied warranty.
+ * 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[] = "@(#)docmd.c    5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)docmd.c    5.8 (Berkeley) 3/1/91";

 #endif /* not lint */
 
 #include "defs.h"
 #include <setjmp.h>
 #include <netdb.h>
 
 #endif /* not lint */
 
 #include "defs.h"
 #include <setjmp.h>
 #include <netdb.h>
 

-#ifndef RDIST
-#define RDIST "/usr/ucb/rdist"
-#endif
-

 FILE   *lfp;                   /* log file for recording files updated */
 struct subcmd *subcmds;        /* list of sub-commands for current cmd */
 jmp_buf        env;
 
 FILE   *lfp;                   /* log file for recording files updated */
 struct subcmd *subcmds;        /* list of sub-commands for current cmd */
 jmp_buf        env;
 

-int    cleanup();
-int    lostconn();
+void cleanup(), lostconn();

 
 /*
  * Do the commands in cmds (initialized by yyparse).
 
 /*
  * Do the commands in cmds (initialized by yyparse).


@@ -116,8 +132,8 @@ doarrow(filev, files, rhost, cmds)
                signal(SIGPIPE, lostconn);
                if (!makeconn(rhost))
                        return;
                signal(SIGPIPE, lostconn);
                if (!makeconn(rhost))
                        return;

-               if ((lfp = fopen(tmpfile, "w")) == NULL) {
-                       fatal("cannot open %s\n", tmpfile);
+               if ((lfp = fopen(tempfile, "w")) == NULL) {
+                       fatal("cannot open %s\n", tempfile);

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


@@ -151,9 +167,9 @@ done:
        }
        for (sc = cmds; sc != NULL; sc = sc->sc_next)
                if (sc->sc_type == NOTIFY)
        }
        for (sc = cmds; sc != NULL; sc = sc->sc_next)
                if (sc->sc_type == NOTIFY)

-                       notify(tmpfile, rhost, sc->sc_args, 0);
+                       notify(tempfile, rhost, sc->sc_args, 0);

        if (!nflag) {
        if (!nflag) {

-               (void) unlink(tmpfile);
+               (void) unlink(tempfile);

                for (; ihead != NULL; ihead = ihead->nextp) {
                        free(ihead);
                        if ((opts & IGNLNKS) || ihead->count == 0)
                for (; ihead != NULL; ihead = ihead->nextp) {
                        free(ihead);
                        if ((opts & IGNLNKS) || ihead->count == 0)


@@ -204,7 +220,7 @@ makeconn(rhost)
                ruser = user;
        if (!qflag)
                printf("updating host %s\n", rhost);
                ruser = user;
        if (!qflag)
                printf("updating host %s\n", rhost);

-       (void) sprintf(buf, "%s -Server%s", RDIST, qflag ? " -q" : "");
+       (void) sprintf(buf, "%s -Server%s", _PATH_RDIST, qflag ? " -q" : "");

        if (port < 0) {
                struct servent *sp;
 
        if (port < 0) {
                struct servent *sp;
 


@@ -261,6 +277,7 @@ closeconn()
        }
 }
 
        }
 }
 

+void

 lostconn()
 {
        if (iamremote)
 lostconn()
 {
        if (iamremote)


@@ -317,7 +334,7 @@ dodcolon(filev, files, stamp, cmds)
                return;
        }
        if (stat(stamp, &stb) < 0) {
                return;
        }
        if (stat(stamp, &stb) < 0) {

-               error("%s: %s\n", stamp, sys_errlist[errno]);
+               error("%s: %s\n", stamp, strerror(errno));

                return;
        }
        if (debug)
                return;
        }
        if (debug)


@@ -328,8 +345,8 @@ dodcolon(filev, files, stamp, cmds)
        if (nflag || (options & VERIFY))
                tfp = NULL;
        else {
        if (nflag || (options & VERIFY))
                tfp = NULL;
        else {

-               if ((tfp = fopen(tmpfile, "w")) == NULL) {
-                       error("%s: %s\n", stamp, sys_errlist[errno]);
+               if ((tfp = fopen(tempfile, "w")) == NULL) {
+                       error("%s: %s\n", stamp, strerror(errno));

                        return;
                }
                (void) gettimeofday(&tv[0], &tz);
                        return;
                }
                (void) gettimeofday(&tv[0], &tz);


@@ -353,9 +370,9 @@ dodcolon(filev, files, stamp, cmds)
                (void) fclose(tfp);
        for (sc = cmds; sc != NULL; sc = sc->sc_next)
                if (sc->sc_type == NOTIFY)
                (void) fclose(tfp);
        for (sc = cmds; sc != NULL; sc = sc->sc_next)
                if (sc->sc_type == NOTIFY)

-                       notify(tmpfile, NULL, sc->sc_args, lastmod);
+                       notify(tempfile, NULL, sc->sc_args, lastmod);

        if (!nflag && !(options & VERIFY))
        if (!nflag && !(options & VERIFY))

-               (void) unlink(tmpfile);
+               (void) unlink(tempfile);

 }
 
 /*
 }
 
 /*


@@ -388,7 +405,7 @@ cmptime(name)
                        tp++;
        }
        if (access(name, 4) < 0 || stat(name, &stb) < 0) {
                        tp++;
        }
        if (access(name, 4) < 0 || stat(name, &stb) < 0) {

-               error("%s: %s\n", name, sys_errlist[errno]);
+               error("%s: %s\n", name, strerror(errno));

                return;
        }
 
                return;
        }
 


@@ -422,7 +439,7 @@ rcmptime(st)
                printf("rcmptime(%x)\n", st);
 
        if ((d = opendir(target)) == NULL) {
                printf("rcmptime(%x)\n", st);
 
        if ((d = opendir(target)) == NULL) {

-               error("%s: %s\n", target, sys_errlist[errno]);
+               error("%s: %s\n", target, strerror(errno));

                return;
        }
        otp = tp;
                return;
        }
        otp = tp;


@@ -473,11 +490,11 @@ notify(file, rhost, to, lmod)
                return;
 
        if ((fd = open(file, 0)) < 0) {
                return;
 
        if ((fd = open(file, 0)) < 0) {

-               error("%s: %s\n", file, sys_errlist[errno]);
+               error("%s: %s\n", file, strerror(errno));

                return;
        }
        if (fstat(fd, &stb) < 0) {
                return;
        }
        if (fstat(fd, &stb) < 0) {

-               error("%s: %s\n", file, sys_errlist[errno]);
+               error("%s: %s\n", file, strerror(errno));

                (void) close(fd);
                return;
        }
                (void) close(fd);
                return;
        }


@@ -488,9 +505,10 @@ notify(file, rhost, to, lmod)
        /*
         * Create a pipe to mailling program.
         */
        /*
         * Create a pipe to mailling program.
         */

-       pf = popen(MAILCMD, "w");
+       (void)sprintf(buf, "%s -oi -t", _PATH_SENDMAIL);
+       pf = popen(buf, "w");

        if (pf == NULL) {
        if (pf == NULL) {

-               error("notify: \"%s\" failed\n", MAILCMD);
+               error("notify: \"%s\" failed\n", _PATH_SENDMAIL);

                (void) close(fd);
                return;
        }
                (void) close(fd);
                return;
        }