===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/status.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** src/usr.bin/cvs/status.c	2004/12/06 21:03:13	1.3
--- src/usr.bin/cvs/status.c	2004/12/07 17:10:56	1.4
***************
*** 1,16 ****
! /*	$OpenBSD: status.c,v 1.3 2004/12/06 21:03:13 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: status.c,v 1.4 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/types.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/types.h>
***************
*** 54,68 ****
  int cvs_status_file (CVSFILE *, void *);
  
  
- 
- 
  /*
   * cvs_status()
   *
   * Handler for the `cvs status' command.
   * Returns 0 on success, or one of the known exit codes on error.
   */
- 
  int
  cvs_status(int argc, char **argv)
  {
--- 54,65 ----
***************
*** 104,110 ****
   *
   * Get the status of a single file.
   */
- 
  int
  cvs_status_file(CVSFILE *cfp, void *arg)
  {
--- 101,106 ----
***************
*** 129,139 ****
  		root = cfp->cf_parent->cf_ddat->cd_root;
  
  	rf = NULL;
! 	if (cfp->cf_parent != NULL) {
  		repo = cfp->cf_parent->cf_ddat->cd_repo;
! 	} else {
  		repo = NULL;
- 	}
  
  	if (cfp->cf_cvstat == CVS_FST_UNKNOWN) {
  		if (root->cr_method == CVS_METHOD_LOCAL)
--- 125,134 ----
  		root = cfp->cf_parent->cf_ddat->cd_root;
  
  	rf = NULL;
! 	if (cfp->cf_parent != NULL)
  		repo = cfp->cf_parent->cf_ddat->cd_repo;
! 	else
  		repo = NULL;
  
  	if (cfp->cf_cvstat == CVS_FST_UNKNOWN) {
  		if (root->cr_method == CVS_METHOD_LOCAL)