[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.150 and 1.151

version 1.150, 2006/05/29 06:05:56 version 1.151, 2006/05/30 07:00:30
Line 373 
Line 373 
         fpath = xmalloc(MAXPATHLEN);          fpath = xmalloc(MAXPATHLEN);
   
         /*          /*
          * If we do not have a admin directory inside here, dont bother.           * If we do not have a admin directory inside here, dont bother,
            * unless we are running import.
          */           */
         l = snprintf(fpath, MAXPATHLEN, "%s/%s", cf->file_path,          l = snprintf(fpath, MAXPATHLEN, "%s/%s", cf->file_path,
             CVS_PATH_CVSDIR);              CVS_PATH_CVSDIR);
Line 381 
Line 382 
                 fatal("cvs_file_walkdir: overflow");                  fatal("cvs_file_walkdir: overflow");
   
         l = stat(fpath, &st);          l = stat(fpath, &st);
         if (l == -1 || (l == 0 && !S_ISDIR(st.st_mode))) {          if (cvs_cmdop != CVS_OP_IMPORT &&
               (l == -1 || (l == 0 && !S_ISDIR(st.st_mode)))) {
                 xfree(fpath);                  xfree(fpath);
                 return;                  return;
         }          }
Line 554 
Line 556 
         }          }
   
         verbose = (verbosity > 1 && loud == 1);          verbose = (verbosity > 1 && loud == 1);
         entlist = cvs_ent_open(cf->file_wd);  
   
         repo = xmalloc(MAXPATHLEN);          repo = xmalloc(MAXPATHLEN);
         rcsfile = xmalloc(MAXPATHLEN);          rcsfile = xmalloc(MAXPATHLEN);
Line 572 
Line 573 
         }          }
   
         cf->file_rpath = xstrdup(rcsfile);          cf->file_rpath = xstrdup(rcsfile);
   
           entlist = cvs_ent_open(cf->file_wd);
         cf->file_ent = cvs_ent_get(entlist, cf->file_name);          cf->file_ent = cvs_ent_get(entlist, cf->file_name);
   
         if (cf->file_ent != NULL) {          if (cf->file_ent != NULL) {
Legend:
Removed from v.1.150  
changed lines
  Added in v.1.151