KNF; mostly spaces vs. tabs; ok joris@ jfb@.

4 files changed, 256 insertions, 256 deletions

diff --git a/usr.bin/cvs/buf.h b/usr.bin/cvs/buf.h
index d2041399d90..d16fb6f7f2d 100644
--- a/usr.bin/cvs/buf.h
+++ b/usr.bin/cvs/buf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: buf.h,v 1.4 2004/12/08 21:11:07 djm Exp $	*/
+/*	$OpenBSD: buf.h,v 1.5 2005/07/25 11:07:00 xsa Exp $	*/
 /*
  * Copyright (c) 2003 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -42,28 +42,28 @@
 
 
 /* flags */
-#define BUF_AUTOEXT   1      /* autoextend on append */
+#define BUF_AUTOEXT	1	/* autoextend on append */
 
 
 typedef struct cvs_buf BUF;
 
 
-BUF*         cvs_buf_alloc     (size_t, u_int);
-BUF*         cvs_buf_load      (const char *, u_int);
-void         cvs_buf_free      (BUF *);
-void*        cvs_buf_release   (BUF *);
-void         cvs_buf_empty     (BUF *);
-ssize_t      cvs_buf_copy      (BUF *, size_t, void *, size_t);
-int          cvs_buf_set       (BUF *, const void *, size_t, size_t);
-ssize_t      cvs_buf_append    (BUF *, const void *, size_t);
-int          cvs_buf_fappend   (BUF *, const char *, ...);
-int          cvs_buf_putc      (BUF *, int);
-size_t       cvs_buf_size      (BUF *);
-const void*  cvs_buf_peek      (BUF *, size_t);
-int          cvs_buf_write_fd  (BUF *, int);
-int          cvs_buf_write     (BUF *, const char *, mode_t);
-int          cvs_buf_write_stmp(BUF *, char *, mode_t);
+BUF		*cvs_buf_alloc(size_t, u_int);
+BUF		*cvs_buf_load(const char *, u_int);
+void		 cvs_buf_free(BUF *);
+void		*cvs_buf_release(BUF *);
+void		 cvs_buf_empty(BUF *);
+ssize_t		 cvs_buf_copy(BUF *, size_t, void *, size_t);
+int		 cvs_buf_set(BUF *, const void *, size_t, size_t);
+ssize_t		 cvs_buf_append(BUF *, const void *, size_t);
+int		 cvs_buf_fappend(BUF *, const char *, ...);
+int		 cvs_buf_putc(BUF *, int);
+size_t		 cvs_buf_size(BUF *);
+const void	*cvs_buf_peek(BUF *, size_t);
+int		 cvs_buf_write_fd(BUF *, int);
+int		 cvs_buf_write(BUF *, const char *, mode_t);
+int		 cvs_buf_write_stmp(BUF *, char *, mode_t);
 
-#define cvs_buf_get(b)   cvs_buf_peek(b, 0)
+#define cvs_buf_get(b)	cvs_buf_peek(b, 0)
 
-#endif /* BUF_H */
+#endif	/* BUF_H */
diff --git a/usr.bin/cvs/file.h b/usr.bin/cvs/file.h
index 231519852d7..dfa7f55170a 100644
--- a/usr.bin/cvs/file.h
+++ b/usr.bin/cvs/file.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file.h,v 1.25 2005/07/23 11:19:46 joris Exp $	*/
+/*	$OpenBSD: file.h,v 1.26 2005/07/25 11:07:00 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -38,18 +38,18 @@ struct cvs_file;
 struct cvs_entries;
 
 
-#define CVS_FILE_MAXDEPTH     32
+#define CVS_FILE_MAXDEPTH	32
 
 
-#define CF_STAT     0x01  /* obsolete */
-#define CF_IGNORE   0x02  /* apply regular ignore rules */
-#define CF_RECURSE  0x04  /* recurse on directory operations */
-#define CF_SORT     0x08  /* all files are sorted alphabetically */
-#define CF_KNOWN    0x10  /* only recurse in directories known to CVS */
-#define CF_CREATE   0x20  /* create if file does not exist */
-#define CF_MKADMIN  0x40  /* create administrative files if they're missing */
-#define CF_NOSYMS   0x80  /* ignore symbolic links */
-#define CF_NOFILES  0x100 /* don't load any files inside a directory */
+#define CF_STAT		0x01	/* obsolete */
+#define CF_IGNORE	0x02	/* apply regular ignore rules */
+#define CF_RECURSE	0x04	/* recurse on directory operations */
+#define CF_SORT		0x08	/* all files are sorted alphabetically */
+#define CF_KNOWN	0x10	/* only recurse in directories known to CVS */
+#define CF_CREATE	0x20	/* create if file does not exist */
+#define CF_MKADMIN	0x40	/* create admin files if they're missing */
+#define CF_NOSYMS	0x80	/* ignore symbolic links */
+#define CF_NOFILES	0x100	/* don't load any files inside a directory */
 
 /*
  * The cvs_file structure is used to represent any file or directory within
@@ -61,71 +61,71 @@ struct cvs_entries;
  * The <cf_cvstat> field gives the file's status with regards to the CVS
  * repository.  The file can be in any one of the CVS_FST_* states.
  */
