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

Diff for /src/usr.bin/rcs/rcsprog.c between version 1.102 and 1.103

version 1.102, 2006/04/14 01:11:07 version 1.103, 2006/04/14 23:29:01
Line 232 
Line 232 
 rcs_choosefile(const char *filename)  rcs_choosefile(const char *filename)
 {  {
         struct stat sb;          struct stat sb;
         char *ext, name[MAXPATHLEN], *next, *ptr, rcsdir[MAXPATHLEN],          char *p, *ext, name[MAXPATHLEN], *next, *ptr, rcsdir[MAXPATHLEN],
             *ret, *suffixes, rcspath[MAXPATHLEN];              *ret, *suffixes, rcspath[MAXPATHLEN];
   
         /* If -x flag was not given, use default. */          /* If -x flag was not given, use default. */
Line 294 
Line 294 
         for (ret = NULL, next = suffixes; (ext = strsep(&next, "/")) != NULL;) {          for (ret = NULL, next = suffixes; (ext = strsep(&next, "/")) != NULL;) {
                 char fpath[MAXPATHLEN];                  char fpath[MAXPATHLEN];
   
                   if ((p = strrchr(rcspath, ',')) != NULL) {
                           if (!strcmp(p, ext)) {
                                   if (stat(rcspath, &sb) == 0) {
                                           ret = xstrdup(rcspath);
                                           goto out;
                                   }
                           }
   
                           continue;
                   }
   
                 /* Construct RCS file path. */                  /* Construct RCS file path. */
                 if (strlcpy(fpath, rcspath, sizeof(fpath)) >= sizeof(fpath) ||                  if (strlcpy(fpath, rcspath, sizeof(fpath)) >= sizeof(fpath) ||
                     strlcat(fpath, ext, sizeof(fpath)) >= sizeof(fpath))                      strlcat(fpath, ext, sizeof(fpath)) >= sizeof(fpath))
Line 338 
Line 349 
         struct stat st;          struct stat st;
         char *rcspath;          char *rcspath;
   
         /* XXX - do this in rcs_choosefile? */  
         if ((rcspath = rcs_choosefile(fname)) == NULL)          if ((rcspath = rcs_choosefile(fname)) == NULL)
                 fatal("rcs_statfile: path truncation");                  fatal("rcs_statfile: path truncation");
   

Legend:
Removed from v.1.102  
changed lines
  Added in v.1.103