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

Diff for /src/usr.bin/cvs/root.c between version 1.29 and 1.30

version 1.29, 2006/01/25 08:15:05 version 1.30, 2006/01/25 13:31:45
Line 229 
Line 229 
 struct cvsroot *  struct cvsroot *
 cvsroot_get(const char *dir)  cvsroot_get(const char *dir)
 {  {
         int l;  
         size_t len;          size_t len;
         char rootpath[MAXPATHLEN], *rootstr, line[128];          char rootpath[MAXPATHLEN], *rootstr, line[128];
         FILE *fp;          FILE *fp;
Line 237 
Line 236 
         if (cvs_rootstr != NULL)          if (cvs_rootstr != NULL)
                 return cvsroot_parse(cvs_rootstr);                  return cvsroot_parse(cvs_rootstr);
   
         l = snprintf(rootpath, sizeof(rootpath), "%s/" CVS_PATH_ROOTSPEC, dir);  
         if (strlcpy(rootpath, dir, sizeof(rootpath)) >= sizeof(rootpath) ||          if (strlcpy(rootpath, dir, sizeof(rootpath)) >= sizeof(rootpath) ||
             strlcat(rootpath, "/", sizeof(rootpath)) >= sizeof(rootpath) ||              strlcat(rootpath, "/", sizeof(rootpath)) >= sizeof(rootpath) ||
             strlcat(rootpath, CVS_PATH_ROOTSPEC,              strlcat(rootpath, CVS_PATH_ROOTSPEC,

Legend:
Removed from v.1.29  
changed lines
  Added in v.1.30