-#define CVS_FST_UNKNOWN   0	/* Unknown */
-#define CVS_FST_UPTODATE  1	/* Up-to-date */
-#define CVS_FST_MODIFIED  2	/* Locally Modified */
-#define CVS_FST_ADDED     3	/* Locally Added */
-#define CVS_FST_REMOVED   4	/* Locally Removed */
-#define CVS_FST_CONFLICT  5	/* Unresolved Conflict */
-#define CVS_FST_PATCHED   6
-#define CVS_FST_LOST      7	/* Needs Checkout */
+#define CVS_FST_UNKNOWN		0	/* Unknown */
+#define CVS_FST_UPTODATE	1	/* Up-to-date */
+#define CVS_FST_MODIFIED	2	/* Locally Modified */
+#define CVS_FST_ADDED		3	/* Locally Added */
+#define CVS_FST_REMOVED		4	/* Locally Removed */
+#define CVS_FST_CONFLICT	5	/* Unresolved Conflict */
+#define CVS_FST_PATCHED		6
+#define CVS_FST_LOST		7	/* Needs Checkout */
 
 
 SIMPLEQ_HEAD(cvs_flist, cvs_file);
 
 typedef struct cvs_file {
-	struct cvs_file  *cf_parent;  /* parent directory (NULL if none) */
+	struct cvs_file	*cf_parent;	/* parent directory (NULL if none) */
 
 	/*
 	 * cf_name contains the basename of the fullpath
 	 * cf_dir contains the parent directory the file or dir is in.
 	 * if cf_dir is NULL the file is in the parent directory.
 	 */
-	const char	 *cf_name;
-	const char       *cf_dir;
+	const char	*cf_name;
+	const char	*cf_dir;
 
-	mode_t            cf_mode;
-	u_int8_t          cf_cvstat;  /* cvs status of the file */
-	u_int8_t          cf_type;    /* uses values from dirent.h */
-	u_int16_t         cf_flags;
+	mode_t		 cf_mode;
+	u_int8_t	 cf_cvstat;	/* cvs status of the file */
+	u_int8_t	 cf_type;	/* uses values from dirent.h */
+	u_int16_t	 cf_flags;
 
 	union {
 		struct {
-			RCSNUM  *cd_lrev;	/* local revision */
-			time_t   cd_etime;	/* time in Entries file */
-			time_t   cd_mtime;
-			char    *cd_tag;
-			char    *cd_opts;
+			RCSNUM	*cd_lrev;	/* local revision */
+			time_t	 cd_etime;	/* time in Entries file */
+			time_t	 cd_mtime;
+			char	*cd_tag;
+			char	*cd_opts;
 		} cf_reg;
 		struct {
-			char             *cd_repo;
-			struct cvsroot   *cd_root;
-			struct cvs_flist  cd_files;
+			char			*cd_repo;
+			struct cvsroot		*cd_root;
+			struct cvs_flist	cd_files;
 		} cf_dir;
 	} cf_td;
 
-	SIMPLEQ_ENTRY(cvs_file)  cf_list;
+	SIMPLEQ_ENTRY(cvs_file)	cf_list;
 } CVSFILE;
 
 /* only valid for regular files */
