===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/entries.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -c -r1.19 -r1.20
*** src/usr.bin/cvs/entries.c	2004/12/06 21:03:12	1.19
--- src/usr.bin/cvs/entries.c	2004/12/07 17:10:56	1.20
***************
*** 1,16 ****
! /*	$OpenBSD: entries.c,v 1.19 2004/12/06 21:03:12 deraadt Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
!  * All rights reserved. 
   *
!  * Redistribution and use in source and binary forms, with or without 
!  * modification, are permitted provided that the following conditions 
!  * are met: 
   *
!  * 1. Redistributions of source code must retain the above copyright 
!  *    notice, this list of conditions and the following disclaimer. 
   * 2. The name of the author 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 ANY EXPRESS OR IMPLIED WARRANTIES,
   * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
--- 1,16 ----
! /*	$OpenBSD: entries.c,v 1.20 2004/12/07 17:10:56 tedu Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
!  * All rights reserved.
   *
!  * Redistribution and use in source and binary forms, with or without
!  * modification, are permitted provided that the following conditions
!  * are met:
   *
!  * 1. Redistributions of source code must retain the above copyright
!  *    notice, this list of conditions and the following disclaimer.
   * 2. The name of the author 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 ANY EXPRESS OR IMPLIED WARRANTIES,
   * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
***************
*** 21,27 ****
   * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
   * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
   * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
!  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
   */
  
  #include <sys/param.h>
--- 21,27 ----
   * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
   * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
   * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
!  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
  #include <sys/param.h>
***************
*** 41,47 ****
  #define CVS_ENTRIES_DELIM   '/'
  
  
- 
  /*
   * cvs_ent_open()
   *
--- 41,46 ----
***************
*** 49,55 ****
   * Returns a pointer to the CVSENTRIES file structure on success, or NULL
   * on failure.
   */
- 
  CVSENTRIES*
  cvs_ent_open(const char *dir, int flags)
  {
--- 48,53 ----
***************
*** 147,153 ****
   * Close the Entries file <ep> and free all data.  Any reference to entries
   * structure within that file become invalid.
   */
- 
  void
  cvs_ent_close(CVSENTRIES *ep)
  {
--- 145,150 ----
***************
*** 183,189 ****
   * opened for writing.
   * Returns 0 on success, or -1 on failure.
   */
- 
  int
  cvs_ent_add(CVSENTRIES *ef, struct cvs_ent *ent)
  {
--- 180,185 ----
***************
*** 208,214 ****
   *
   * Add a line to the Entries file.
   */
- 
  int
  cvs_ent_addln(CVSENTRIES *ef, const char *line)
  {
--- 204,209 ----
***************
*** 239,245 ****
   * Remove an entry from the Entries file <ef>.  The entry's name is given
   * by <name>.
   */
- 
  int
  cvs_ent_remove(CVSENTRIES *ef, const char *name)
  {
--- 234,239 ----
***************
*** 270,276 ****
   * <file>.
   * Returns a pointer to the cvs entry structure on success, or NULL on failure.
   */
- 
  struct cvs_ent*
  cvs_ent_get(CVSENTRIES *ef, const char *file)
  {
--- 264,269 ----
***************
*** 292,298 ****
   * will return the entry following the last one returned.
   * Returns a pointer to the cvs entry structure on success, or NULL on failure.
   */
- 
  struct cvs_ent*
  cvs_ent_next(CVSENTRIES *ef)
  {
--- 285,290 ----
***************
*** 310,316 ****
   * Parse a single line from a CVS/Entries file and return a cvs_entry structure
   * containing all the parsed information.
   */
- 
  struct cvs_ent*
  cvs_ent_parse(const char *entry)
  {
--- 302,307 ----
***************
*** 378,384 ****
   *
   * Free a single CVS entries structure.
   */
- 
  void
  cvs_ent_free(struct cvs_ent *ent)
  {
--- 369,374 ----
***************
*** 397,403 ****
   * path <path> and return that entry.  That entry must later be freed using
   * cvs_ent_free().
   */
- 
  struct cvs_ent*
  cvs_ent_getent(const char *path)
  {
--- 387,392 ----
***************
*** 428,434 ****
   * Explicitly write the contents of the Entries file <ef> to disk.
   * Returns 0 on success, or -1 on failure.
   */
- 
  int
  cvs_ent_write(CVSENTRIES *ef)
  {
--- 417,422 ----