===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/rcs.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -c -r1.16 -r1.17
*** src/usr.bin/cvs/rcs.h	2005/03/13 22:07:49	1.16
--- src/usr.bin/cvs/rcs.h	2005/04/06 19:12:08	1.17
***************
*** 1,4 ****
! /*	$OpenBSD: rcs.h,v 1.16 2005/03/13 22:07:49 jfb Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: rcs.h,v 1.17 2005/04/06 19:12:08 jfb Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 41,49 ****
  #define RCSDIR         "RCS"
  #define RCS_FILE_EXT   ",v"
  
! #define RCS_HEAD_INIT  "1.1"
  
  
  /* lock types */
  #define RCS_LOCK_LOOSE    0
  #define RCS_LOCK_STRICT   1
--- 41,54 ----
  #define RCSDIR         "RCS"
  #define RCS_FILE_EXT   ",v"
  
! #define RCS_HEAD_BRANCH  "HEAD"
! #define RCS_HEAD_INIT    "1.1"
! #define RCS_HEAD_REV     ((RCSNUM *)(-1))
  
  
+ #define RCS_STATE_EXP    "Exp"
+ #define RCS_STATE_DEAD   "dead"
+ 
  /* lock types */
  #define RCS_LOCK_LOOSE    0
  #define RCS_LOCK_STRICT   1
***************
*** 69,75 ****
--- 74,82 ----
  #define RCSNUM_MAXNUM  USHRT_MAX
  #define RCSNUM_MAXLEN  64
  
+ #define RCSNUM_ISBRANCH(n)    (((n)->rn_len % 2) == 0)
  
+ 
  /* file flags */
  #define RCS_READ    0x01
  #define RCS_WRITE   0x02
***************
*** 110,115 ****
--- 117,123 ----
  };
  
  struct rcs_lock {
+ 	char     *rl_name;
  	RCSNUM   *rl_num;
  
  	TAILQ_ENTRY(rcs_lock) rl_list;
***************
*** 161,167 ****
  	TAILQ_HEAD(rcs_slist, rcs_sym)    rf_symbols;
  	TAILQ_HEAD(rcs_llist, rcs_lock)   rf_locks;
  
- 
  	void   *rf_pdata;
  } RCSFILE;
  
--- 169,174 ----
***************
*** 181,186 ****
--- 188,195 ----
  RCSNUM*       rcs_sym_getrev    (RCSFILE *, const char *);
  int           rcs_lock_getmode  (RCSFILE *);
  int           rcs_lock_setmode  (RCSFILE *, int);
+ int           rcs_lock_add      (RCSFILE *, const char *, RCSNUM *);
+ int           rcs_lock_remove   (RCSFILE *, const RCSNUM *);
  BUF*          rcs_getrev        (RCSFILE *, RCSNUM *);
  BUF*          rcs_gethead       (RCSFILE *);
  RCSNUM*       rcs_getrevbydate  (RCSFILE *, struct tm *);
***************
*** 190,195 ****
--- 199,205 ----
  int           rcs_comment_set   (RCSFILE *, const char *);
  int           rcs_kwexp_set     (RCSFILE *, int);
  int           rcs_kwexp_get     (RCSFILE *);
+ RCSNUM*       rcs_tag_resolve   (RCSFILE *, const char *);
  const char*   rcs_errstr        (int);
  
  int       rcs_kflag_get    (const char *);