-#define cf_etime  cf_td.cf_reg.cd_etime
-#define cf_mtime  cf_td.cf_reg.cd_mtime
-#define cf_lrev   cf_td.cf_reg.cd_lrev
-#define cf_tag    cf_td.cf_reg.cd_tag
-#define cf_opts   cf_td.cf_reg.cd_opts
+#define cf_etime	cf_td.cf_reg.cd_etime
+#define cf_mtime	cf_td.cf_reg.cd_mtime
+#define cf_lrev		cf_td.cf_reg.cd_lrev
+#define cf_tag		cf_td.cf_reg.cd_tag
+#define cf_opts		cf_td.cf_reg.cd_opts
 
 /* only valid for directories */
-#define cf_files  cf_td.cf_dir.cd_files
-#define cf_repo   cf_td.cf_dir.cd_repo
-#define cf_root   cf_td.cf_dir.cd_root
+#define cf_files	cf_td.cf_dir.cd_files
+#define cf_repo		cf_td.cf_dir.cd_repo
+#define cf_root		cf_td.cf_dir.cd_root
 
 
 
-#define CVS_DIRF_STATIC    0x01
-#define CVS_DIRF_STICKY    0x02
-#define CVS_DIRF_BASE      0x04
-#define CVS_GDIR_IGNORE    0x08
-#define CVS_FILE_ONDISK    0x10
+#define CVS_DIRF_STATIC		0x01
+#define CVS_DIRF_STICKY		0x02
+#define CVS_DIRF_BASE		0x04
+#define CVS_GDIR_IGNORE		0x08
+#define CVS_FILE_ONDISK		0x10
 
 #define CVS_DIR_ROOT(f)  ((((f)->cf_type == DT_DIR) && \
 	((f)->cf_root != NULL)) ? (f)->cf_root : \
@@ -135,28 +135,28 @@ typedef struct cvs_file {
 	(f)->cf_repo : (((f)->cf_parent == NULL) ? \
 	NULL : (f)->cf_parent->cf_repo))
 
-int      cvs_file_init    (void);
-int      cvs_file_ignore  (const char *);
-int      cvs_file_chkign  (const char *);
-int	 cvs_file_get     (const char *, int, int (*)(CVSFILE *, void *),
-			   void *, struct cvs_flist *);
-int      cvs_file_getspec (char **, int, int, int (*)(CVSFILE *, void *),
-			   void *, struct cvs_flist *);
-CVSFILE* cvs_file_loadinfo(char *, int, int (*)(CVSFILE *, void *), void *,
-int);
-
-CVSFILE* cvs_file_create  (CVSFILE *, const char *, u_int, mode_t);
-CVSFILE* cvs_file_copy    (CVSFILE *);
-int      cvs_file_attach  (CVSFILE *, CVSFILE *);
-int      cvs_file_examine (CVSFILE *, int (*)(CVSFILE *, void *), void *);
-
-int      cvs_file_init    (void);
-int      cvs_file_ignore  (const char *);
-int      cvs_file_chkign  (const char *);
-CVSFILE* cvs_file_load    (const char *, int);
-CVSFILE* cvs_file_find    (CVSFILE *, const char *);
-char*    cvs_file_getpath (CVSFILE *, char *, size_t);
-void     cvs_file_free    (CVSFILE *);
-int      cvs_file_prune   (char *);
-
-#endif /* FILE_H */
+int	 cvs_file_init(void);
+int	 cvs_file_ignore(const char *);
+int	 cvs_file_chkign(const char *);
+int	 cvs_file_get(const char *, int, int (*)(CVSFILE *, void *),
+	    void *, struct cvs_flist *);
+int	 cvs_file_getspec(char **, int, int, int (*)(CVSFILE *, void *),
+	    void *, struct cvs_flist *);
+CVSFILE	*cvs_file_loadinfo(char *, int, int (*)(CVSFILE *, void *), void *,
+	    int);
+
+CVSFILE	*cvs_file_create(CVSFILE *, const char *, u_int, mode_t);
+CVSFILE	*cvs_file_copy(CVSFILE *);
+int	 cvs_file_attach(CVSFILE *, CVSFILE *);
+int	 cvs_file_examine(CVSFILE *, int (*)(CVSFILE *, void *), void *);
+
+int	 cvs_file_init(void);
+int	 cvs_file_ignore(const char *);
+int	 cvs_file_chkign(const char *);
+CVSFILE	*cvs_file_load(const char *, int);
+CVSFILE	*cvs_file_find(CVSFILE *, const char *);
+char	*cvs_file_getpath(CVSFILE *, char *, size_t);
+void	 cvs_file_free(CVSFILE *);
+int	 cvs_file_prune(char *);
+
+#endif	/* FILE_H */
diff --git a/usr.bin/cvs/log.h b/usr.bin/cvs/log.h
index 76c923bdd28..ac3ed6e3eb5 100644
--- a/usr.bin/cvs/log.h
+++ b/usr.bin/cvs/log.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.h,v 1.9 2005/06/05 20:47:44 joris Exp $	*/
+/*	$OpenBSD: log.h,v 1.10 2005/07/25 11:07:00 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -32,40 +32,40 @@
 #include <stdarg.h>
 
 /* log destinations */
