===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rdist/types.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- src/usr.bin/rdist/types.h	1998/06/26 21:21:22	1.4
+++ src/usr.bin/rdist/types.h	2003/05/14 01:34:35	1.5
@@ -1,10 +1,10 @@
-/*	$OpenBSD: types.h,v 1.4 1998/06/26 21:21:22 millert Exp $	*/
+/*	$OpenBSD: types.h,v 1.5 2003/05/14 01:34:35 millert Exp $	*/
 
 #ifndef __myTYPES_H__
 #define __myTYPES_H__
 
 /*
- * $From: types.h,v 1.2 1996/01/30 01:52:24 mcooper Exp $
+ * $From: types.h,v 1.5 1999/08/04 15:57:31 christos Exp $
  */
 
 /*
@@ -12,26 +12,30 @@
  *
  * WARNING: This values are used by the server (rdistd)
  */
-#define DO_VERIFY		0x000001
-#define DO_WHOLE		0x000002
-#define DO_YOUNGER		0x000004
-#define DO_COMPARE		0x000008
-#define DO_REMOVE		0x000010
-#define DO_FOLLOW		0x000020
-#define DO_IGNLNKS		0x000040
-#define DO_QUIET		0x000100
-#define DO_CHKNFS		0x000200
-#define DO_CHKREADONLY		0x000400
-#define DO_NOEXEC		0x000800
-#define DO_SAVETARGETS		0x001000
-#define DO_NODESCEND		0x002000
-#define DO_NOCHKOWNER		0x004000
-#define DO_NOCHKMODE		0x008000
-#define DO_NOCHKGROUP		0x010000
-#define DO_CHKSYM		0x020000
-#define DO_NUMCHKGROUP		0x040000
-#define DO_NUMCHKOWNER		0x080000
-#define DO_SPARSE		0x100000
+#define DO_VERIFY		0x0000001
+#define DO_WHOLE		0x0000002
+#define DO_YOUNGER		0x0000004
+#define DO_COMPARE		0x0000008
+#define DO_REMOVE		0x0000010
+#define DO_FOLLOW		0x0000020
+#define DO_IGNLNKS		0x0000040
+#define DO_QUIET		0x0000100
+#define DO_CHKNFS		0x0000200
+#define DO_CHKREADONLY		0x0000400
+#define DO_NOEXEC		0x0000800
+#define DO_SAVETARGETS		0x0001000
+#define DO_NODESCEND		0x0002000
+#define DO_NOCHKOWNER		0x0004000
+#define DO_NOCHKMODE		0x0008000
+#define DO_NOCHKGROUP		0x0010000
+#define DO_CHKSYM		0x0020000
+#define DO_NUMCHKGROUP		0x0040000
+#define DO_NUMCHKOWNER		0x0080000
+#define DO_HISTORY		0x0100000
+#define DO_UPDATEPERM		0x0200000
+#define DO_DEFGROUP		0x0400000
+#define DO_DEFOWNER		0x0800000
+#define DO_SPARSE		0x1000000	/* XXX not implemented */
 
 /*
  * Dist option information
@@ -40,6 +44,8 @@
 struct _distoptinfo {
 	opt_t		do_value;
 	char	       *do_name;
+	char	       *do_arg;
+	size_t	       arg_size;
 };
 typedef struct _distoptinfo DISTOPTINFO;
 
@@ -81,17 +87,19 @@
 /*
  * Description of message facilities
  */
+typedef struct _msgfacility MSGFACILITY;
+
 struct _msgfacility {
 	/* compile time initialized data */
 	int		mf_msgfac;		/* One of MF_* from below */
 	char	       *mf_name;		/* Name of this facility */
-	void	      (*mf_sendfunc)();		/* Function to send msg */
+	void	      (*mf_sendfunc)		/* Function to send msg */
+			(MSGFACILITY *, int, int, char *);
 	/* run time initialized data */
 	int		mf_msgtypes;		/* Bitmask of MT_* from above*/
 	char	       *mf_filename;		/* Name of file */
 	FILE	       *mf_fptr;		/* File pointer to output to */
 };
-typedef struct _msgfacility MSGFACILITY;
 
 /*
  * Message Facilities