don't redefine _PATH_TMP; don't assume it begins "/tmp/";

[unix-history] / usr / src / usr.bin / rdist / defs.h

diff --git a/usr/src/usr.bin/rdist/defs.h b/usr/src/usr.bin/rdist/defs.h
index 88a4138..9a2b34a 100644 (file)
--- a/usr/src/usr.bin/rdist/defs.h
+++ b/usr/src/usr.bin/rdist/defs.h
@@ -2,39 +2,29 @@
  * 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 the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, 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'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * %sccs.include.redist.c%

  *
  *

- *     @(#)defs.h      5.4 (Berkeley) %G%
+ *     @(#)defs.h      5.9 (Berkeley) %G%

  */
 
  */
 

-#include <stdio.h>
-#include <ctype.h>
-#include <errno.h>
-#include <pwd.h>
-#include <grp.h>

 #include <sys/param.h>
 #include <sys/dir.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/param.h>
 #include <sys/dir.h>
 #include <sys/stat.h>
 #include <sys/time.h>

+#include <sys/file.h>

 #include <netinet/in.h>
 #include <netinet/in.h>

+#include <stdio.h>
+#include <ctype.h>
+#include <errno.h>
+#include <pwd.h>
+#include <grp.h>
+#include "pathnames.h"

 
 /*
  * The version number should be changed whenever the protocol changes.
  */
 #define VERSION         3
 
 
 /*
  * The version number should be changed whenever the protocol changes.
  */
 #define VERSION         3
 

-#define        MAILCMD  "/usr/lib/sendmail -oi -t"
-

        /* defines for yacc */
 #define EQUAL  1
 #define LP     2
        /* defines for yacc */
 #define EQUAL  1
 #define LP     2


@@ -123,14 +113,13 @@ extern int options;               /* global options */
 extern int nerrs;              /* number of errors seen */
 extern int rem;                        /* remote file descriptor */
 extern int iamremote;          /* acting as remote server */
 extern int nerrs;              /* number of errors seen */
 extern int rem;                        /* remote file descriptor */
 extern int iamremote;          /* acting as remote server */

-extern char tmpfile[];         /* file name for logging changes */
+extern char tempfile[];                /* file name for logging changes */

 extern struct linkbuf *ihead;  /* list of files with more than one link */
 extern struct passwd *pw;      /* pointer to static area used by getpwent */
 extern struct group *gr;       /* pointer to static area used by getgrent */
 extern char host[];            /* host name of master copy */
 extern char buf[];             /* general purpose buffer */
 extern int errno;              /* system error number */
 extern struct linkbuf *ihead;  /* list of files with more than one link */
 extern struct passwd *pw;      /* pointer to static area used by getpwent */
 extern struct group *gr;       /* pointer to static area used by getgrent */
 extern char host[];            /* host name of master copy */
 extern char buf[];             /* general purpose buffer */
 extern int errno;              /* system error number */

-extern char *sys_errlist[];

 
 char *makestr();
 struct namelist *makenl();
 
 char *makestr();
 struct namelist *makenl();