-#define LD_STD      0x01
-#define LD_SYSLOG   0x02
-#define LD_CONS     0x04
+#define LD_STD		0x01
+#define LD_SYSLOG	0x02
+#define LD_CONS		0x04
 
-#define LD_ALL      (LD_STD|LD_SYSLOG|LD_CONS)
+#define LD_ALL		(LD_STD|LD_SYSLOG|LD_CONS)
 
 /* log flags */
-#define LF_PID     0x01     /* include PID in messages */
+#define LF_PID		0x01	/* include PID in messages */
 
 
 /* log priority levels */
-#define LP_DEBUG    0
-#define LP_INFO     1
-#define LP_NOTICE   2
-#define LP_WARN     3
-#define LP_ERR      4
-#define LP_ALERT    5
-#define LP_ERRNO    6
-#define LP_ABORT    7
-#define LP_TRACE    8
+#define LP_DEBUG	0
+#define LP_INFO		1
+#define LP_NOTICE	2
+#define LP_WARN		3
+#define LP_ERR		4
+#define LP_ALERT	5
+#define LP_ERRNO	6
+#define LP_ABORT	7
+#define LP_TRACE	8
 
-#define LP_MAX      8
-#define LP_ALL      255
+#define LP_MAX		8
+#define LP_ALL		255
 
 /* filtering methods */
-#define LP_FILTER_SET     0     /* set a filter */
-#define LP_FILTER_UNSET   1     /* remove a filter */
+#define LP_FILTER_SET	0	/* set a filter */
+#define LP_FILTER_UNSET	1	/* remove a filter */
 
-int   cvs_log_init    (u_int, u_int);
-void  cvs_log_cleanup (void);
-int   cvs_log_filter  (u_int, u_int);
-int   cvs_log         (u_int, const char *, ...);
-int   cvs_vlog        (u_int, const char *, va_list);
-int   cvs_printf      (const char *, ...);
-void  cvs_putchar     (int);
+int	cvs_log_init(u_int, u_int);
+void	cvs_log_cleanup(void);
+int	cvs_log_filter(u_int, u_int);
+int	cvs_log(u_int, const char *, ...);
+int	cvs_vlog(u_int, const char *, va_list);
+int	cvs_printf(const char *, ...);
+void	cvs_putchar(int);
 
-#endif /* LOG_H */
+#endif	/* LOG_H */
diff --git a/usr.bin/cvs/proto.h b/usr.bin/cvs/proto.h
index c9be76444d3..7f1c771c124 100644
--- a/usr.bin/cvs/proto.h
+++ b/usr.bin/cvs/proto.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proto.h,v 1.6 2005/04/18 21:02:50 jfb Exp $	*/
+/*	$OpenBSD: proto.h,v 1.7 2005/07/25 11:07:00 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -33,159 +33,159 @@
 #include "file.h"
 
 
-#define CVS_PROTO_MAXARG   256
+#define CVS_PROTO_MAXARG	256
 
-#define CVS_REQ_TIMEOUT    300
+#define CVS_REQ_TIMEOUT		300
 
 
 /* client/server protocol requests */
