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 647f32e..cd5aba2 100644 (file)
--- a/usr/src/usr.bin/rdist/docmd.c
+++ b/usr/src/usr.bin/rdist/docmd.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[] = "@(#)docmd.c    5.6 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)docmd.c    5.8 (Berkeley) 3/1/91";

 #endif /* not lint */
 
 #include "defs.h"
 #endif /* not lint */
 
 #include "defs.h"


@@ -29,8 +43,7 @@ FILE  *lfp;                   /* log file for recording files updated */
 struct subcmd *subcmds;        /* list of sub-commands for current cmd */
 jmp_buf        env;
 
 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).


@@ -119,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);
                }
        }


@@ -154,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)


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

+void

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


@@ -331,7 +345,7 @@ 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) {
+               if ((tfp = fopen(tempfile, "w")) == NULL) {

                        error("%s: %s\n", stamp, strerror(errno));
                        return;
                }
                        error("%s: %s\n", stamp, strerror(errno));
                        return;
                }


@@ -356,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);

 }
 
 /*
 }
 
 /*