typo

[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 2ee3d1e..0d03930 100644 (file)
--- a/usr/src/usr.bin/rdist/defs.h
+++ b/usr/src/usr.bin/rdist/defs.h
@@ -1,4 +1,4 @@
-/*     defs.h  4.5     83/10/20        */
+/*     defs.h  4.9     83/11/29        */

 
 #include <stdio.h>
 #include <ctype.h>
 
 #include <stdio.h>
 #include <ctype.h>


@@ -12,7 +12,12 @@
 #include <sys/time.h>
 #include <netinet/in.h>
 
 #include <sys/time.h>
 #include <netinet/in.h>
 

-#define        MAILCMD         "/usr/lib/sendmail -oi -t"
+/*
+ * The version number should be changed whenever the protocols change.
+ */
+#define VERSION         2
+
+#define        MAILCMD  "/usr/lib/sendmail -oi -t"

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


@@ -22,11 +27,13 @@
 #define ARROW  5
 #define DCOLON 6
 #define NAME   7
 #define ARROW  5
 #define DCOLON 6
 #define NAME   7

-#define INSTALL        8
-#define NOTIFY 9
-#define EXCEPT 10
-#define OPTION 11
-#define VAR    12
+#define STRING 8
+#define INSTALL        9
+#define NOTIFY 10
+#define EXCEPT 11
+#define SPECIAL        12
+#define OPTION 13
+#define VAR    14

 
        /* lexical definitions */
 #define        QUOTE   0200            /* used internally for quoted characters */
 
        /* lexical definitions */
 #define        QUOTE   0200            /* used internally for quoted characters */


@@ -43,9 +50,15 @@
 #define VERIFY 0x1
 #define WHOLE  0x2
 #define YOUNGER        0x4
 #define VERIFY 0x1
 #define WHOLE  0x2
 #define YOUNGER        0x4

-#define STRIP  0x8
+#define COMPARE        0x8

 #define REMOVE 0x10
 
 #define REMOVE 0x10
 

+       /* expand type definitions */
+#define E_VARS 0x1
+#define E_SHELL        0x2
+#define E_TILDE        0x4
+#define E_ALL  0x7
+

 #define ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 
 #define ALLOC(x) (struct x *) malloc(sizeof(struct x))
 #define ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 
 #define ALLOC(x) (struct x *) malloc(sizeof(struct x))


@@ -69,6 +82,8 @@ extern int iamremote;         /* acting as remote server */
 extern int filec;              /* number of files to update */
 extern char **filev;           /* list of files/directories to update */
 extern char tmpfile[];         /* file name for logging changes */
 extern int filec;              /* number of files to update */
 extern char **filev;           /* list of files/directories to update */
 extern char tmpfile[];         /* file name for logging changes */

+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 *rhost;            /* host name of remote being updated */
 extern struct block *except;   /* list of files to exclude */
 extern char host[];            /* host name of master copy */
 extern char *rhost;            /* host name of remote being updated */
 extern struct block *except;   /* list of files to exclude */


@@ -79,6 +94,7 @@ extern char *sys_errlist[];
 struct block *lookup();
 struct block *makeblock();
 struct block *expand();
 struct block *lookup();
 struct block *makeblock();
 struct block *expand();

+char *exptilde();

 char *malloc();
 char *rindex();
 char *index();
 char *malloc();
 char *rindex();
 char *index();