-#define CVS_REQ_NONE          0
-#define CVS_REQ_ROOT          1
-#define CVS_REQ_VALIDREQ      2
-#define CVS_REQ_VALIDRESP     3
-#define CVS_REQ_DIRECTORY     4
-#define CVS_REQ_MAXDOTDOT     5
-#define CVS_REQ_STATICDIR     6
-#define CVS_REQ_STICKY        7
-#define CVS_REQ_ENTRY         8
-#define CVS_REQ_ENTRYEXTRA    9
-#define CVS_REQ_CHECKINTIME  10
-#define CVS_REQ_MODIFIED     11
-#define CVS_REQ_ISMODIFIED   12
-#define CVS_REQ_UNCHANGED    13
-#define CVS_REQ_USEUNCHANGED 14
-#define CVS_REQ_NOTIFY       15
-#define CVS_REQ_NOTIFYUSER   16
-#define CVS_REQ_QUESTIONABLE 17
-#define CVS_REQ_CASE         18
-#define CVS_REQ_UTF8         19
-#define CVS_REQ_ARGUMENT     20
-#define CVS_REQ_ARGUMENTX    21
-#define CVS_REQ_GLOBALOPT    22
-#define CVS_REQ_GZIPSTREAM   23
-#define CVS_REQ_KERBENCRYPT  24
-#define CVS_REQ_GSSENCRYPT   25
-#define CVS_REQ_PROTOENCRYPT 26
-#define CVS_REQ_GSSAUTH      27
-#define CVS_REQ_PROTOAUTH    28
-#define CVS_REQ_READCVSRC2   29
-#define CVS_REQ_READWRAP     30
-#define CVS_REQ_ERRIFREADER  31
-#define CVS_REQ_VALIDRCSOPT  32
-#define CVS_REQ_READIGNORE   33
-#define CVS_REQ_SET          34
-#define CVS_REQ_XPANDMOD     35
-#define CVS_REQ_CI           36
-#define CVS_REQ_CHOWN        37
-#define CVS_REQ_SETOWN       38
-#define CVS_REQ_SETPERM      39
-#define CVS_REQ_CHACL        40
-#define CVS_REQ_LISTPERM     41
-#define CVS_REQ_LISTACL      42
-#define CVS_REQ_SETPASS      43
-#define CVS_REQ_PASSWD       44
-#define CVS_REQ_DIFF         45
-#define CVS_REQ_STATUS       46
-#define CVS_REQ_LS           47
-#define CVS_REQ_TAG          48
-#define CVS_REQ_IMPORT       49
-#define CVS_REQ_ADMIN        50
-#define CVS_REQ_HISTORY      51
-#define CVS_REQ_WATCHERS     52
-#define CVS_REQ_EDITORS      53
-#define CVS_REQ_ANNOTATE     54
-#define CVS_REQ_LOG          55
-#define CVS_REQ_CO           56
-#define CVS_REQ_EXPORT       57
-#define CVS_REQ_RANNOTATE    58
-#define CVS_REQ_INIT         59
-#define CVS_REQ_UPDATE       60
-#define CVS_REQ_ADD          62
-#define CVS_REQ_REMOVE       63
-#define CVS_REQ_NOOP         64
-#define CVS_REQ_RTAG         65
-#define CVS_REQ_RELEASE      66
-#define CVS_REQ_RLOG         67
-#define CVS_REQ_RDIFF        68
-#define CVS_REQ_VERSION      69
-
-#define CVS_REQ_MAX          69
+#define CVS_REQ_NONE		0
+#define CVS_REQ_ROOT		1
+#define CVS_REQ_VALIDREQ	2
+#define CVS_REQ_VALIDRESP	3
+#define CVS_REQ_DIRECTORY	4
+#define CVS_REQ_MAXDOTDOT	5
+#define CVS_REQ_STATICDIR	6
+#define CVS_REQ_STICKY		7
+#define CVS_REQ_ENTRY		8
+#define CVS_REQ_ENTRYEXTRA	9
+#define CVS_REQ_CHECKINTIME	10
+#define CVS_REQ_MODIFIED	11
+#define CVS_REQ_ISMODIFIED	12
+#define CVS_REQ_UNCHANGED	13
+#define CVS_REQ_USEUNCHANGED	14
+#define CVS_REQ_NOTIFY		15
+#define CVS_REQ_NOTIFYUSER	16
+#define CVS_REQ_QUESTIONABLE	17
+#define CVS_REQ_CASE		18
+#define CVS_REQ_UTF8		19
+#define CVS_REQ_ARGUMENT	20
+#define CVS_REQ_ARGUMENTX	21
+#define CVS_REQ_GLOBALOPT	22
+#define CVS_REQ_GZIPSTREAM	23
+#define CVS_REQ_KERBENCRYPT	24
+#define CVS_REQ_GSSENCRYPT	25
+#define CVS_REQ_PROTOENCRYPT	26
+#define CVS_REQ_GSSAUTH		27
+#define CVS_REQ_PROTOAUTH	28
+#define CVS_REQ_READCVSRC2	29
+#define CVS_REQ_READWRAP	30
+#define CVS_REQ_ERRIFREADER	31
+#define CVS_REQ_VALIDRCSOPT	32
+#define CVS_REQ_READIGNORE	33
+#define CVS_REQ_SET		34
+#define CVS_REQ_XPANDMOD	35
+#define CVS_REQ_CI		36
+#define CVS_REQ_CHOWN		37
+#define CVS_REQ_SETOWN		38
+#define CVS_REQ_SETPERM		39
+#define CVS_REQ_CHACL		40
+#define CVS_REQ_LISTPERM	41
+#define CVS_REQ_LISTACL		42
+#define CVS_REQ_SETPASS		43
+#define CVS_REQ_PASSWD		44
+#define CVS_REQ_DIFF		45
+#define CVS_REQ_STATUS		46
+#define CVS_REQ_LS		47
+#define CVS_REQ_TAG		48
+#define CVS_REQ_IMPORT		49
+#define CVS_REQ_ADMIN		50
+#define CVS_REQ_HISTORY		51
+#define CVS_REQ_WATCHERS	52
+#define CVS_REQ_EDITORS		53
+#define CVS_REQ_ANNOTATE	54
+#define CVS_REQ_LOG		55
+#define CVS_REQ_CO		56
+#define CVS_REQ_EXPORT		57
+#define CVS_REQ_RANNOTATE	58
+#define CVS_REQ_INIT		59
+#define CVS_REQ_UPDATE		60
+#define CVS_REQ_ADD		62
+#define CVS_REQ_REMOVE		63
+#define CVS_REQ_NOOP		64
+#define CVS_REQ_RTAG		65
+#define CVS_REQ_RELEASE		66
+#define CVS_REQ_RLOG		67
+#define CVS_REQ_RDIFF		68
+#define CVS_REQ_VERSION		69
+
+#define CVS_REQ_MAX		69
 
 
 /* responses */
