[BACK]Return to status.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / cvs

Diff for /src/usr.bin/cvs/status.c between version 1.3 and 1.4

version 1.3, 2004/12/06 21:03:13 version 1.4, 2004/12/07 17:10:56
Line 1 
Line 1 
 /*      $OpenBSD$       */  /*      $OpenBSD$       */
 /*  /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.   * All rights reserved.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions   * modification, are permitted provided that the following conditions
  * are met:   * are met:
  *   *
  * 1. Redistributions of source code must retain the above copyright   * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.   *    notice, this list of conditions and the following disclaimer.
  * 2. The name of the author may not be used to endorse or promote products   * 2. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.   *    derived from this software without specific prior written permission.
  *   *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY   * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
Line 21 
Line 21 
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,   * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR   * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF   * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.   * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */   */
   
 #include <sys/types.h>  #include <sys/types.h>
Line 54 
Line 54 
 int cvs_status_file (CVSFILE *, void *);  int cvs_status_file (CVSFILE *, void *);
   
   
   
   
 /*  /*
  * cvs_status()   * cvs_status()
  *   *
  * Handler for the `cvs status' command.   * Handler for the `cvs status' command.
  * Returns 0 on success, or one of the known exit codes on error.   * Returns 0 on success, or one of the known exit codes on error.
  */   */
   
 int  int
 cvs_status(int argc, char **argv)  cvs_status(int argc, char **argv)
 {  {
Line 104 
Line 101 
  *   *
  * Get the status of a single file.   * Get the status of a single file.
  */   */
   
 int  int
 cvs_status_file(CVSFILE *cfp, void *arg)  cvs_status_file(CVSFILE *cfp, void *arg)
 {  {
Line 129 
Line 125 
                 root = cfp->cf_parent->cf_ddat->cd_root;                  root = cfp->cf_parent->cf_ddat->cd_root;
   
         rf = NULL;          rf = NULL;
         if (cfp->cf_parent != NULL) {          if (cfp->cf_parent != NULL)
                 repo = cfp->cf_parent->cf_ddat->cd_repo;                  repo = cfp->cf_parent->cf_ddat->cd_repo;
         } else {          else
                 repo = NULL;                  repo = NULL;
         }  
   
         if (cfp->cf_cvstat == CVS_FST_UNKNOWN) {          if (cfp->cf_cvstat == CVS_FST_UNKNOWN) {
                 if (root->cr_method == CVS_METHOD_LOCAL)                  if (root->cr_method == CVS_METHOD_LOCAL)
Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4