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

Diff for /src/usr.bin/cvs/file.c between version 1.119 and 1.120

version 1.119, 2005/09/11 14:16:48 version 1.120, 2005/09/13 17:38:35
Line 491 
Line 491 
         struct cvs_ent *ent;          struct cvs_ent *ent;
         char *p;          char *p;
         char parent[MAXPATHLEN], item[MAXPATHLEN];          char parent[MAXPATHLEN], item[MAXPATHLEN];
         int type;          int type, callit;
         struct stat st;          struct stat st;
         struct cvsroot *root;          struct cvsroot *root;
   
Line 598 
Line 598 
          * - the directory does not exist on disk.           * - the directory does not exist on disk.
          * - the callback is NULL.           * - the callback is NULL.
          */           */
         if (!(((cvs_cmdop == CVS_OP_SERVER) ||          callit = 1;
             (root->cr_method == CVS_METHOD_LOCAL)) && (strcmp(path, "."))) &&          if (cb == NULL)
             (base->cf_flags & CVS_FILE_ONDISK) && (cb != NULL) &&                  callit = 0;
             ((cvs_error = cb(base, arg)) != CVS_EX_OK))  
                 goto fail;          if (cvs_cmdop == CVS_OP_SERVER && type != DT_DIR)
                   callit = 0;
   
           if (root->cr_method == CVS_METHOD_LOCAL && type != DT_DIR)
                   callit = 0;
   
           if (!(base->cf_flags & CVS_FILE_ONDISK))
                   callit = 0;
   
           if (callit != 0) {
                   if ((cvs_error = cb(base,arg)) != CVS_EX_OK)
                           goto fail;
           }
   
         /*          /*
          * If we have a normal file, pass it as well.           * If we have a normal file, pass it as well.
Legend:
Removed from v.1.119  
changed lines
  Added in v.1.120