-#define CVS_RESP_NONE         0
-#define CVS_RESP_OK           1
-#define CVS_RESP_ERROR        2
-#define CVS_RESP_VALIDREQ     3
-#define CVS_RESP_CHECKEDIN    4
-#define CVS_RESP_NEWENTRY     5
-#define CVS_RESP_CKSUM        6
-#define CVS_RESP_COPYFILE     7
-#define CVS_RESP_UPDATED      8
-#define CVS_RESP_CREATED      9
-#define CVS_RESP_UPDEXIST    10
-#define CVS_RESP_MERGED      11
-#define CVS_RESP_PATCHED     12
-#define CVS_RESP_RCSDIFF     13
-#define CVS_RESP_MODE        14
-#define CVS_RESP_MODTIME     15
-#define CVS_RESP_REMOVED     16
-#define CVS_RESP_RMENTRY     17
-#define CVS_RESP_SETSTATDIR  18
-#define CVS_RESP_CLRSTATDIR  19
-#define CVS_RESP_SETSTICKY   20
-#define CVS_RESP_CLRSTICKY   21
-#define CVS_RESP_TEMPLATE    22
-#define CVS_RESP_SETCIPROG   23
-#define CVS_RESP_SETUPDPROG  24
-#define CVS_RESP_NOTIFIED    25
-#define CVS_RESP_MODXPAND    26
-#define CVS_RESP_WRAPRCSOPT  27
-#define CVS_RESP_M           28
-#define CVS_RESP_MBINARY     29
-#define CVS_RESP_E           30
-#define CVS_RESP_F           31
-#define CVS_RESP_MT          32
-
-#define CVS_RESP_MAX         32
+#define CVS_RESP_NONE		0
+#define CVS_RESP_OK		1
+#define CVS_RESP_ERROR		2
+#define CVS_RESP_VALIDREQ	3
+#define CVS_RESP_CHECKEDIN	4
+#define CVS_RESP_NEWENTRY	5
+#define CVS_RESP_CKSUM		6
+#define CVS_RESP_COPYFILE	7
+#define CVS_RESP_UPDATED	8
+#define CVS_RESP_CREATED	9
+#define CVS_RESP_UPDEXIST	10
+#define CVS_RESP_MERGED		11
+#define CVS_RESP_PATCHED	12
+#define CVS_RESP_RCSDIFF	13
+#define CVS_RESP_MODE		14
+#define CVS_RESP_MODTIME	15
+#define CVS_RESP_REMOVED	16
+#define CVS_RESP_RMENTRY	17
+#define CVS_RESP_SETSTATDIR	18
+#define CVS_RESP_CLRSTATDIR	19
+#define CVS_RESP_SETSTICKY	20
+#define CVS_RESP_CLRSTICKY	21
+#define CVS_RESP_TEMPLATE	22
+#define CVS_RESP_SETCIPROG	23
+#define CVS_RESP_SETUPDPROG	24
+#define CVS_RESP_NOTIFIED	25
+#define CVS_RESP_MODXPAND	26
+#define CVS_RESP_WRAPRCSOPT	27
+#define CVS_RESP_M		28
+#define CVS_RESP_MBINARY	29
+#define CVS_RESP_E		30
+#define CVS_RESP_F		31
+#define CVS_RESP_MT		32
+
+#define CVS_RESP_MAX	32
 
 struct cvs_req {
-	int      req_id;
-	char     req_str[32];
-	u_int    req_flags;
+	int	req_id;
+	char	req_str[32];
+	u_int	req_flags;
 };
 
 struct cvs_resp {
-	u_int   resp_id;
-	char    resp_str[32];
+	u_int	resp_id;
+	char	resp_str[32];
 };
 
 
-int         cvs_sendfile       (struct cvsroot *, const char *);
-BUF*        cvs_recvfile       (struct cvsroot *, mode_t *);
-int         cvs_connect        (struct cvsroot *);
-void        cvs_disconnect     (struct cvsroot *);
+BUF	*cvs_recvfile(struct cvsroot *, mode_t *);
+int	 cvs_sendfile(struct cvsroot *, const char *);
+int	 cvs_connect(struct cvsroot *);
+void	 cvs_disconnect(struct cvsroot *);
 
-int             cvs_req_handle     (char *);
-struct cvs_req* cvs_req_getbyid    (int);
-struct cvs_req* cvs_req_getbyname  (const char *);
-char*           cvs_req_getvalid   (void);
+int		 cvs_req_handle(char *);
+struct cvs_req	*cvs_req_getbyid(int);
+struct cvs_req	*cvs_req_getbyname(const char *);
+char		*cvs_req_getvalid(void);
 
-int              cvs_resp_handle    (struct cvsroot *, char *);
-struct cvs_resp* cvs_resp_getbyid   (int);
-struct cvs_resp* cvs_resp_getbyname (const char *);
-char*            cvs_resp_getvalid  (void);
+int              cvs_resp_handle(struct cvsroot *, char *);
+struct cvs_resp* cvs_resp_getbyid(int);
+struct cvs_resp* cvs_resp_getbyname(const char *);
+char*            cvs_resp_getvalid(void);
 
-int         cvs_sendreq     (struct cvsroot *, u_int, const char *);
-int         cvs_getresp     (struct cvsroot *);
-int         cvs_sendresp    (u_int, const char *);
-int         cvs_getln       (struct cvsroot *, char *, size_t);
-int         cvs_senddir     (struct cvsroot *, CVSFILE *);
-int         cvs_sendarg     (struct cvsroot *, const char *, int);
-int         cvs_sendln      (struct cvsroot *, const char *);
-int         cvs_sendentry   (struct cvsroot *, const CVSFILE *);
-int         cvs_sendraw     (struct cvsroot *, const void *, size_t);
-ssize_t     cvs_recvraw     (struct cvsroot *, void *, size_t);
+int	cvs_sendreq(struct cvsroot *, u_int, const char *);
+int	cvs_getresp(struct cvsroot *);
+int	cvs_sendresp(u_int, const char *);
+int	cvs_getln(struct cvsroot *, char *, size_t);
+int	cvs_senddir(struct cvsroot *, CVSFILE *);
+int	cvs_sendarg(struct cvsroot *, const char *, int);
+int	cvs_sendln(struct cvsroot *, const char *);
+int	cvs_sendentry(struct cvsroot *, const CVSFILE *);
+int	cvs_sendraw(struct cvsroot *, const void *, size_t);
+ssize_t	cvs_recvraw(struct cvsroot *, void *, size_t);
 
 
-#endif /* PROTO_H */
+#endif	/* PROTO_H */